Update SDK to 34

app/build.gradle.kts

@@ -83,19 +83,15 @@ android {
  buildConfig = true
  }
 
- packaging {
- resources {
- excludes += setOf(
- "META-INF/**",
- "okhttp3/**",
- "kotlin/**",
- "org/**",
- "**.properties",
- "**.bin",
- "**/*.proto"
- )
- }
- }
+ packaging.resources.excludes += setOf(
+ "META-INF/**",
+ "okhttp3/**",
+ "kotlin/**",
+ "org/**",
+ "**.properties",
+ "**.bin",
+ "**/*.proto"
+ )
 
  applicationVariants.configureEach {
  outputs.configureEach {
@@ -133,7 +129,6 @@ protobuf {
 
 dependencies {
  implementation(libs.accompanist.drawablepainter)
- implementation(libs.accompanist.navigation.animation)
  implementation(libs.accompanist.permissions)
  implementation(libs.accompanist.systemuicontroller)
  implementation(libs.androidx.activity.compose)

app/src/main/AndroidManifest.xml

@@ -8,15 +8,17 @@
  <uses-permission android:name="android.permission.INTERNET"/>
  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
  <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
 
  <application
  android:name=".App"
  android:icon="@mipmap/ic_launcher"
  android:label="@string/app_name"
  android:theme="@style/AppTheme"
- android:enableOnBackInvokedCallback="true"
  android:localeConfig="@xml/locales_config"
- tools:targetApi="tiramisu" >
+ android:enableOnBackInvokedCallback="true"
+ tools:targetApi="34">
 
  <activity
  android:name=".ui.activity.main.MainActivity"
@@ -31,8 +33,7 @@
 
  <activity android:name=".ui.activity.log.LogActivity"
  android:label="@string/settings_log_viewer"
- android:exported="true"
- android:launchMode="singleTask"/>
+ android:exported="true"/>
 
  <service android:name=".service.LocationService"
  android:foregroundServiceType="location"
@@ -42,7 +43,7 @@
  <service android:name=".service.CalculateService"
  android:foregroundServiceType="dataSync"
  android:enabled="true"
- android:exported="false" />
+ android:exported="false"/>
 
  <service android:name=".service.LogcatService"
  android:exported="false"/>
@@ -52,7 +53,7 @@
  android:enabled="true"
  android:exported="true">
  <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="android.intent.action.BOOT_COMPLETED"/>
  </intent-filter>
  </receiver>
 

app/src/main/kotlin/com/sanmer/geomag/datastore/UserData.kt

@@ -10,16 +10,14 @@ data class UserData(
  val darkMode: DarkMode,
  val themeColor: Int,
  val fieldModel: Geomag.Models,
- val enableRecords: Boolean,
- val enableNavigationAnimation: Boolean
+ val enableRecords: Boolean
 ) {
  companion object {
  fun default() = UserData(
  darkMode = DarkMode.FOLLOW_SYSTEM,
  themeColor = if (OsUtils.atLeastS) Colors.Dynamic.id else Colors.Sakura.id,
  fieldModel = Geomag.Models.IGRF,
- enableRecords = true,
- enableNavigationAnimation = false
+ enableRecords = true
  )
  }
 }
@@ -36,13 +34,11 @@ fun UserData.toPreferences(): UserPreferences = UserPreferences.newBuilder()
  .setThemeColor(themeColor)
  .setFieldModel(fieldModel.name)
  .setEnableRecords(enableRecords)
- .setEnableNavigationAnimation(enableNavigationAnimation)
  .build()
 
 fun UserPreferences.toUserData() = UserData(
  darkMode = darkMode,
  themeColor = themeColor,
  fieldModel = Geomag.Models.valueOf(fieldModel),
- enableRecords = enableRecords,
- enableNavigationAnimation = enableNavigationAnimation
+ enableRecords = enableRecords
 )

app/src/main/kotlin/com/sanmer/geomag/datastore/UserPreferencesDataSource.kt

@@ -42,12 +42,4 @@ class UserPreferencesDataSource @Inject constructor(
  }
  }
  }
-
- suspend fun setEnableNavigationAnimation(value: Boolean) = withContext(Dispatchers.IO) {
- userPreferences.updateData {
- it.copy {
- enableNavigationAnimation = value
- }
- }
- }
 }

app/src/main/kotlin/com/sanmer/geomag/repository/UserDataRepository.kt

@@ -46,8 +46,4 @@ class UserDataRepository @Inject constructor(
  fun setEnableRecords(value: Boolean) = applicationScope.launch {
  userPreferencesDataSource.setEnableRecords(value)
  }
-
- fun setEnableNavigationAnimation(value: Boolean) = applicationScope.launch {
- userPreferencesDataSource.setEnableNavigationAnimation(value)
- }
 }

app/src/main/kotlin/com/sanmer/geomag/ui/activity/main/MainActivity.kt

@@ -18,11 +18,7 @@ class MainActivity : BaseActivity() {
 
  LocationManagerUtils.PermissionsState()
 
- if (it.enableNavigationAnimation) {
- AnimatedMainScreen()
- } else {
- NormalMainScreen()
- }
+ MainScreen()
  }
  }
 }

app/src/main/kotlin/com/sanmer/geomag/ui/activity/main/MainScreen.kt

