File tree Expand file tree Collapse file tree
app/src/main/kotlin/com/androidvip/sysctlgui Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -9,11 +9,12 @@ import com.androidvip.sysctlgui.ui.settings.SettingsViewModel
99import com.androidvip.sysctlgui.ui.user.UserParamsViewModel
1010import com.androidvip.sysctlgui.widgets.FavoriteWidgetParamUpdater
1111import org.koin.android.ext.koin.androidContext
12+ import org.koin.core.module.dsl.singleOf
1213import org.koin.core.module.dsl.viewModelOf
1314import org.koin.dsl.module
1415
1516internal val presentationModule = module {
16- viewModelOf (::MainViewModel )
17+ singleOf (::MainViewModel )
1718 viewModelOf(::SettingsViewModel )
1819 viewModelOf(::ParamBrowseViewModel )
1920 viewModelOf(::EditParamViewModel )
Original file line number Diff line number Diff line change 11package com.androidvip.sysctlgui.ui.main
22
33import android.app.NotificationManager
4+ import android.graphics.Color
45import android.os.Build
56import android.os.Bundle
67import android.os.Handler
78import androidx.activity.ComponentActivity
9+ import androidx.activity.SystemBarStyle
810import androidx.activity.compose.setContent
911import androidx.activity.enableEdgeToEdge
1012import 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 (
Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ import androidx.compose.runtime.Composable
1717import androidx.compose.runtime.getValue
1818import androidx.compose.runtime.remember
1919import androidx.compose.ui.res.stringResource
20+ import androidx.compose.ui.text.style.TextOverflow
2021import androidx.compose.ui.tooling.preview.PreviewDynamicColors
2122import androidx.compose.ui.tooling.preview.PreviewLightDark
2223import 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) {
Original file line number Diff line number Diff line change @@ -77,6 +77,7 @@ internal fun SettingsScreen(
7777 MainViewState (
7878 showTopBar = true ,
7979 showNavBar = true ,
80+ showSearchAction = false
8081 )
8182 )
8283 )
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import android.content.Intent
44import android.graphics.drawable.AnimatedVectorDrawable
55import android.os.Bundle
66import android.os.Handler
7+ import androidx.activity.enableEdgeToEdge
78import androidx.appcompat.app.AppCompatActivity
89import androidx.core.content.ContextCompat
910import 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
You can’t perform that action at this time.
0 commit comments