Skip to content

Commit

Permalink
Properly close app,
Browse files Browse the repository at this point in the history
Get available languages list for composeResources,
Back gesture navigation in multiplatform settings,
Proper ExecutorActivity,
Don't generate android locale config,
Properly serialize settings,
Fixed crashes when NicePreferences.java tries to get an value with a different type,
Suggest to restart in new settings,
Redirect from SettingsActivity2 to SplashActivity

Signed-off-by: MrBoom <[email protected]>
  • Loading branch information
MrBoomDeveloper committed Jan 26, 2025
1 parent d34cdc7 commit 2e09876
Show file tree
Hide file tree
Showing 111 changed files with 1,108 additions and 1,327 deletions.
7 changes: 1 addition & 6 deletions androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ android {
versionName = "$releaseVersion-${getGitCommitHash(project)}"
buildConfigField("long", "BUILD_TIME", "${System.currentTimeMillis()}")
}

androidResources {
generateLocaleConfig = true
}

sourceSets["main"].apply {
kotlin.srcDir(generatedSettingsKotlinDirectory)
Expand Down Expand Up @@ -83,7 +79,7 @@ android {
freeCompilerArgs = listOf("-Xcontext-receivers", "-Xmulti-platform", "-opt-in=kotlin.ExperimentalStdlibApi")
}

flavorDimensions += listOf("channel")
flavorDimensions += "channel"

productFlavors {
fun ApplicationProductFlavor.createChannelProductFlavor(id: String, title: String) {
Expand Down Expand Up @@ -217,7 +213,6 @@ composeCompiler {
}

tasks.register<GenerateSettingsTask>("generateSettings") {
packageName = "com.mrboomdev.awery.generated"
className = "AwerySettings"
inputFiles = listOf(
layout.projectDirectory.file("src/main/assets/app_settings.json"),
Expand Down
1 change: 0 additions & 1 deletion androidApp/mobile/.gitignore

This file was deleted.

58 changes: 0 additions & 58 deletions androidApp/mobile/build.gradle.kts

This file was deleted.

21 changes: 0 additions & 21 deletions androidApp/mobile/proguard-rules.pro

This file was deleted.

22 changes: 0 additions & 22 deletions androidApp/mobile/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2e09876

Please sign in to comment.