Merge pull request #434 from code-payments/chore/move-theme-out-of-app

chore: move theme out of app and into :common:theme

Author: bmc08gt

api/build.gradle.kts

@@ -69,7 +69,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":common"))
+    implementation(project(":common:resources"))
 
     implementation(Libs.rxjava)
     implementation(Libs.kotlinx_coroutines_core)

app/build.gradle.kts

@@ -1,10 +1,5 @@
-import com.android.SdkConstants.FN_LOCAL_PROPERTIES
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
 import org.jetbrains.kotlin.cli.common.toBooleanLenient
-import java.io.FileInputStream
-import java.io.InputStreamReader
-import java.util.Properties
 
 plugins {
     id(Plugins.android_application)
@@ -55,8 +50,6 @@ android {
 
     buildFeatures {
         buildConfig = true
-        viewBinding = true
-        dataBinding = true
         compose = true
     }
 
@@ -121,7 +114,8 @@ dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 
     implementation(project(":api"))
-    implementation(project(":common"))
+    implementation(project(":common:resources"))
+    implementation(project(":common:theme"))
 
     //standard libraries
     implementation(Libs.kotlinx_collections_immutable)
@@ -144,7 +138,7 @@ dependencies {
     testImplementation(Libs.hilt_android_test)
     kaptTest(Libs.hilt_android_compiler)
 
-    androidTestImplementation("io.mockk:mockk:1.13.5")
+    androidTestImplementation("io.mockk:mockk:1.13.11")
 
     //Jetpack compose
     implementation(platform(Libs.compose_bom))

app/src/main/java/com/getcode/view/login/BaseAccessKeyViewModel.kt

@@ -17,6 +17,7 @@ import com.getcode.manager.SessionManager
 import com.getcode.manager.TopBarManager
 import com.getcode.network.repository.TransactionRepository
 import com.getcode.network.repository.decodeBase64
+import com.getcode.theme.R as themeR
 import com.getcode.theme.Brand
 import com.getcode.theme.Transparent
 import com.getcode.theme.White
@@ -242,7 +243,7 @@ abstract class BaseAccessKeyViewModel(
         textPaint.color = color
         textPaint.textSize = sizePx.toFloat()
         textPaint.typeface = Typeface.create(
-            resources.getFont(R.font.avenir_next_demi),
+            resources.getFont(themeR.font.avenir_next_demi),
             Typeface.BOLD
         )
 
@@ -308,4 +309,4 @@ abstract class BaseAccessKeyViewModel(
             else -> getSomethingWentWrongError()
         }.let { m -> TopBarManager.showMessage(m) }
     }
-}
+}

app/src/main/java/com/getcode/view/main/account/AccountFaq.kt

@@ -3,7 +3,6 @@ package com.getcode.view.main.account
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.Text
@@ -14,7 +13,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.getcode.R
+import com.getcode.theme.R as themeR
 import com.getcode.theme.CodeTheme
 import com.getcode.theme.White
 import com.getcode.ui.components.MarkdownText
@@ -43,7 +42,7 @@ fun AccountFaq(
                 )
                 MarkdownText(
                     markdown = faqResponse.answer,
-                    fontResource = R.font.avenir_next_demi,
+                    fontResource = themeR.font.avenir_next_demi,
                     style = CodeTheme.typography.body1.copy(
                         lineHeight = 20.sp,
                     ),

common/.gitignore renamed to common/resources/.gitignore

@@ -0,0 +1 @@
+/build

common/build.gradle.kts renamed to common/resources/build.gradle.kts

@@ -0,0 +1,59 @@
+plugins {
+    id(Plugins.android_library)
+    id(Plugins.kotlin_android)
+}
+
+android {
+    namespace = "com.getcode.theme"
+    compileSdk = Android.compileSdkVersion
+    defaultConfig {
+        minSdk = Android.minSdkVersion
+        targetSdk = Android.targetSdkVersion
+        buildToolsVersion = Android.buildToolsVersion
+        testInstrumentationRunner = Android.testInstrumentationRunner
+    }
+
+    kotlinOptions {
+        jvmTarget = Versions.java
+        freeCompilerArgs += listOf(
+            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
+            "-opt-in=kotlin.ExperimentalUnsignedTypes",
+            "-opt-in=kotlin.RequiresOptIn"
+        )
+    }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(Versions.java))
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlin {
+        jvmToolchain(17)
+    }
+
+    buildFeatures {
+        buildConfig = true
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = Versions.compose_compiler
+    }
+}
+
+dependencies {
+    implementation(platform(Libs.compose_bom))
+    implementation(Libs.compose_ui)
+    debugImplementation(Libs.compose_ui_tools)
+    implementation(Libs.compose_ui_tools_preview)
+    implementation(Libs.compose_material)
+    implementation(Libs.compose_accompanist)
+    implementation(Libs.timber)
+}

common/src/main/java/com/getcode/util/resources/ResourceHelper.kt renamed to common/resources/src/main/java/com/getcode/util/resources/ResourceHelper.kt

@@ -35,10 +35,7 @@ val topNotification = Color(0xFF4f49ce)
 val topNeutral = Color(0xFF747474)
 val topSuccess = Brand
 
-
-
-
 val textSelectionColors = TextSelectionColors(
     handleColor = White,
     backgroundColor = BrandLight.copy(alpha = 0.4f)
-)
+)

