Skip to content

Commit 1e713ab

Browse files
tibbitibbi
committed
add a setting button for managing shown tabs
1 parent 90b9eee commit 1e713ab

File tree

6 files changed

+120
-4
lines changed

6 files changed

+120
-4
lines changed

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.simplemobiletools.commons.extensions.*
1111
import com.simplemobiletools.commons.helpers.*
1212
import com.simplemobiletools.commons.models.RadioItem
1313
import com.simplemobiletools.filemanager.pro.R
14+
import com.simplemobiletools.filemanager.pro.dialogs.ManageVisibleTabsDialog
1415
import com.simplemobiletools.filemanager.pro.extensions.config
1516
import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
1617
import kotlinx.android.synthetic.main.activity_settings.*
@@ -28,6 +29,7 @@ class SettingsActivity : SimpleActivity() {
2829
setupCustomizeColors()
2930
setupUseEnglish()
3031
setupManageFavorites()
32+
setupManageShownTabs()
3133
setupChangeDateTimeFormat()
3234
setupFontSize()
3335
setupShowHidden()
@@ -76,6 +78,12 @@ class SettingsActivity : SimpleActivity() {
7678
}
7779
}
7880

81+
private fun setupManageShownTabs() {
82+
settings_manage_tabs_holder.setOnClickListener {
83+
ManageVisibleTabsDialog(this)
84+
}
85+
}
86+
7987
private fun setupChangeDateTimeFormat() {
8088
settings_change_date_time_format_holder.setOnClickListener {
8189
ChangeDateTimeFormatDialog(this) {}
@@ -86,10 +94,10 @@ class SettingsActivity : SimpleActivity() {
8694
settings_font_size.text = getFontSizeText()
8795
settings_font_size_holder.setOnClickListener {
8896
val items = arrayListOf(
89-
RadioItem(FONT_SIZE_SMALL, getString(R.string.small)),
90-
RadioItem(FONT_SIZE_MEDIUM, getString(R.string.medium)),
91-
RadioItem(FONT_SIZE_LARGE, getString(R.string.large)),
92-
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large)))
97+
RadioItem(FONT_SIZE_SMALL, getString(R.string.small)),
98+
RadioItem(FONT_SIZE_MEDIUM, getString(R.string.medium)),
99+
RadioItem(FONT_SIZE_LARGE, getString(R.string.large)),
100+
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large)))
93101

