Skip to content

Commit 4f9cdcf

Browse files
committed
clean up
1 parent 1e61099 commit 4f9cdcf

File tree

8 files changed

+1
-349
lines changed

8 files changed

+1
-349
lines changed

app/src/main/kotlin/com/dergoogler/mmrl/background/BootBroadcastReceiver.kt

Lines changed: 0 additions & 40 deletions
This file was deleted.

app/src/main/kotlin/com/dergoogler/mmrl/background/ModuleUpdateWorker.kt

Lines changed: 0 additions & 116 deletions
This file was deleted.

app/src/main/kotlin/com/dergoogler/mmrl/background/RepoUpdateWorker.kt

Lines changed: 0 additions & 60 deletions
This file was deleted.

app/src/main/kotlin/com/dergoogler/mmrl/ui/activity/MainActivity.kt

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
1717
import androidx.core.view.WindowCompat
1818
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1919
import androidx.lifecycle.lifecycleScope
20-
import com.dergoogler.mmrl.R
2120
import com.dergoogler.mmrl.app.Const
22-
import com.dergoogler.mmrl.background.BootBroadcastReceiver
2321
import com.dergoogler.mmrl.database.entity.Repo.Companion.toRepo
2422
import com.dergoogler.mmrl.datastore.model.WorkingMode
2523
import com.dergoogler.mmrl.datastore.model.WorkingMode.Companion.isRoot
@@ -50,18 +48,6 @@ class MainActivity : MMRLComponentActivity() {
5048

5149
splashScreen.setKeepOnScreenCondition { isLoading }
5250

53-
createNotificationChannel(
54-
channelName = REPO_WORKER_CHANNEL_NAME,
55-
channelTitle = REPO_WORKER_CHANNEL_TITLE,
56-
channelDesc = REPO_WORKER_CHANNEL_DESC
57-
)
58-
59-
createNotificationChannel(
60-
channelName = MODULE_WORKER_CHANNEL_NAME,
61-
channelTitle = MODULE_WORKER_CHANNEL_TITLE,
62-
channelDesc = MODULE_WORKER_CHANNEL_DESC
63-
)
64-
6551
setBaseContent {
6652
val windowSizeClass = calculateWindowSizeClass(this)
6753

@@ -89,11 +75,6 @@ class MainActivity : MMRLComponentActivity() {
8975
preferences = preferences,
9076
)
9177

92-
if (!preferences.workingMode.isSetup) BootBroadcastReceiver.startWorkManagers(
93-
this@MainActivity,
94-
preferences
95-
)
96-
9778
NetworkUtils.setEnableDoh(preferences.useDoh)
9879
setInstallActivityEnabled(preferences.workingMode.isRoot)
9980
setWebUIActivityEnabled(preferences.workingMode.isRoot)
@@ -192,18 +173,4 @@ class MainActivity : MMRLComponentActivity() {
192173
PackageManager.DONT_KILL_APP
193174
)
194175
}
195-
196-
companion object {
197-
const val REPO_UPDATE_WORK_NAME = "RepoUpdateWork"
198-
const val REPO_WORKER_ID = 1
199-
const val REPO_WORKER_CHANNEL_NAME = "RepoUpdateChannel"
200-
val REPO_WORKER_CHANNEL_TITLE = R.string.work_repository_updates
201-
val REPO_WORKER_CHANNEL_DESC = R.string.work_updates_for_repositories
202-
203-
const val MODULE_UPDATE_WORK_NAME = "ModuleUpdateWork"
204-
const val MODULE_WORKER_ID = 2
205-
const val MODULE_WORKER_CHANNEL_NAME = "ModuleUpdateChannel"
206-
val MODULE_WORKER_CHANNEL_TITLE = R.string.work_module_updates
207-
val MODULE_WORKER_CHANNEL_DESC = R.string.work_update_checker_for_modules
208-
}
209176
}

app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/settings/updates/UpdatesScreen.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import kotlinx.coroutines.launch
2626
@Composable
2727
fun radioOptionItem(interval: Long): RadioOptionItem<Long> {
2828
return RadioOptionItem(
29-
title = pluralStringResource(id = R.plurals.hours, count = interval.toInt()),
29+
title = pluralStringResource(id = R.plurals.hours, count = interval.toInt(), interval),
3030
value = interval
3131
)
3232
}
@@ -127,7 +127,6 @@ fun UpdatesScreen() {
127127
userPreferences.autoUpdateReposInterval
128128
),
129129
enabled = userPreferences.autoUpdateRepos,
130-
suffix = stringResource(id = R.string.settings_repo_update_interval_suffix),
131130
value = userPreferences.autoUpdateReposInterval,
132131
options = optionsOfHours,
133132
onConfirm = {
@@ -168,7 +167,6 @@ fun UpdatesScreen() {
168167
userPreferences.checkModuleUpdatesInterval
169168
),
170169
enabled = userPreferences.useProviderAsBackgroundService && userPreferences.checkModuleUpdates,
171-
suffix = stringResource(id = R.string.settings_check_modules_update_interval_suffix),
172170
value = userPreferences.checkModuleUpdatesInterval,
173171
options = optionsOfHours,
174172
onConfirm = {

0 commit comments

Comments
 (0)