common/theme/.gitignore

@@ -7,7 +7,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.getcode.BuildConfig
+import com.getcode.theme.BuildConfig
 
 val topBarHeight = 56.dp
 
@@ -206,4 +206,4 @@ data class GridDimensionSet(
     val x15: Dp,
     val x16: Dp,
     val x17: Dp,
-)
+)

common/theme/build.gradle.kts

@@ -2,16 +2,12 @@ package com.getcode.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.ExperimentalTextApi
-import androidx.compose.ui.text.PlatformTextStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontVariation
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.sp
-import com.getcode.R
 
 private val Avenir = FontFamily(
     Font(R.font.avenir_next_regular, FontWeight.Thin),
@@ -120,4 +116,4 @@ val Typography.displayLarge: TextStyle
     @Composable get() = h1.copy(fontSize = 55.sp)
 
 fun TextStyle.withRobotoMono(weight: FontWeight? = this.fontWeight) = with(RobotoMono, weight)
-fun TextStyle.with(fontFamily: FontFamily, weight: FontWeight? = this.fontWeight): TextStyle = copy(fontFamily = fontFamily, fontWeight = weight)
+fun TextStyle.with(fontFamily: FontFamily, weight: FontWeight? = this.fontWeight): TextStyle = copy(fontFamily = fontFamily, fontWeight = weight)

app/src/main/java/com/getcode/theme/Color.kt renamed to common/theme/src/main/kotlin/com/getcode/theme/Color.kt

@@ -4,7 +4,7 @@ import android.content.res.Configuration
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalConfiguration
-import com.getcode.BuildConfig
+import com.getcode.theme.BuildConfig
 import timber.log.Timber
 
 data class DeviceWindowSizeClass internal constructor(
@@ -40,4 +40,4 @@ fun rememberWindowSizeClass(
             Timber.d("dimens:: width = { dp: $screenWidthDp, class: ${it.widthSizeClass.name} }, height = { dp:$screenHeightDp, class: ${it.heightSizeClass.name} }")
         }
     }
-}
+}

app/src/main/java/com/getcode/theme/Dimens.kt renamed to common/theme/src/main/kotlin/com/getcode/theme/Dimens.kt

@@ -2,5 +2,6 @@ include ':model'
 include ':api'
 include ':app'
 include ':ed25519'
-include ':common'
-rootProject.name = "Code"
+include ':common:resources'
+include ':common:theme'
+rootProject.name = "Code"