Skip to content

Commit 5509aea

Browse files
committed
bugfix: main viewModel instance
1 parent 6b872b3 commit 5509aea

5 files changed

Lines changed: 28 additions & 3 deletions

File tree

app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import com.androidvip.sysctlgui.ui.settings.SettingsViewModel
99
import com.androidvip.sysctlgui.ui.user.UserParamsViewModel
1010
import com.androidvip.sysctlgui.widgets.FavoriteWidgetParamUpdater
1111
import org.koin.android.ext.koin.androidContext
12+
import org.koin.core.module.dsl.singleOf
1213
import org.koin.core.module.dsl.viewModelOf
1314
import org.koin.dsl.module
1415

1516
internal val presentationModule = module {
16-
viewModelOf(::MainViewModel)
17+
singleOf(::MainViewModel)
1718
viewModelOf(::SettingsViewModel)
1819
viewModelOf(::ParamBrowseViewModel)
1920
viewModelOf(::EditParamViewModel)

app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.androidvip.sysctlgui.ui.main
22

33
import android.app.NotificationManager
4+
import android.graphics.Color
45
import android.os.Build
56
import android.os.Bundle
67
import android.os.Handler
78
import androidx.activity.ComponentActivity
9+
import androidx.activity.SystemBarStyle
810
import androidx.activity.compose.setContent
911
import androidx.activity.enableEdgeToEdge
1012
import androidx.activity.result.contract.ActivityResultContracts
@@ -21,7 +23,18 @@ class MainActivity : ComponentActivity() {
2123

2224
override fun onCreate(savedInstanceState: Bundle?) {
2325
super.onCreate(savedInstanceState)
24-
enableEdgeToEdge()
26+
enableEdgeToEdge(
27+
statusBarStyle = SystemBarStyle.auto(
28+
lightScrim = Color.TRANSPARENT,
29+
darkScrim = Color.TRANSPARENT,
30+
detectDarkMode = { resources ->
31+
prefs.forceDark ||
32+
resources.configuration.uiMode and
33+
android.content.res.Configuration.UI_MODE_NIGHT_MASK ==
34+
android.content.res.Configuration.UI_MODE_NIGHT_YES
35+
}
36+
)
37+
)
2538

2639
setContent {
2740
SysctlGuiTheme(

app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import androidx.compose.runtime.Composable
1717
import androidx.compose.runtime.getValue
1818
import androidx.compose.runtime.remember
1919
import androidx.compose.ui.res.stringResource
20+
import androidx.compose.ui.text.style.TextOverflow
2021
import androidx.compose.ui.tooling.preview.PreviewDynamicColors
2122
import androidx.compose.ui.tooling.preview.PreviewLightDark
2223
import androidx.navigation.NavDestination.Companion.hasRoute
@@ -81,7 +82,13 @@ internal fun MainNavBar(navController: NavHostController = rememberNavController
8182
contentDescription = route.name,
8283
)
8384
},
84-
label = { Text(route.name) },
85+
label = {
86+
Text(
87+
text = route.name,
88+
maxLines = 1,
89+
overflow = TextOverflow.Ellipsis
90+
)
91+
},
8592
selected = selected,
8693
onClick = {
8794
navController.navigate(route.route) {

app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ internal fun SettingsScreen(
7777
MainViewState(
7878
showTopBar = true,
7979
showNavBar = true,
80+
showSearchAction = false
8081
)
8182
)
8283
)

app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.Intent
44
import android.graphics.drawable.AnimatedVectorDrawable
55
import android.os.Bundle
66
import android.os.Handler
7+
import androidx.activity.enableEdgeToEdge
78
import androidx.appcompat.app.AppCompatActivity
89
import androidx.core.content.ContextCompat
910
import com.androidvip.sysctlgui.R
@@ -14,6 +15,8 @@ class StartErrorActivity : AppCompatActivity() {
1415

1516
override fun onCreate(savedInstanceState: Bundle?) {
1617
super.onCreate(savedInstanceState)
18+
enableEdgeToEdge()
19+
1720
binding = ActivityStartErrorBinding.inflate(layoutInflater)
1821
setContentView(binding.root)
1922

0 commit comments

Comments
 (0)