Skip to content

Commit

Permalink
Update project
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelbel
michaelbel committed Mar 31, 2024
1 parent 8e14bef commit 7949a79
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 39 deletions.
6 changes: 3 additions & 3 deletions androidApp/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,19 @@ android {
keystoreProperties["storePassword"] = System.getenv("KEYSTORE_STORE_PASSWORD").orEmpty()
keystoreProperties["storeFile"] = System.getenv("KEYSTORE_FILE").orEmpty()
}
/*create("release") { // todo Uncomment to create a signed release
create("release") { // todo Uncomment to create a signed release
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
storeFile = file(keystoreProperties["storeFile"] as String)
storePassword = keystoreProperties["storePassword"] as String
}*/
}
}

buildTypes {
release {
isMinifyEnabled = true
isShrinkResources = true
/*signingConfig = signingConfigs.getByName("release")*/ // todo Uncomment to create a signed release
signingConfig = signingConfigs.getByName("release") // todo Uncomment to create a signed release
applicationIdSuffix = MoviesBuildType.RELEASE.applicationIdSuffix
manifestPlaceholders += mapOf("appName" to "@string/app_name")
proguardFiles(
Expand Down
4 changes: 3 additions & 1 deletion androidApp/proguard-rules.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@
}

# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
-keepattributes RuntimeVisibleAnnotations,AnnotationDefault

-dontwarn org.slf4j.impl.StaticLoggerBinder
4 changes: 0 additions & 4 deletions core/network-kmp/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ kotlin {
implementation(libs.bundles.ktor.android)
implementation(libs.androidx.startup.runtime)
implementation(libs.okhttp.logging.interceptor)
implementation(libs.flaker.android.okhttp)
implementation(libs.koin.android)
}
}
Expand Down Expand Up @@ -61,9 +60,6 @@ android {
}

dependencies {
implementation(libs.chucker.library) {
exclude(group = "androidx.constraintlayout")
}
debugImplementation(libs.chucker.library) {
exclude(group = "androidx.constraintlayout")
}
Expand Down
1 change: 1 addition & 0 deletions core/persistence-kmp/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ kotlin {
implementation(libs.bundles.datastore.common)
implementation(libs.bundles.paging.common)
implementation(libs.bundles.koin.common)
implementation(libs.bundles.okio.common)
}
androidMain.dependencies {
implementation(libs.bundles.datastore.android)
Expand Down
5 changes: 2 additions & 3 deletions .../androidMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@ package org.michaelbel.movies.persistence.datastore.di

import androidx.datastore.preferences.SharedPreferencesMigration
import androidx.datastore.preferences.core.PreferenceDataStoreFactory
import okio.Path.Companion.toPath
import org.koin.android.ext.koin.androidContext
import org.koin.dsl.module
import org.michaelbel.movies.persistence.datastore.DATA_STORE_NAME
import org.michaelbel.movies.persistence.datastore.SHARED_PREFERENCES_NAME

internal actual val dataStoreKoinModule = module {
single {
PreferenceDataStoreFactory.createWithPath(
PreferenceDataStoreFactory.create(
migrations = listOf(SharedPreferencesMigration(androidContext(), SHARED_PREFERENCES_NAME)),
produceFile = { androidContext().filesDir.resolve(DATA_STORE_NAME).absolutePath.toPath() }
produceFile = { androidContext().filesDir.resolve(DATA_STORE_NAME) }
)
}
}
56 changes: 28 additions & 28 deletions ...impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ internal fun SettingsScreenContent(
onClick = { languageDialog = true }
)
}
}
if (settingsData.themeData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.themeData.isFeatureEnabled) {
item {
var themeDialog by remember { mutableStateOf(false) }

Expand All @@ -153,15 +153,15 @@ internal fun SettingsScreenContent(
onClick = { themeDialog = true }
)
}
}
if (settingsData.feedViewData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.feedViewData.isFeatureEnabled) {
item {
var appearanceDialog by remember { mutableStateOf(false) }

Expand All @@ -183,15 +183,15 @@ internal fun SettingsScreenContent(
onClick = { appearanceDialog = true }
)
}
}
if (settingsData.movieListData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.movieListData.isFeatureEnabled) {
item {
var movieListDialog by remember { mutableStateOf(false) }

Expand All @@ -213,15 +213,15 @@ internal fun SettingsScreenContent(
onClick = { movieListDialog = true }
)
}
}
if (settingsData.genderData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.genderData.isFeatureEnabled) {
item {
var genderDialog by remember { mutableStateOf(false) }
if (genderDialog) {
Expand All @@ -242,15 +242,15 @@ internal fun SettingsScreenContent(
onClick = { genderDialog = true }
)
}
}
if (settingsData.dynamicColorsData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.dynamicColorsData.isFeatureEnabled) {
item {
SettingSwitchItem(
title = stringResource(MoviesStrings.settings_dynamic_colors),
Expand All @@ -260,15 +260,15 @@ internal fun SettingsScreenContent(
onClick = { settingsData.dynamicColorsData.onChange(!settingsData.dynamicColorsData.isEnabled) }
)
}
}
if (settingsData.paletteColorsData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.paletteColorsData.isFeatureEnabled) {
item {
Text(
text = stringResource(MoviesStrings.settings_palette_colors),
Expand All @@ -284,15 +284,15 @@ internal fun SettingsScreenContent(
onChange = settingsData.paletteColorsData.onChange
)
}
}
if (settingsData.notificationsData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.notificationsData.isFeatureEnabled) {
item {
SettingSwitchItem(
title = stringResource(MoviesStrings.settings_post_notifications),
Expand All @@ -302,15 +302,15 @@ internal fun SettingsScreenContent(
onClick = settingsData.notificationsData.onClick
)
}
}
if (settingsData.biometricData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.biometricData.isFeatureEnabled) {
item {
SettingSwitchItem(
title = stringResource(MoviesStrings.settings_lock_app),
Expand All @@ -320,15 +320,15 @@ internal fun SettingsScreenContent(
onClick = { settingsData.biometricData.onChange(!settingsData.biometricData.isEnabled) }
)
}
}
if (settingsData.widgetData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.widgetData.isFeatureEnabled) {
item {
SettingItem(
title = stringResource(MoviesStrings.settings_app_widget),
Expand All @@ -337,15 +337,15 @@ internal fun SettingsScreenContent(
onClick = settingsData.widgetData.onRequest
)
}
}
if (settingsData.tileData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.tileData.isFeatureEnabled) {
item {
SettingItem(
title = stringResource(MoviesStrings.settings_tile),
Expand All @@ -354,15 +354,15 @@ internal fun SettingsScreenContent(
onClick = settingsData.tileData.onRequest
)
}
}
if (settingsData.appIconData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.appIconData.isFeatureEnabled) {
item {
Text(
text = stringResource(MoviesStrings.settings_app_launcher_icon),
Expand Down Expand Up @@ -400,15 +400,15 @@ internal fun SettingsScreenContent(
)
}
}
}
if (settingsData.githubData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.githubData.isFeatureEnabled) {
item {
SettingItem(
title = stringResource(MoviesStrings.settings_github),
Expand All @@ -417,15 +417,15 @@ internal fun SettingsScreenContent(
onClick = { settingsData.githubData.onClick(MOVIES_GITHUB_URL) }
)
}
}
if (settingsData.reviewAppData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.reviewAppData.isFeatureEnabled) {
item {
SettingItem(
title = stringResource(MoviesStrings.settings_review),
Expand All @@ -434,15 +434,15 @@ internal fun SettingsScreenContent(
onClick = settingsData.reviewAppData.onRequest
)
}
}
if (settingsData.updateAppData.isFeatureEnabled) {
item {
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
thickness = .1.dp,
color = MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
if (settingsData.updateAppData.isFeatureEnabled) {
item {
SettingItem(
title = stringResource(MoviesStrings.settings_update),
Expand Down
5 changes: 5 additions & 0 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ koin = "3.5.3"
precompose = "1.6.0-rc05"
constraintlayout-compose-multiplatform = "0.3.1"
kmp-viewmodel = "0.7.1"
okio = "3.9.0"

[libraries]
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
Expand Down Expand Up @@ -227,6 +228,7 @@ koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "
precompose = { module = "moe.tlaster:precompose", version.ref = "precompose" }
constraintlayout-compose-multiplatform = { module = "tech.annexflow.compose:constraintlayout-compose-multiplatform", version.ref = "constraintlayout-compose-multiplatform" }
kmp-viewmodel = { module = "io.github.hoc081098:kmp-viewmodel", version.ref = "kmp-viewmodel" }
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }

gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
Expand Down Expand Up @@ -356,6 +358,9 @@ coil-common = [
constraintlayout-common = [
"constraintlayout-compose-multiplatform"
]
okio-common = [
"okio"
]

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
Expand Down

0 comments on commit 7949a79

Please sign in to comment.