Skip to content

Commit 8aa0536

Browse files
tibbitibbi
committed
updating the remaining activities
1 parent 70848a1 commit 8aa0536

File tree

6 files changed

+221
-149
lines changed

6 files changed

+221
-149
lines changed

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

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

33
import android.graphics.Paint
44
import android.os.Bundle
5-
import android.view.Menu
6-
import android.view.MenuItem
75
import com.simplemobiletools.commons.dialogs.FilePickerDialog
86
import com.simplemobiletools.commons.extensions.beVisibleIf
97
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
108
import com.simplemobiletools.commons.extensions.getProperTextColor
9+
import com.simplemobiletools.commons.helpers.NavigationIcon
1110
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
1211
import com.simplemobiletools.filemanager.pro.R
1312
import com.simplemobiletools.filemanager.pro.adapters.ManageFavoritesAdapter
@@ -18,21 +17,23 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
1817
override fun onCreate(savedInstanceState: Bundle?) {
1918
super.onCreate(savedInstanceState)
2019
setContentView(R.layout.activity_favorites)
20+
setupOptionsMenu()
2121
updateFavorites()
2222
}
2323

24-
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
25-
menuInflater.inflate(R.menu.menu_favorites, menu)
26-
updateMenuItemColors(menu)
27-
return true
24+
override fun onResume() {
25+
super.onResume()
26+
setupToolbar(manage_favorites_toolbar, NavigationIcon.Arrow)
2827
}
2928

