From 077e0e4266a8e45902010ee1f5cf782dfb8f5e7e Mon Sep 17 00:00:00 2001 From: Nedifinita Date: Thu, 28 Aug 2025 01:44:11 +0800 Subject: [PATCH] refactor: clean up dead code --- .idea/deploymentTargetSelector.xml | 6 ++ app/src/main/AndroidManifest.xml | 7 -- .../org/noxylva/lbjconsole/MainActivity.kt | 10 +-- .../noxylva/lbjconsole/NotificationService.kt | 2 +- .../noxylva/lbjconsole/SettingsActivity.kt | 66 ------------------- .../lbjconsole/ui/screens/SettingsScreen.kt | 8 ++- app/src/main/res/drawable/ic_person.xml | 13 ---- app/src/main/res/layout/activity_settings.xml | 55 ---------------- 8 files changed, 14 insertions(+), 153 deletions(-) delete mode 100644 app/src/main/java/org/noxylva/lbjconsole/SettingsActivity.kt delete mode 100755 app/src/main/res/drawable/ic_person.xml delete mode 100755 app/src/main/res/layout/activity_settings.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef3..cfd0f47 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -2,6 +2,12 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f296ef..cc2ae1f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,13 +41,6 @@ - - ?, mapZoomLevel: Double, mapRailwayLayerVisible: Boolean, - onMapStateChange: (Pair?, Double, Boolean) -> Unit, - - onOpenSettings: () -> Unit + onMapStateChange: (Pair?, Double, Boolean) -> Unit ) { val statusColor = if (isConnected) Color(0xFF4CAF50) else Color(0xFFFF5722) diff --git a/app/src/main/java/org/noxylva/lbjconsole/NotificationService.kt b/app/src/main/java/org/noxylva/lbjconsole/NotificationService.kt index d0cb537..272f13c 100644 --- a/app/src/main/java/org/noxylva/lbjconsole/NotificationService.kt +++ b/app/src/main/java/org/noxylva/lbjconsole/NotificationService.kt @@ -92,7 +92,7 @@ class NotificationService(private val context: Context) { context, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE ) val remoteViews = RemoteViews(context.packageName, R.layout.notification_train_record) diff --git a/app/src/main/java/org/noxylva/lbjconsole/SettingsActivity.kt b/app/src/main/java/org/noxylva/lbjconsole/SettingsActivity.kt deleted file mode 100644 index 4c5deee..0000000 --- a/app/src/main/java/org/noxylva/lbjconsole/SettingsActivity.kt +++ /dev/null @@ -1,66 +0,0 @@ -package org.noxylva.lbjconsole - -import android.content.Context -import android.os.Bundle -import android.widget.Switch -import androidx.appcompat.app.AppCompatActivity -import androidx.lifecycle.lifecycleScope -import kotlinx.coroutines.launch -import org.noxylva.lbjconsole.database.AppSettingsRepository - -class SettingsActivity : AppCompatActivity() { - - companion object { - suspend fun isBackgroundServiceEnabled(context: Context): Boolean { - val repository = AppSettingsRepository(context) - return repository.getSettings().backgroundServiceEnabled - } - - suspend fun setBackgroundServiceEnabled(context: Context, enabled: Boolean) { - val repository = AppSettingsRepository(context) - repository.updateBackgroundServiceEnabled(enabled) - } - } - - private lateinit var backgroundServiceSwitch: Switch - private lateinit var appSettingsRepository: AppSettingsRepository - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_settings) - - supportActionBar?.setDisplayHomeAsUpEnabled(true) - supportActionBar?.title = "Settings" - - appSettingsRepository = AppSettingsRepository(this) - - initViews() - setupListeners() - } - - private fun initViews() { - backgroundServiceSwitch = findViewById(R.id.switch_background_service) - lifecycleScope.launch { - backgroundServiceSwitch.isChecked = isBackgroundServiceEnabled(this@SettingsActivity) - } - } - - private fun setupListeners() { - backgroundServiceSwitch.setOnCheckedChangeListener { _, isChecked -> - lifecycleScope.launch { - setBackgroundServiceEnabled(this@SettingsActivity, isChecked) - } - - if (isChecked) { - BackgroundService.startService(this) - } else { - BackgroundService.stopService(this) - } - } - } - - override fun onSupportNavigateUp(): Boolean { - onBackPressed() - return true - } -} \ No newline at end of file diff --git a/app/src/main/java/org/noxylva/lbjconsole/ui/screens/SettingsScreen.kt b/app/src/main/java/org/noxylva/lbjconsole/ui/screens/SettingsScreen.kt index a358d0e..e21296b 100644 --- a/app/src/main/java/org/noxylva/lbjconsole/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/org/noxylva/lbjconsole/ui/screens/SettingsScreen.kt @@ -19,7 +19,7 @@ import kotlinx.coroutines.launch import org.noxylva.lbjconsole.model.MergeSettings import org.noxylva.lbjconsole.model.GroupBy import org.noxylva.lbjconsole.model.TimeWindow -import org.noxylva.lbjconsole.SettingsActivity +import org.noxylva.lbjconsole.database.AppSettingsRepository import org.noxylva.lbjconsole.BackgroundService import org.noxylva.lbjconsole.NotificationService import androidx.compose.foundation.rememberScrollState @@ -199,7 +199,8 @@ fun SettingsScreen( val coroutineScope = rememberCoroutineScope() LaunchedEffect(context) { - backgroundServiceEnabled = SettingsActivity.isBackgroundServiceEnabled(context) + val repository = AppSettingsRepository(context) + backgroundServiceEnabled = repository.getSettings().backgroundServiceEnabled } var notificationEnabled by remember(context, notificationService) { @@ -231,7 +232,8 @@ fun SettingsScreen( onCheckedChange = { enabled -> backgroundServiceEnabled = enabled coroutineScope.launch { - SettingsActivity.setBackgroundServiceEnabled(context, enabled) + val repository = AppSettingsRepository(context) + repository.updateBackgroundServiceEnabled(enabled) if (enabled) { BackgroundService.startService(context) } else { diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml deleted file mode 100755 index 2da1c39..0000000 --- a/app/src/main/res/drawable/ic_person.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml deleted file mode 100755 index e6718ef..0000000 --- a/app/src/main/res/layout/activity_settings.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file