Skip to content

Commit d592bb2

Browse files
LennoardLennoard
committed
refactor: removed params tab layout
1 parent 972530b commit d592bb2

9 files changed

Lines changed: 76 additions & 107 deletions

File tree

‎app/src/main/kotlin/com/androidvip/sysctlgui/helpers/Actions.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.androidvip.sysctlgui.helpers
22

33
enum class Actions {
44
BrowseParams,
5+
ListParams,
56
ExportParams,
67
OpenSettings,
78
EditParam

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,24 @@ class MainActivity : AppCompatActivity() {
4545

4646
private fun setUpNavigation() = with(binding) {
4747
val navController = navHost.navController
48-
val defaultIds = setOf(R.id.navigationBrowse, R.id.navigationExport, R.id.navigationSettings)
48+
val defaultIds = setOf(
49+
R.id.navigationBrowse,
50+
R.id.navigationList,
51+
R.id.navigationExport,
52+
R.id.navigationSettings
53+
)
4954
val appBarConfiguration = AppBarConfiguration(defaultIds)
5055

51-
toolbarLayout.setupWithNavController(toolbar, navController, appBarConfiguration)
52-
navView.setupWithNavController(navController)
56+
toolbar.setupWithNavController(navController, appBarConfiguration)
57+
navView?.setupWithNavController(navController)
58+
navRail?.setupWithNavController(navController)
5359
}
5460

5561
private fun navigateFromIntent() {
5662
val fragmentName = intent.getStringExtra(EXTRA_DESTINATION) ?: return
5763
when (fragmentName) {
5864
Actions.BrowseParams.name -> R.id.navigationBrowse
65+
Actions.ListParams.name -> R.id.navigationList
5966
Actions.ExportParams.name -> R.id.navigationExport
6067
Actions.OpenSettings.name -> R.id.navigationSettings
6168
else -> null

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/KernelParamsFragment.kt‎

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

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
114114
if (currentPath == Consts.PROC_SYS) {
115115
if (isEnabled) {
116116
isEnabled = false
117-
requireActivity().onBackPressed()
117+
requireActivity().onBackPressedDispatcher.onBackPressed()
118118
}
119119
} else {
120120
onDirectoryChanged(

‎app/src/main/res/layout-land/activity_main2.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:fitsSystemWindows="true">
7+
8+
<com.google.android.material.appbar.AppBarLayout
9+
android:id="@+id/appBar"
10+
style="@style/AppTheme.AppBarLayout.Flat"
11+
android:layout_width="match_parent"
12+
android:layout_height="wrap_content"
13+
android:fitsSystemWindows="false">
14+
15+
<androidx.appcompat.widget.Toolbar
16+
android:id="@+id/toolbar"
17+
android:layout_width="match_parent"
18+
android:layout_height="?attr/actionBarSize"
19+
app:layout_collapseMode="pin"
20+
app:title="@string/app_name" />
21+
22+
</com.google.android.material.appbar.AppBarLayout>
23+
24+
<androidx.fragment.app.FragmentContainerView
25+
android:id="@+id/navHostFragment"
26+
android:name="androidx.navigation.fragment.NavHostFragment"
27+
android:layout_width="match_parent"
28+
android:layout_height="match_parent"
29+
android:layout_marginStart="80dp"
30+
app:defaultNavHost="true"
31+
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
32+
app:navGraph="@navigation/main_navigation" />
33+
34+
<com.google.android.material.navigationrail.NavigationRailView
35+
android:id="@+id/navRail"
36+
android:layout_width="wrap_content"
37+
android:layout_height="match_parent"
38+
android:layout_marginTop="?attr/actionBarSize"
39+
app:itemRippleColor="?attr/colorTertiaryContainer"
40+
app:menu="@menu/nav_main" />
41+
42+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎app/src/main/res/layout/activity_main2.xml‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,15 @@
99
android:id="@+id/appBar"
1010
style="@style/AppTheme.AppBarLayout.Flat"
1111
android:layout_width="match_parent"
12-
android:layout_height="@dimen/app_bar_height"
12+
android:layout_height="wrap_content"
1313
android:fitsSystemWindows="false">
1414

15-
<com.google.android.material.appbar.CollapsingToolbarLayout
16-
android:id="@+id/toolbarLayout"
15+
<androidx.appcompat.widget.Toolbar
16+
android:id="@+id/toolbar"
1717
android:layout_width="match_parent"
18-
android:layout_height="match_parent"
19-
android:fitsSystemWindows="true"
20-
app:expandedTitleTextAppearance="?textAppearanceHeadline4"
21-
app:forceApplySystemWindowInsetTop="true"
22-
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
23-
app:titleCollapseMode="fade">
24-
25-
<androidx.appcompat.widget.Toolbar
26-
android:id="@+id/toolbar"
27-
android:layout_width="match_parent"
28-
android:layout_height="?attr/actionBarSize"
29-
app:layout_collapseMode="pin"
30-
app:title="@string/app_name" />
31-
32-
</com.google.android.material.appbar.CollapsingToolbarLayout>
18+
android:layout_height="?attr/actionBarSize"
19+
app:layout_collapseMode="pin"
20+
app:title="@string/app_name" />
3321

3422
</com.google.android.material.appbar.AppBarLayout>
3523

‎app/src/main/res/layout/fragment_kernel_params.xml‎

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

‎app/src/main/res/menu/nav_main.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
android:icon="@drawable/ic_folder_outline"
77
android:title="@string/browse" />
88

9+
<item
10+
android:id="@+id/navigationList"
11+
android:icon="@drawable/ic_search"
12+
android:title="@string/param_list" />
13+
914
<item
1015
android:id="@+id/navigationExport"
1116
android:icon="@drawable/ic_export_params"

‎app/src/main/res/navigation/main_navigation.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,17 @@
77

88
<fragment
99
android:id="@+id/navigationBrowse"
10-
android:name="com.androidvip.sysctlgui.ui.params.KernelParamsFragment"
11-
android:label="@string/kernel_params">
10+
android:name="com.androidvip.sysctlgui.ui.params.browse.KernelParamBrowseFragment"
11+
android:label="@string/browse">
12+
<action
13+
android:id="@+id/navigateFavoritesParams"
14+
app:destination="@id/manageFavoritesParamsActivity" />
15+
</fragment>
16+
17+
<fragment
18+
android:id="@+id/navigationList"
19+
android:name="com.androidvip.sysctlgui.ui.params.list.KernelParamListFragment"
20+
android:label="@string/param_list">
1221
<action
1322
android:id="@+id/navigateFavoritesParams"
1423
app:destination="@id/manageFavoritesParamsActivity" />

0 commit comments

Comments
 (0)