@@ -5,47 +5,14 @@ import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import com.sanmer.geomag.ui.navigation.MainScreen
-import com.sanmer.geomag.ui.navigation.animated.calculateScreen as animatedCalculateScreen
-import com.sanmer.geomag.ui.navigation.animated.homeScreen as animatedHomeScreen
-import com.sanmer.geomag.ui.navigation.animated.recordsScreen as animatedRecordsScreen
-import com.sanmer.geomag.ui.navigation.animated.settingsScreen as animatedSettingsScreen
-import com.sanmer.geomag.ui.navigation.normal.calculateScreen as normalCalculateScreen
-import com.sanmer.geomag.ui.navigation.normal.homeScreen as normalHomeScreen
-import com.sanmer.geomag.ui.navigation.normal.recordsScreen as normalRecordsScreen
-import com.sanmer.geomag.ui.navigation.normal.settingsScreen as normalSettingsScreen
+import com.sanmer.geomag.ui.navigation.graphs.customizeScreen
+import com.sanmer.geomag.ui.navigation.graphs.homeScreen
+import com.sanmer.geomag.ui.navigation.graphs.recordsScreen
+import com.sanmer.geomag.ui.navigation.graphs.settingsScreen
 
 @Composable
-fun AnimatedMainScreen() {
- val navController = rememberAnimatedNavController()
-
- Surface(
- color = MaterialTheme.colorScheme.background
- ) {
- AnimatedNavHost(
- navController = navController,
- startDestination = MainScreen.Home.route
- ) {
- animatedHomeScreen(
- navController = navController
- )
- animatedCalculateScreen(
- navController = navController
- )
- animatedRecordsScreen(
- navController = navController
- )
- animatedSettingsScreen(
- navController = navController
- )
- }
- }
-}
-
-@Composable
-fun NormalMainScreen() {
+fun MainScreen() {
  val navController = rememberNavController()
 
  Surface(
@@ -55,16 +22,16 @@ fun NormalMainScreen() {
  navController = navController,
  startDestination = MainScreen.Home.route
  ) {
- normalHomeScreen(
+ homeScreen(
  navController = navController
  )
- normalCalculateScreen(
+ customizeScreen(
  navController = navController
  )
- normalRecordsScreen(
+ recordsScreen(
  navController = navController
  )
- normalSettingsScreen(
+ settingsScreen(
  navController = navController
  )
  }

app/src/main/kotlin/com/sanmer/geomag/ui/navigation/animated/Calculate.kt → app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Customize.kt

@@ -1,32 +1,32 @@
-package com.sanmer.geomag.ui.navigation.animated
+package com.sanmer.geomag.ui.navigation.graphs
 
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.navigation
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
 import com.sanmer.geomag.ui.animate.slideInRightToLeft
 import com.sanmer.geomag.ui.animate.slideOutLeftToRight
 import com.sanmer.geomag.ui.navigation.MainScreen
-import com.sanmer.geomag.ui.screens.calculate.CalculateScreen
+import com.sanmer.geomag.ui.screens.customize.CustomizeScreen
 
-enum class CalculateScreen(val route: String) {
- Home("Calculate")
+enum class CustomizeScreen(val route: String) {
+ Home("Customize")
 }
 
-fun NavGraphBuilder.calculateScreen(
+fun NavGraphBuilder.customizeScreen(
  navController: NavController
 ) = navigation(
- startDestination = CalculateScreen.Home.route,
+ startDestination = CustomizeScreen.Home.route,
  route = MainScreen.Calculate.route
 ) {
  composable(
- route = CalculateScreen.Home.route,
+ route = CustomizeScreen.Home.route,
  enterTransition = { slideInRightToLeft() + fadeIn() },
  exitTransition = { slideOutLeftToRight() + fadeOut() }
  ) {
- CalculateScreen(
+ CustomizeScreen(
  navController = navController
  )
  }

app/src/main/kotlin/com/sanmer/geomag/ui/navigation/animated/Home.kt → app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Home.kt

@@ -1,11 +1,11 @@
-package com.sanmer.geomag.ui.navigation.animated
+package com.sanmer.geomag.ui.navigation.graphs
 
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.navigation
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
 import com.sanmer.geomag.ui.navigation.MainScreen
 import com.sanmer.geomag.ui.screens.home.HomeScreen
 

app/src/main/kotlin/com/sanmer/geomag/ui/navigation/animated/Records.kt → app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Records.kt

@@ -1,13 +1,13 @@
-package com.sanmer.geomag.ui.navigation.animated
+package com.sanmer.geomag.ui.navigation.graphs
 
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavType
 import androidx.navigation.navArgument
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.navigation
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
 import com.sanmer.geomag.database.entity.primaryKey
 import com.sanmer.geomag.model.Record
 import com.sanmer.geomag.ui.animate.slideInLeftToRight

app/src/main/kotlin/com/sanmer/geomag/ui/navigation/animated/Settings.kt → app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Settings.kt

@@ -1,11 +1,11 @@
-package com.sanmer.geomag.ui.navigation.animated
+package com.sanmer.geomag.ui.navigation.graphs
 
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.navigation
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
 import com.sanmer.geomag.ui.animate.slideInLeftToRight
 import com.sanmer.geomag.ui.animate.slideInRightToLeft
 import com.sanmer.geomag.ui.animate.slideOutLeftToRight