Skip to content

Commit c892145

Browse files
tibbitibbi
committed
updating commons with some design changes
1 parent eed9a14 commit c892145

File tree

15 files changed

+435
-389
lines changed

15 files changed

+435
-389
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ android {
6464
}
6565

6666
dependencies {
67-
implementation 'com.github.SimpleMobileTools:Simple-Commons:7f3e880dc5'
67+
implementation 'com.github.SimpleMobileTools:Simple-Commons:387fbe81cc'
6868
implementation 'com.github.tibbi:AndroidPdfViewer:da57ff410e'
6969
implementation 'com.github.Stericson:RootTools:df729dcb13'
7070
implementation 'com.github.Stericson:RootShell:1.6'

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

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ class MainActivity : SimpleActivity() {
6969
super.onCreate(savedInstanceState)
7070
setContentView(R.layout.activity_main)
7171
appLaunched(BuildConfig.APPLICATION_ID)
72+
setupOptionsMenu()
73+
refreshMenuItems()
7274
mTabsToShow = getTabsList()
7375

7476
if (!config.wasStorageAnalysisTabAdded && isOreoPlus()) {
@@ -108,6 +110,8 @@ class MainActivity : SimpleActivity() {
108110
}
109111

110112
setupTabColors()
113+
setupToolbar(main_toolbar, searchMenuItem = searchMenuItem)
114+
111115
getAllFragments().forEach {
112116
it?.onResume(getProperTextColor())
113117
}
@@ -140,19 +144,12 @@ class MainActivity : SimpleActivity() {
140144
config.temporarilyShowHidden = false
141145
}
142146

143-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
144-
menuInflater.inflate(R.menu.menu, menu)
145-
setupSearch(menu)
146-
updateMenuItemColors(menu)
147-
return true
148-
}
149-
150-
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
151-
val currentFragment = getCurrentFragment() ?: return true
147+
private fun refreshMenuItems() {
148+
val currentFragment = getCurrentFragment() ?: return
152149
val currentViewType = config.getFolderViewType(currentFragment.currentPath)
153150
val favorites = config.favorites
154151

155-
menu!!.apply {
152+
main_toolbar.menu.apply {
156153
findItem(R.id.search).isVisible = currentFragment is ItemsFragment
157154
findItem(R.id.sort).isVisible = currentFragment is ItemsFragment
158155
findItem(R.id.change_view_type).isVisible = currentFragment !is StorageFragment
@@ -172,33 +169,34 @@ class MainActivity : SimpleActivity() {
172169
currentViewType == VIEW_TYPE_GRID && config.fileColumnCnt < MAX_COLUMN_COUNT && currentFragment !is StorageFragment
173170
findItem(R.id.reduce_column_count).isVisible = currentViewType == VIEW_TYPE_GRID && config.fileColumnCnt > 1 && currentFragment !is StorageFragment
174171
}
175-
176-
return true
177172
}
178173

179-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
180-
if (getCurrentFragment() == null) {
181-
return true
182-
}
174+
private fun setupOptionsMenu() {
175+
setupSearch(main_toolbar.menu)
176+
main_toolbar.setOnMenuItemClickListener { menuItem ->
177+
if (getCurrentFragment() == null) {
178+
return@setOnMenuItemClickListener true
179+
}
183180

184-
when (item.itemId) {
185-
R.id.go_home -> goHome()
186-
R.id.go_to_favorite -> goToFavorite()
187-
R.id.sort -> showSortingDialog()
188-
R.id.add_favorite -> addFavorite()
189-
R.id.remove_favorite -> removeFavorite()
190-
R.id.toggle_filename -> toggleFilenameVisibility()
191-
R.id.set_as_home -> setAsHome()
192-
R.id.change_view_type -> changeViewType()
193-
R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
194-
R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
195-
R.id.increase_column_count -> increaseColumnCount()
196-
R.id.reduce_column_count -> reduceColumnCount()
197-
R.id.settings -> launchSettings()
198-
R.id.about -> launchAbout()
199-
else -> return super.onOptionsItemSelected(item)
181+
when (menuItem.itemId) {
182+
R.id.go_home -> goHome()
183+
R.id.go_to_favorite -> goToFavorite()
184+
R.id.sort -> showSortingDialog()
185+
R.id.add_favorite -> addFavorite()
186+
R.id.remove_favorite -> removeFavorite()
187+
R.id.toggle_filename -> toggleFilenameVisibility()
188+
R.id.set_as_home -> setAsHome()
189+
R.id.change_view_type -> changeViewType()
190+
R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
191+
R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
192+
R.id.increase_column_count -> increaseColumnCount()
193+
R.id.reduce_column_count -> reduceColumnCount()
194+
R.id.settings -> launchSettings()
195+
R.id.about -> launchAbout()
196+
else -> return@setOnMenuItemClickListener false
197+
}
198+
return@setOnMenuItemClickListener true
200199
}
201-
return true
202200
}
203201

204202
override fun onSaveInstanceState(outState: Bundle) {
@@ -405,7 +403,7 @@ class MainActivity : SimpleActivity() {
405403
getAllFragments().forEach {
406404
(it as? ItemOperationsListener)?.finishActMode()
407405
}
408-
invalidateOptionsMenu()
406+
refreshMenuItems()
409407
}
410408
})
411409
main_view_pager.currentItem = config.lastUsedViewPagerPage
@@ -458,7 +456,7 @@ class MainActivity : SimpleActivity() {
458456
updateBottomTabItemColors(inactiveView, false)
459457
}
460458

461-
val bottomBarColor = getBottomTabsBackgroundColor()
459+
val bottomBarColor = getBottomNavigationBackgroundColor()
462460
main_tabs_holder.setBackgroundColor(bottomBarColor)
463461
updateNavigationBarColor(bottomBarColor)
464462
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class ReadTextActivity : SimpleActivity() {
339339
}
340340

341341
private fun closeSearch() {
342-
searchQueryET.text.clear()
342+
searchQueryET.text?.clear()
343343
isSearchActive = false
344344
search_wrapper.beGone()
345345
}

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.simplemobiletools.filemanager.pro.activities
22

33
import android.content.Intent
44
import android.os.Bundle
5-
import android.view.Menu
65
import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog
76
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
87
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
@@ -25,6 +24,7 @@ class SettingsActivity : SimpleActivity() {
2524

2625
override fun onResume() {
2726
super.onResume()
27+
setupToolbar(settings_toolbar, NavigationIcon.Arrow)
2828

2929
setupCustomizeColors()
3030
setupUseEnglish()
@@ -41,8 +41,7 @@ class SettingsActivity : SimpleActivity() {
4141
setupKeepLastModified()
4242
setupDeleteConfirmation()
4343
setupEnableRootAccess()
44-
updateTextColors(settings_holder)
45-
invalidateOptionsMenu()
44+
updateTextColors(settings_nested_scrollview)
4645

4746
arrayOf(
4847
settings_color_customization_label,
@@ -67,11 +66,6 @@ class SettingsActivity : SimpleActivity() {
6766
}
6867
}
6968

70-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
71-
updateMenuItemColors(menu)
72-
return super.onCreateOptionsMenu(menu)
73-
}
74-
7569
private fun setupCustomizeColors() {
7670
settings_customize_colors_holder.setOnClickListener {
7771
startCustomizationActivity()

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.simplemobiletools.filemanager.pro.dialogs
22

33
import android.view.View
4-
import androidx.appcompat.app.AlertDialog
54
import com.simplemobiletools.commons.activities.BaseSimpleActivity
65
import com.simplemobiletools.commons.extensions.beVisibleIf
6+
import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
77
import com.simplemobiletools.commons.extensions.setupDialogStuff
88
import com.simplemobiletools.commons.helpers.*
99
import com.simplemobiletools.filemanager.pro.R
@@ -24,10 +24,10 @@ class ChangeSortingDialog(val activity: BaseSimpleActivity, val path: String = "
2424
sorting_dialog_numeric_sorting.isChecked = currSorting and SORT_USE_NUMERIC_VALUE != 0
2525
}
2626

27-
AlertDialog.Builder(activity)
27+
activity.getAlertDialogBuilder()
2828
.setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
2929
.setNegativeButton(R.string.cancel, null)
30-
.create().apply {
30+
.apply {
3131
activity.setupDialogStuff(view, this, R.string.sort_by)
3232
}
3333

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.simplemobiletools.filemanager.pro.dialogs
22

33
import android.view.View
4-
import androidx.appcompat.app.AlertDialog
54
import com.simplemobiletools.commons.activities.BaseSimpleActivity
65
import com.simplemobiletools.commons.extensions.beGone
7-
import com.simplemobiletools.commons.extensions.beVisibleIf
6+
import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
87
import com.simplemobiletools.commons.extensions.setupDialogStuff
98
import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
109
import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST
@@ -36,16 +35,21 @@ class ChangeViewTypeDialog(val activity: BaseSimpleActivity, val path: String =
3635
}
3736
}
3837

39-
AlertDialog.Builder(activity)
38+
activity.getAlertDialogBuilder()
4039
.setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
4140
.setNegativeButton(R.string.cancel, null)
42-
.create().apply {
41+
.apply {
4342
activity.setupDialogStuff(view, this)
4443
}
4544
}
4645

4746
private fun dialogConfirmed() {
48-
val viewType = if (view.change_view_type_dialog_radio.checkedRadioButtonId == view.change_view_type_dialog_radio_grid.id) VIEW_TYPE_GRID else VIEW_TYPE_LIST
47+
val viewType = if (view.change_view_type_dialog_radio.checkedRadioButtonId == view.change_view_type_dialog_radio_grid.id) {
48+
VIEW_TYPE_GRID
49+
} else {
50+
VIEW_TYPE_LIST
51+
}
52+
4953
if (view.change_view_type_dialog_use_for_this_folder.isChecked) {
5054
config.saveFolderViewType(this.path, viewType)
5155
} else {

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,30 @@ class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val c
3030
}
3131
}
3232

33-
AlertDialog.Builder(activity)
34-
.setPositiveButton(R.string.ok, null)
35-
.setNegativeButton(R.string.cancel, null)
36-
.create().apply {
37-
activity.setupDialogStuff(view, this, R.string.compress_as) {
38-
showKeyboard(view.file_name)
39-
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(View.OnClickListener {
40-
val name = view.file_name.value
41-
when {
42-
name.isEmpty() -> activity.toast(R.string.empty_name)
43-
name.isAValidFilename() -> {
44-
val newPath = "$realPath/$name.zip"
45-
if (activity.getDoesFilePathExist(newPath)) {
46-
activity.toast(R.string.name_taken)
47-
return@OnClickListener
48-
}
49-
50-
dismiss()
51-
callback(newPath)
33+
activity.getAlertDialogBuilder()
34+
.setPositiveButton(R.string.ok, null)
35+
.setNegativeButton(R.string.cancel, null)
36+
.apply {
37+
activity.setupDialogStuff(view, this, R.string.compress_as) { alertDialog ->
38+
alertDialog.showKeyboard(view.file_name)
39+
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(View.OnClickListener {
40+
val name = view.file_name.value
41+
when {
42+
name.isEmpty() -> activity.toast(R.string.empty_name)
43+
name.isAValidFilename() -> {
44+
val newPath = "$realPath/$name.zip"
45+
if (activity.getDoesFilePathExist(newPath)) {
46+
activity.toast(R.string.name_taken)
47+
return@OnClickListener
5248
}
53-
else -> activity.toast(R.string.invalid_name)
49+
50+
alertDialog.dismiss()
51+
callback(newPath)
5452
}
55-
})
56-
}
53+
else -> activity.toast(R.string.invalid_name)
54+
}
55+
})
5756
}
57+
}
5858
}
5959
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca
1515
private val view = activity.layoutInflater.inflate(R.layout.dialog_create_new, null)
1616

1717
init {
18-
AlertDialog.Builder(activity)
18+
activity.getAlertDialogBuilder()
1919
.setPositiveButton(R.string.ok, null)
2020
.setNegativeButton(R.string.cancel, null)
21-
.create().apply {
22-
activity.setupDialogStuff(view, this, R.string.create_new) {
23-
showKeyboard(view.item_name)
24-
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(View.OnClickListener {
21+
.apply {
22+
activity.setupDialogStuff(view, this, R.string.create_new) { alertDialog ->
23+
alertDialog.showKeyboard(view.item_name)
24+
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(View.OnClickListener {
2525
val name = view.item_name.value
2626
if (name.isEmpty()) {
2727
activity.toast(R.string.empty_name)
@@ -33,11 +33,11 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca
3333
}
3434

3535
if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_directory) {
36-
createDirectory(newPath, this) {
36+
createDirectory(newPath, alertDialog) {
3737
callback(it)
3838
}
3939
} else {
40-
createFile(newPath, this) {
40+
createFile(newPath, alertDialog) {
4141
callback(it)
4242
}
4343
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.simplemobiletools.filemanager.pro.dialogs
22

3-
import androidx.appcompat.app.AlertDialog
43
import com.simplemobiletools.commons.activities.BaseSimpleActivity
54
import com.simplemobiletools.commons.extensions.beGone
5+
import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
66
import com.simplemobiletools.commons.extensions.setupDialogStuff
77
import com.simplemobiletools.commons.helpers.TAB_FILES
88
import com.simplemobiletools.commons.helpers.TAB_RECENT_FILES
@@ -34,10 +34,10 @@ class ManageVisibleTabsDialog(val activity: BaseSimpleActivity) {
3434
view.findViewById<MyAppCompatCheckbox>(value).isChecked = showTabs and key != 0
3535
}
3636

37-
AlertDialog.Builder(activity)
37+
activity.getAlertDialogBuilder()
3838
.setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
3939
.setNegativeButton(R.string.cancel, null)
40-
.create().apply {
40+
.apply {
4141
activity.setupDialogStuff(view, this)
4242
}
4343
}

0 commit comments

Comments
 (0)