From 3a2772513cd35e66ba21a729435f520059fbcdfd Mon Sep 17 00:00:00 2001 From: Kamil Gurgul Date: Fri, 24 Nov 2023 07:29:14 +0100 Subject: [PATCH] Swap host UI --- .../kgurgul/cpuinfo/features/HostActivity.kt | 37 +++---------- .../kgurgul/cpuinfo/features/HostScreen.kt | 12 ++--- .../kgurgul/cpuinfo/features/HostViewModel.kt | 7 ++- .../res/drawable-night/ic_c_plus_plus.png | Bin 1263 -> 0 bytes app/src/main/res/drawable/ic_c_plus_plus.png | Bin 518 -> 0 bytes app/src/main/res/drawable/ic_cpu.xml | 12 +++++ app/src/main/res/drawable/ic_sort.xml | 25 --------- app/src/main/res/values/styles.xml | 49 ------------------ 8 files changed, 31 insertions(+), 111 deletions(-) delete mode 100644 app/src/main/res/drawable-night/ic_c_plus_plus.png delete mode 100644 app/src/main/res/drawable/ic_c_plus_plus.png create mode 100644 app/src/main/res/drawable/ic_cpu.xml delete mode 100644 app/src/main/res/drawable/ic_sort.xml diff --git a/app/src/main/java/com/kgurgul/cpuinfo/features/HostActivity.kt b/app/src/main/java/com/kgurgul/cpuinfo/features/HostActivity.kt index d2e33efa..2e82cc71 100644 --- a/app/src/main/java/com/kgurgul/cpuinfo/features/HostActivity.kt +++ b/app/src/main/java/com/kgurgul/cpuinfo/features/HostActivity.kt @@ -16,15 +16,12 @@ package com.kgurgul.cpuinfo.features -import android.os.Build import android.os.Bundle +import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity -import androidx.navigation.NavController -import androidx.navigation.fragment.NavHostFragment -import androidx.navigation.ui.setupWithNavController +import androidx.core.view.WindowCompat import com.kgurgul.cpuinfo.R -import com.kgurgul.cpuinfo.databinding.ActivityHostLayoutBinding -import com.kgurgul.cpuinfo.utils.setupEdgeToEdge +import com.kgurgul.cpuinfo.ui.theme.CpuInfoTheme import dagger.hilt.android.AndroidEntryPoint /** @@ -35,33 +32,13 @@ import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class HostActivity : AppCompatActivity() { - private lateinit var navController: NavController - private lateinit var binding: ActivityHostLayoutBinding - override fun onCreate(savedInstanceState: Bundle?) { setTheme(R.style.AppThemeBase) super.onCreate(savedInstanceState) - binding = ActivityHostLayoutBinding.inflate(layoutInflater) - setContentView(binding.root) - setupEdgeToEdge() - setupNavigation() - if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) { - // Processes cannot be listed above M - val menu = binding.bottomNavigation.menu - menu.findItem(R.id.processes).isVisible = false - } - } - - override fun onSupportNavigateUp() = navController.navigateUp() - - private fun setupNavigation() { - navController = - (supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment) - .navController - binding.bottomNavigation.apply { - setupWithNavController(navController) - setOnItemReselectedListener { - // Do nothing - TODO: scroll to top + WindowCompat.setDecorFitsSystemWindows(window, false) + setContent { + CpuInfoTheme { + HostScreen() } } } diff --git a/app/src/main/java/com/kgurgul/cpuinfo/features/HostScreen.kt b/app/src/main/java/com/kgurgul/cpuinfo/features/HostScreen.kt index ba9e4727..cea3b313 100644 --- a/app/src/main/java/com/kgurgul/cpuinfo/features/HostScreen.kt +++ b/app/src/main/java/com/kgurgul/cpuinfo/features/HostScreen.kt @@ -25,7 +25,7 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import com.kgurgul.cpuinfo.R import com.kgurgul.cpuinfo.features.applications.ApplicationsScreen -import com.kgurgul.cpuinfo.features.information.hardware.HardwareInfoScreen +import com.kgurgul.cpuinfo.features.information.InfoContainerScreen import com.kgurgul.cpuinfo.features.processes.ProcessesScreen import com.kgurgul.cpuinfo.features.settings.SettingsScreen import com.kgurgul.cpuinfo.features.temperature.TemperatureScreen @@ -79,10 +79,10 @@ fun HostScreen( ) { paddingValues -> NavHost( navController = navController, - startDestination = HostScreen.Hardware.route, + startDestination = HostScreen.Information.route, modifier = Modifier.padding(paddingValues = paddingValues), ) { - composable(HostScreen.Hardware.route) { HardwareInfoScreen() } + composable(HostScreen.Information.route) { InfoContainerScreen() } composable(HostScreen.Applications.route) { ApplicationsScreen() } composable(HostScreen.Processes.route) { ProcessesScreen() } composable(HostScreen.Temperatures.route) { TemperatureScreen() } @@ -92,7 +92,7 @@ fun HostScreen( } sealed class HostScreen(val route: String) { - data object Hardware : HostScreen("hardware_route") + data object Information : HostScreen("information_route") data object Applications : HostScreen("applications_route") data object Processes : HostScreen("processes_route") data object Temperatures : HostScreen("temperatures_route") @@ -111,8 +111,8 @@ data class HostNavigationItem( add( HostNavigationItem( labelRes = R.string.hardware, - iconRes = R.drawable.ic_hardware, - route = HostScreen.Hardware.route, + iconRes = R.drawable.ic_cpu, + route = HostScreen.Information.route, ) ) add( diff --git a/app/src/main/java/com/kgurgul/cpuinfo/features/HostViewModel.kt b/app/src/main/java/com/kgurgul/cpuinfo/features/HostViewModel.kt index 4e4edbc0..f58b21e4 100644 --- a/app/src/main/java/com/kgurgul/cpuinfo/features/HostViewModel.kt +++ b/app/src/main/java/com/kgurgul/cpuinfo/features/HostViewModel.kt @@ -1,5 +1,6 @@ package com.kgurgul.cpuinfo.features +import android.os.Build import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow @@ -9,7 +10,11 @@ import javax.inject.Inject @HiltViewModel class HostViewModel @Inject constructor() : ViewModel() { - private val _uiStateFlow = MutableStateFlow(UiState()) + private val _uiStateFlow = MutableStateFlow( + UiState( + isProcessSectionVisible = Build.VERSION.SDK_INT <= Build.VERSION_CODES.M + ) + ) val uiStateFlow = _uiStateFlow.asStateFlow() data class UiState( diff --git a/app/src/main/res/drawable-night/ic_c_plus_plus.png b/app/src/main/res/drawable-night/ic_c_plus_plus.png deleted file mode 100644 index 96c22456f748270aaa3932f89286ca62a7c7e954..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1263 zcmb`H`!}0+9LK-Ulf;x?LS8+Wy8M|G~DK}mulg2`}>Bi5R=E3>wG(xRS}6Xw>? zaiY_;#nkA?sZ(NgdCpv-Zq>5ZR7u&XQdO57MS{iu(DOd;&+DAmkDnjjKk>MJI_Q2B z0H71#&kEBJ+pV^i=5~6<^=n{$%0Da^fGY&Y9iQlEF>pngx}P{;YXg%Vr5W822XvSvJFTl^K!N&d+pHNL;hr| zd>QqjzK?KAWF7cmIO|ZZWet@rii{hzx{E~f*FH0AYv^Xu(wY~`T0Y)N9b(R=nGLKA zYz?YChsw%49QR0ooq#U&o*!b}d`FdBEcQCn;ZzuKr=-fo-*I0^+Iv^k1<4pP$bpQ! zKUtI=bW*$48o>jjiJC=Eu-ieQTg3GPLPSoEyxAj(7=n|KOOPTcDuuMp2;Qv7srq<0 zPlRBd)%ET$9Wo_Shb)#~#eY#US7S?0geD24|4P>v&$}!YouLOqP0*@Xs^*p<=iqO( za+V!rdTtKN)yqp(GTM5(J**~7M0-y^>K{q(62fEJ<(K+a>o7BPK{X}PiAjtktHV+t z)58`Ux1j0Aj2P(QjL-;*h-OI8Iy0PuYYEy_5mI(%amh&F^H8cOfn_HRQlt*Q1&Yi>ZYp=GyszEW>a?VOh*vV7J5-AjuoRJdDe{e*>yrAc zGGIJ#{5Le&?~a9nY$PCb+cR%JS?H*|H{x7qc}jk+ex|MkmAP2S9mzr4+`f&SxEb4H z$G;Av{L*hEi0257kd2g!#qJrG%^L5!2 zg})e~@yW2;QJ-t+j2oaArXEL|AJUR>SX0ksF<>1IEheDmdy PX2C!Jo6D;A5nTHpAHx5@ diff --git a/app/src/main/res/drawable/ic_c_plus_plus.png b/app/src/main/res/drawable/ic_c_plus_plus.png deleted file mode 100644 index 216af941847adcfcbf1d716c6c5989e26d27365b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS3dtTpz6=aiszC8(28N&if%HoT zhEf9thF1v;3|2E37{v1@#UFKJU|?M6>EaktaqG<;@4mwd0uBfF{a*xM3JfgdaU?!g&sf6D_{Z8OqL^WGTW2<# zLiUUUYz&*)J$1MezE)Jv5%p{8XB6ON2>Fp6^hl!2@86sAa|(f?9sTSZs?RGhoM7DW zXo>FU+x!lTW%u6v|DSP3hPQabNrqi(uQEn(Brp`{H!vRf$-u+_1Pk6=d-ZDVbH3~L z(-rvV`YLxQ#hgLpGTfu#h4c?-h@jsvsLvmNkV$dJNN z5N*MrX&otPoy<^SvgXOPt?ka@@4Mf}EqxQGS!wg<(;fvThV>nc3piPXpP3d~@sbxP mXrao*p*QajKhTN)|1&d`d{dISFD7aXa + + + diff --git a/app/src/main/res/drawable/ic_sort.xml b/app/src/main/res/drawable/ic_sort.xml deleted file mode 100644 index 45d01e3f..00000000 --- a/app/src/main/res/drawable/ic_sort.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fdfa9abf..f3f27e91 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -47,53 +47,4 @@ @color/onBackground - - - - - - - - - - - - - - - - - - - - - - - - -