From 29eede5f2f46f1aee8f54db840c40bfc43315764 Mon Sep 17 00:00:00 2001 From: samAricha Date: Thu, 9 Nov 2023 07:03:10 +0300 Subject: [PATCH 1/7] Adding Hilt and Hilt Application class --- app/build.gradle.kts | 12 +++++++++++- app/src/main/java/ke/droidcon/tujenge/TujengeApp.kt | 11 +++++++++++ build.gradle.kts | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/ke/droidcon/tujenge/TujengeApp.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 758b44b..36d99a3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,8 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("dagger.hilt.android.plugin") + kotlin("kapt") } android { @@ -39,8 +41,16 @@ dependencies { implementation("androidx.core:core-ktx:1.9.0") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.9.0") +// implementation("com.google.android.material:material:1.9.0") + implementation("androidx.compose.material3:material3") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + + //Dagger - Hilt + implementation("com.google.dagger:hilt-android:2.46.1") + kapt("com.google.dagger:hilt-android-compiler:2.37") + implementation("androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03") + kapt("androidx.hilt:hilt-compiler:1.0.0") + implementation("androidx.hilt:hilt-navigation-compose:1.0.0") } \ No newline at end of file diff --git a/app/src/main/java/ke/droidcon/tujenge/TujengeApp.kt b/app/src/main/java/ke/droidcon/tujenge/TujengeApp.kt new file mode 100644 index 0000000..5f00ac8 --- /dev/null +++ b/app/src/main/java/ke/droidcon/tujenge/TujengeApp.kt @@ -0,0 +1,11 @@ +package ke.droidcon.tujenge + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class TujengeApp : Application() { + override fun onCreate() { + super.onCreate() + } +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index df06d44..d35619f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,4 +2,5 @@ plugins { id("com.android.application") version "8.1.2" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false + id("com.google.dagger.hilt.android") version "2.44" apply false } \ No newline at end of file From 739d5714164091fdfde3c262349fbd2302d15944 Mon Sep 17 00:00:00 2001 From: samAricha Date: Thu, 9 Nov 2023 20:51:15 +0300 Subject: [PATCH 2/7] Addition of compose to project --- app/build.gradle.kts | 35 +++++++--- app/src/main/AndroidManifest.xml | 17 ++++- .../java/ke/droidcon/tujenge/MainActivity.kt | 60 ++++++++++++++++ .../ke/droidcon/tujenge/ui/theme/Color.kt | 11 +++ .../ke/droidcon/tujenge/ui/theme/Theme.kt | 70 +++++++++++++++++++ .../java/ke/droidcon/tujenge/ui/theme/Type.kt | 34 +++++++++ app/src/main/res/values-night/themes.xml | 16 ----- app/src/main/res/values/themes.xml | 19 ++--- 8 files changed, 220 insertions(+), 42 deletions(-) create mode 100644 app/src/main/java/ke/droidcon/tujenge/MainActivity.kt create mode 100644 app/src/main/java/ke/droidcon/tujenge/ui/theme/Color.kt create mode 100644 app/src/main/java/ke/droidcon/tujenge/ui/theme/Theme.kt create mode 100644 app/src/main/java/ke/droidcon/tujenge/ui/theme/Type.kt delete mode 100644 app/src/main/res/values-night/themes.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 36d99a3..0eae812 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,7 +7,7 @@ plugins { android { namespace = "ke.droidcon.tujenge" - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "ke.droidcon.tujenge" @@ -35,22 +35,39 @@ android { kotlinOptions { jvmTarget = "1.8" } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.2" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } } dependencies { implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") -// implementation("com.google.android.material:material:1.9.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.activity:activity-compose:1.8.0") + implementation(platform("androidx.compose:compose-bom:2023.03.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") +// implementation("androidx.appcompat:appcompat:1.6.1") +// implementation("com.google.android.material:material:1.10.0") implementation("androidx.compose.material3:material3") - testImplementation("junit:junit:4.13.2") + + testImplementation("junit :junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") //Dagger - Hilt - implementation("com.google.dagger:hilt-android:2.46.1") - kapt("com.google.dagger:hilt-android-compiler:2.37") - implementation("androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03") - kapt("androidx.hilt:hilt-compiler:1.0.0") - implementation("androidx.hilt:hilt-navigation-compose:1.0.0") + implementation("com.google.dagger:hilt-android:2.48") + kapt("com.google.dagger:hilt-android-compiler:2.45") + kapt("androidx.hilt:hilt-compiler:1.1.0") + implementation("androidx.hilt:hilt-navigation-compose:1.1.0") } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 79d58fc..360f498 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> + android:theme="@style/Theme.TujengeApp" + tools:targetApi="31" > + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ke/droidcon/tujenge/MainActivity.kt b/app/src/main/java/ke/droidcon/tujenge/MainActivity.kt new file mode 100644 index 0000000..c0ffcf9 --- /dev/null +++ b/app/src/main/java/ke/droidcon/tujenge/MainActivity.kt @@ -0,0 +1,60 @@ +package ke.droidcon.tujenge + +import android.annotation.SuppressLint +import android.os.Build +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.annotation.RequiresApi +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import dagger.hilt.android.AndroidEntryPoint +import ke.droidcon.tujenge.ui.theme.TujengeAppTheme + + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + + @RequiresApi(Build.VERSION_CODES.O) + @SuppressLint("UnusedMaterialScaffoldPaddingParameter") + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + + setContent { + + TujengeAppTheme { + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + Greeting("Android") + } + } + + } + } +} + + +@Composable +fun Greeting(name: String, modifier: Modifier = Modifier) { + Text( + text = "Hello $name!", + modifier = modifier + ) +} + +@Preview(showBackground = true) +@Composable +fun GreetingPreview() { + TujengeAppTheme { + Greeting("Android") + } +} diff --git a/app/src/main/java/ke/droidcon/tujenge/ui/theme/Color.kt b/app/src/main/java/ke/droidcon/tujenge/ui/theme/Color.kt new file mode 100644 index 0000000..9c1a073 --- /dev/null +++ b/app/src/main/java/ke/droidcon/tujenge/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package ke.droidcon.tujenge.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/ke/droidcon/tujenge/ui/theme/Theme.kt b/app/src/main/java/ke/droidcon/tujenge/ui/theme/Theme.kt new file mode 100644 index 0000000..190199b --- /dev/null +++ b/app/src/main/java/ke/droidcon/tujenge/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package ke.droidcon.tujenge.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun TujengeAppTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/ke/droidcon/tujenge/ui/theme/Type.kt b/app/src/main/java/ke/droidcon/tujenge/ui/theme/Type.kt new file mode 100644 index 0000000..ece0512 --- /dev/null +++ b/app/src/main/java/ke/droidcon/tujenge/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package ke.droidcon.tujenge.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 9368a79..0000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index e17b03a..d3e531c 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,16 +1,5 @@ - - - + + + +