30-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
31-
when (item.itemId) {
32-
R.id.add_favorite -> addFavorite()
33-
else -> return super.onOptionsItemSelected(item)
29+
private fun setupOptionsMenu() {
30+
manage_favorites_toolbar.setOnMenuItemClickListener { menuItem ->
31+
when (menuItem.itemId) {
32+
R.id.add_favorite -> addFavorite()
33+
else -> return@setOnMenuItemClickListener false
34+
}
35+
return@setOnMenuItemClickListener true
3436
}
35-
return true
3637
}
3738

3839
private fun updateFavorites() {

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

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.appcompat.widget.SearchView
1010
import androidx.core.view.MenuItemCompat
1111
import androidx.recyclerview.widget.GridLayoutManager
1212
import com.simplemobiletools.commons.extensions.*
13+
import com.simplemobiletools.commons.helpers.NavigationIcon
1314
import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
1415
import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST
1516
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
@@ -26,7 +27,6 @@ import com.simplemobiletools.filemanager.pro.helpers.*
2627
import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener
2728
import com.simplemobiletools.filemanager.pro.models.ListItem
2829
import kotlinx.android.synthetic.main.activity_mimetypes.*
29-
import kotlinx.android.synthetic.main.items_fragment.view.*
3030
import java.util.*
3131

3232
class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
@@ -41,8 +41,11 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
4141
override fun onCreate(savedInstanceState: Bundle?) {
4242
super.onCreate(savedInstanceState)
4343
setContentView(R.layout.activity_mimetypes)
44+
setupOptionsMenu()
45+
refreshMenuItems()
46+
4447
currentMimeType = intent.getStringExtra(SHOW_MIMETYPE) ?: return
45-
title = getString(
48+
mimetypes_toolbar.title = getString(
4649
when (currentMimeType) {
4750
IMAGES -> R.string.images
4851
VIDEOS -> R.string.videos
@@ -65,17 +68,15 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
6568
mimetypes_fastscroller.updateColors(getProperPrimaryColor())
6669
}
6770

68-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
69-
menuInflater.inflate(R.menu.menu, menu)
70-
setupSearch(menu)
71-
updateMenuItemColors(menu)
72-
return true
71+
override fun onResume() {
72+
super.onResume()
73+
setupToolbar(mimetypes_toolbar, NavigationIcon.Arrow, searchMenuItem = searchMenuItem)
7374
}
7475

75-
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
76+
private fun refreshMenuItems() {
7677
val currentViewType = config.getFolderViewType(currentMimeType)
7778

78-
menu!!.apply {
79+
mimetypes_toolbar.menu.apply {
7980
findItem(R.id.add_favorite).isVisible = false
8081
findItem(R.id.remove_favorite).isVisible = false
8182
findItem(R.id.go_to_favorite).isVisible = false
@@ -92,23 +93,23 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
9293
findItem(R.id.increase_column_count).isVisible = currentViewType == VIEW_TYPE_GRID && config.fileColumnCnt < MAX_COLUMN_COUNT
9394
findItem(R.id.reduce_column_count).isVisible = currentViewType == VIEW_TYPE_GRID && config.fileColumnCnt > 1
9495
}
95-
96-
return true
9796
}
9897

99-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
100-
when (item.itemId) {
101-
R.id.sort -> showSortingDialog()
102-
R.id.toggle_filename -> toggleFilenameVisibility()
103-
R.id.change_view_type -> changeViewType()
104-
R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
105-
R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
106-
R.id.increase_column_count -> increaseColumnCount()
107-
R.id.reduce_column_count -> reduceColumnCount()
108-
else -> return super.onOptionsItemSelected(item)
98+
private fun setupOptionsMenu() {
99+
setupSearch(mimetypes_toolbar.menu)
100+
mimetypes_toolbar.setOnMenuItemClickListener { menuItem ->
101+
when (menuItem.itemId) {
102+
R.id.sort -> showSortingDialog()
103+
R.id.toggle_filename -> toggleFilenameVisibility()
104+
R.id.change_view_type -> changeViewType()
105+
R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
106+
R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
107+
R.id.increase_column_count -> increaseColumnCount()
108+
R.id.reduce_column_count -> reduceColumnCount()
109+
else -> return@setOnMenuItemClickListener false
110+
}
111+
return@setOnMenuItemClickListener true
109112
}
110-
111-
return true
112113
}
113114

114115
override fun refreshFragment() {

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import android.graphics.drawable.ColorDrawable
66
import android.os.Bundle
77
import android.print.PrintAttributes
88
import android.print.PrintManager
9-
import android.view.Menu
10-
import android.view.MenuItem
119
import android.view.WindowInsetsController
1210
import android.view.WindowManager
1311
import com.github.barteksc.pdfviewer.scroll.DefaultScrollHandle
1412
import com.simplemobiletools.commons.extensions.*
13+
import com.simplemobiletools.commons.helpers.NavigationIcon
1514
import com.simplemobiletools.commons.helpers.REAL_FILE_PATH
1615
import com.simplemobiletools.commons.helpers.isPiePlus
1716
import com.simplemobiletools.commons.helpers.isRPlus
@@ -27,9 +26,10 @@ class PDFViewerActivity : SimpleActivity() {
2726

2827
override fun onCreate(savedInstanceState: Bundle?) {
2928
useDynamicTheme = false
30-
3129
super.onCreate(savedInstanceState)
3230
setContentView(R.layout.activity_pdf_viewer)
31+
setupOptionsMenu()
32+
refreshMenuItems()
3333

3434
if (checkAppSideloading()) {
3535
return
@@ -41,7 +41,7 @@ class PDFViewerActivity : SimpleActivity() {
4141

4242
if (intent.extras?.containsKey(REAL_FILE_PATH) == true) {
4343
realFilePath = intent.extras?.get(REAL_FILE_PATH)?.toString() ?: ""
44-
supportActionBar?.title = realFilePath.getFilenameFromPath()
44+
pdf_viewer_toolbar.title = realFilePath.getFilenameFromPath()
4545
}
4646

4747
checkIntent()
@@ -55,24 +55,24 @@ class PDFViewerActivity : SimpleActivity() {
5555
supportActionBar?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
5656
window.statusBarColor = Color.TRANSPARENT
5757
setTranslucentNavigation()
58+
setupToolbar(pdf_viewer_toolbar, NavigationIcon.Arrow)
5859
}
5960

60-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
61-
menuInflater.inflate(R.menu.menu_pdf_viewer, menu)
62-
menu.apply {
63-
findItem(R.id.menu_print).isVisible = realFilePath.isNotEmpty()
61+
private fun setupOptionsMenu() {
62+
pdf_viewer_toolbar.setOnMenuItemClickListener { menuItem ->
63+
when (menuItem.itemId) {
64+
R.id.menu_print -> printText()
65+
else -> return@setOnMenuItemClickListener false
66+
}
67+
return@setOnMenuItemClickListener true
6468
}
65-
66-
updateMenuItemColors(menu, forceWhiteIcons = true)
67-
return true
6869
}
6970

70-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
71-
when (item.itemId) {
72-
R.id.menu_print -> printText()
73-
else -> return super.onOptionsItemSelected(item)
71+
72+
private fun refreshMenuItems() {
73+
pdf_viewer_toolbar.menu.apply {
74+
findItem(R.id.menu_print).isVisible = realFilePath.isNotEmpty()
7475
}
75-
return true
7676
}
7777

7878
private fun checkIntent() {
@@ -98,7 +98,7 @@ class PDFViewerActivity : SimpleActivity() {
9898

9999
val filename = getFilenameFromUri(uri)
100100
if (filename.isNotEmpty()) {
101-
supportActionBar?.title = filename
101+
pdf_viewer_toolbar.title = filename
102102
}
103103
}
104104

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

Lines changed: 63 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,71 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
android:id="@+id/manage_favorites_wrapper"
5+
android:id="@+id/manage_favorites_coordinator"
66
android:layout_width="match_parent"
7-
android:layout_height="wrap_content">
7+
android:layout_height="match_parent">
88

9-
<com.simplemobiletools.commons.views.MyRecyclerView
10-
android:id="@+id/manage_favorites_list"
9+
<com.google.android.material.appbar.AppBarLayout
10+
android:id="@+id/manage_favorites_app_bar_layout"
1111
android:layout_width="match_parent"
12-
android:layout_height="match_parent"
13-
android:clipToPadding="false"
14-
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"
15-
tools:itemCount="4"
16-
tools:listitem="@layout/item_manage_favorite" />
17-
18-
<com.simplemobiletools.commons.views.MyTextView
19-
android:id="@+id/manage_favorites_placeholder"
12+
android:layout_height="wrap_content">
13+
14+
<com.google.android.material.appbar.MaterialToolbar
15+
android:id="@+id/manage_favorites_toolbar"
16+
android:layout_width="match_parent"
17+
android:layout_height="?attr/actionBarSize"
18+
android:background="@color/color_primary"
19+
app:menu="@menu/menu_favorites"
20+
app:title="@string/manage_favorites"
21+
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
22+
23+
</com.google.android.material.appbar.AppBarLayout>
24+
25+
<RelativeLayout
26+
android:id="@+id/manage_favorites_wrapper"
2027
android:layout_width="match_parent"
2128
android:layout_height="wrap_content"
22-
android:layout_centerHorizontal="true"
23-
android:layout_marginBottom="@dimen/small_margin"
24-
android:alpha="0.8"
25-
android:gravity="center"
26-
android:lineSpacingExtra="@dimen/tiny_margin"
27-
android:paddingStart="@dimen/activity_margin"
28-
android:paddingTop="@dimen/activity_margin"
29-
android:paddingEnd="@dimen/activity_margin"
30-
android:text="@string/favorites_activity_placeholder"
31-
android:textSize="@dimen/bigger_text_size"
32-
android:textStyle="italic"
33-
android:visibility="gone" />
34-
35-
<com.simplemobiletools.commons.views.MyTextView
36-
android:id="@+id/manage_favorites_placeholder_2"
37-
android:layout_width="wrap_content"
38-
android:layout_height="wrap_content"
39-
android:layout_below="@+id/manage_favorites_placeholder"
40-
android:layout_centerHorizontal="true"
41-
android:background="@drawable/ripple_all_corners"
42-
android:gravity="center"
43-
android:padding="@dimen/normal_margin"
44-
android:text="@string/add_favorites"
45-
android:textSize="@dimen/bigger_text_size"
46-
android:visibility="gone" />
47-
48-
</RelativeLayout>
29+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
30+
31+
<com.simplemobiletools.commons.views.MyRecyclerView
32+
android:id="@+id/manage_favorites_list"
33+
android:layout_width="match_parent"
34+
android:layout_height="match_parent"
35+
android:clipToPadding="false"
36+
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"
37+
tools:itemCount="4"
38+
tools:listitem="@layout/item_manage_favorite" />
39+
40+
<com.simplemobiletools.commons.views.MyTextView
41+
android:id="@+id/manage_favorites_placeholder"
42+
android:layout_width="match_parent"
43+
android:layout_height="wrap_content"
44+
android:layout_centerHorizontal="true"
45+
android:layout_marginBottom="@dimen/small_margin"
46+
android:alpha="0.8"
47+
android:gravity="center"
48+
android:lineSpacingExtra="@dimen/tiny_margin"
49+
android:paddingStart="@dimen/activity_margin"
50+
android:paddingTop="@dimen/activity_margin"
51+
android:paddingEnd="@dimen/activity_margin"
52+
android:text="@string/favorites_activity_placeholder"
53+
android:textSize="@dimen/bigger_text_size"
54+
android:textStyle="italic"
55+
android:visibility="gone" />
56+
57+
<com.simplemobiletools.commons.views.MyTextView
58+
android:id="@+id/manage_favorites_placeholder_2"
59+
android:layout_width="wrap_content"
60+
android:layout_height="wrap_content"
61+
android:layout_below="@+id/manage_favorites_placeholder"
62+
android:layout_centerHorizontal="true"
63+
android:background="@drawable/ripple_all_corners"
64+
android:gravity="center"
65+
android:padding="@dimen/normal_margin"
66+
android:text="@string/add_favorites"
67+
android:textSize="@dimen/bigger_text_size"
68+
android:visibility="gone" />
69+
70+
</RelativeLayout>
71+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)