94102
RadioGroupDialog(this@SettingsActivity, items, config.fontSize) {
95103
config.fontSize = it as Int

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ManageVisibleTabsDialog.kt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.simplemobiletools.filemanager.pro.dialogs
2+
3+
import androidx.appcompat.app.AlertDialog
4+
import com.simplemobiletools.commons.activities.BaseSimpleActivity
5+
import com.simplemobiletools.commons.extensions.setupDialogStuff
6+
import com.simplemobiletools.commons.helpers.*
7+
import com.simplemobiletools.commons.views.MyAppCompatCheckbox
8+
import com.simplemobiletools.filemanager.pro.R
9+
import com.simplemobiletools.filemanager.pro.extensions.config
10+
import com.simplemobiletools.filemanager.pro.helpers.ALL_TABS_MASK
11+
12+
class ManageVisibleTabsDialog(val activity: BaseSimpleActivity) {
13+
private var view = activity.layoutInflater.inflate(R.layout.dialog_manage_visible_tabs, null)
14+
private val tabs = LinkedHashMap<Int, Int>()
15+
16+
init {
17+
tabs.apply {
18+
put(TAB_FILES, R.id.manage_visible_tabs_files)
19+
put(TAB_RECENT_FILES, R.id.manage_visible_tabs_recent_files)
20+
}
21+
22+
val showTabs = activity.config.showTabs
23+
for ((key, value) in tabs) {
24+
view.findViewById<MyAppCompatCheckbox>(value).isChecked = showTabs and key != 0
25+
}
26+
27+
AlertDialog.Builder(activity)
28+
.setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
29+
.setNegativeButton(R.string.cancel, null)
30+
.create().apply {
31+
activity.setupDialogStuff(view, this)
32+
}
33+
}
34+
35+
private fun dialogConfirmed() {
36+
var result = 0
37+
for ((key, value) in tabs) {
38+
if (view.findViewById<MyAppCompatCheckbox>(value).isChecked) {
39+
result += key
40+
}
41+
}
42+
43+
if (result == 0) {
44+
result = ALL_TABS_MASK
45+
}
46+
47+
activity.config.showTabs = result
48+
}
49+
}

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,8 @@ class Config(context: Context) : BaseConfig(context) {
117117
var displayFilenames: Boolean
118118
get() = prefs.getBoolean(DISPLAY_FILE_NAMES, true)
119119
set(displayFilenames) = prefs.edit().putBoolean(DISPLAY_FILE_NAMES, displayFilenames).apply()
120+
121+
var showTabs: Int
122+
get() = prefs.getInt(SHOW_TABS, ALL_TABS_MASK)
123+
set(showTabs) = prefs.edit().putInt(SHOW_TABS, showTabs).apply()
120124
}

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const val VIEW_TYPE_PREFIX = "view_type_folder_"
1919
const val FILE_COLUMN_CNT = "file_column_cnt"
2020
const val FILE_LANDSCAPE_COLUMN_CNT = "file_landscape_column_cnt"
2121
const val DISPLAY_FILE_NAMES = "display_file_names"
22+
const val SHOW_TABS = "show_tabs"
2223

2324
// open as
2425
const val OPEN_AS_DEFAULT = 0

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,27 @@
7676

7777
</RelativeLayout>
7878

79+
<RelativeLayout
80+
android:id="@+id/settings_manage_tabs_holder"
81+
android:layout_width="match_parent"
82+
android:layout_height="wrap_content"
83+
android:layout_marginTop="@dimen/medium_margin"
84+
android:background="?attr/selectableItemBackground"
85+
android:paddingStart="@dimen/normal_margin"
86+
android:paddingTop="@dimen/activity_margin"
87+
android:paddingEnd="@dimen/normal_margin"
88+
android:paddingBottom="@dimen/activity_margin">
89+
90+
<com.simplemobiletools.commons.views.MyTextView
91+
android:id="@+id/settings_manage_tabs"
92+
android:layout_width="match_parent"
93+
android:layout_height="wrap_content"
94+
android:layout_centerVertical="true"
95+
android:paddingStart="@dimen/medium_margin"
96+
android:text="@string/manage_shown_tabs" />
97+
98+
</RelativeLayout>
99+
79100
<RelativeLayout
80101
android:id="@+id/settings_change_date_time_format_holder"
81102
android:layout_width="match_parent"

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/manage_visible_tabs_scroll_view"
4+
android:layout_width="match_parent"
5+
android:layout_height="wrap_content">
6+
7+
<LinearLayout
8+
android:id="@+id/manage_visible_tabs_holder"
9+
android:layout_width="match_parent"
10+
android:layout_height="wrap_content"
11+
android:orientation="vertical"
12+
android:paddingStart="@dimen/activity_margin"
13+
android:paddingTop="@dimen/activity_margin"
14+
android:paddingEnd="@dimen/activity_margin">
15+
16+
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
17+
android:id="@+id/manage_visible_tabs_files"
18+
android:layout_width="match_parent"
19+
android:layout_height="wrap_content"
20+
android:paddingTop="@dimen/activity_margin"
21+
android:paddingBottom="@dimen/activity_margin"
22+
android:text="@string/files_tab" />
23+
24+
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
25+
android:id="@+id/manage_visible_tabs_recent_files"
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content"
28+
android:paddingTop="@dimen/activity_margin"
29+
android:paddingBottom="@dimen/activity_margin"
30+
android:text="@string/recent_files_tab" />
31+
32+
</LinearLayout>
33+
</ScrollView>

0 commit comments

Comments
 (0)