updating the remaining activities

2025-06-05 22:09:15 +02:00 · 2022-07-23 23:06:40 +02:00
parent 70848a1840
commit 8aa0536dcf
6 changed files with 220 additions and 148 deletions
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt
@ -2,12 +2,11 @@ package com.simplemobiletools.filemanager.pro.activities

 import android.graphics.Paint
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.commons.extensions.getProperPrimaryColor
 import com.simplemobiletools.commons.extensions.getProperTextColor
+import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
 import com.simplemobiletools.filemanager.pro.R
 import com.simplemobiletools.filemanager.pro.adapters.ManageFavoritesAdapter
@ -18,21 +17,23 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_favorites)
+        setupOptionsMenu()
        updateFavorites()
    }

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

-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
+    private fun setupOptionsMenu() {
+        manage_favorites_toolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
                R.id.add_favorite -> addFavorite()
-            else -> return super.onOptionsItemSelected(item)
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
        }
-        return true
    }

    private fun updateFavorites() {
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
@ -10,6 +10,7 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.view.MenuItemCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
 import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
@ -26,7 +27,6 @@ import com.simplemobiletools.filemanager.pro.helpers.*
 import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener
 import com.simplemobiletools.filemanager.pro.models.ListItem
 import kotlinx.android.synthetic.main.activity_mimetypes.*
-import kotlinx.android.synthetic.main.items_fragment.view.*
 import java.util.*

 class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
@ -41,8 +41,11 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_mimetypes)
+        setupOptionsMenu()
+        refreshMenuItems()
+
        currentMimeType = intent.getStringExtra(SHOW_MIMETYPE) ?: return
-        title = getString(
+        mimetypes_toolbar.title = getString(
            when (currentMimeType) {
                IMAGES -> R.string.images
                VIDEOS -> R.string.videos
@ -65,17 +68,15 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
        mimetypes_fastscroller.updateColors(getProperPrimaryColor())
    }

-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu, menu)
-        setupSearch(menu)
-        updateMenuItemColors(menu)
-        return true
+    override fun onResume() {
+        super.onResume()
+        setupToolbar(mimetypes_toolbar, NavigationIcon.Arrow, searchMenuItem = searchMenuItem)
    }

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

-        menu!!.apply {
+        mimetypes_toolbar.menu.apply {
            findItem(R.id.add_favorite).isVisible = false
            findItem(R.id.remove_favorite).isVisible = false
            findItem(R.id.go_to_favorite).isVisible = false
@ -92,12 +93,12 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
            findItem(R.id.increase_column_count).isVisible = currentViewType == VIEW_TYPE_GRID && config.fileColumnCnt < MAX_COLUMN_COUNT
            findItem(R.id.reduce_column_count).isVisible = currentViewType == VIEW_TYPE_GRID && config.fileColumnCnt > 1
        }
-
-        return true
    }

-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
+    private fun setupOptionsMenu() {
+        setupSearch(mimetypes_toolbar.menu)
+        mimetypes_toolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
                R.id.sort -> showSortingDialog()
                R.id.toggle_filename -> toggleFilenameVisibility()
                R.id.change_view_type -> changeViewType()
@ -105,10 +106,10 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
                R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
                R.id.increase_column_count -> increaseColumnCount()
                R.id.reduce_column_count -> reduceColumnCount()
-            else -> return super.onOptionsItemSelected(item)
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
        }
-
-        return true
    }

    override fun refreshFragment() {
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt
@ -6,12 +6,11 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.print.PrintAttributes
 import android.print.PrintManager
-import android.view.Menu
-import android.view.MenuItem
 import android.view.WindowInsetsController
 import android.view.WindowManager
 import com.github.barteksc.pdfviewer.scroll.DefaultScrollHandle
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.commons.helpers.REAL_FILE_PATH
 import com.simplemobiletools.commons.helpers.isPiePlus
 import com.simplemobiletools.commons.helpers.isRPlus
@ -27,9 +26,10 @@ class PDFViewerActivity : SimpleActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        useDynamicTheme = false
-
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_pdf_viewer)
+        setupOptionsMenu()
+        refreshMenuItems()

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

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

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

-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_pdf_viewer, menu)
-        menu.apply {
+    private fun setupOptionsMenu() {
+        pdf_viewer_toolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.menu_print -> printText()
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
+        }
+    }
+
+
+    private fun refreshMenuItems() {
+        pdf_viewer_toolbar.menu.apply {
            findItem(R.id.menu_print).isVisible = realFilePath.isNotEmpty()
        }
-
-        updateMenuItemColors(menu, forceWhiteIcons = true)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_print -> printText()
-            else -> return super.onOptionsItemSelected(item)
-        }
-        return true
    }

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

        val filename = getFilenameFromUri(uri)
        if (filename.isNotEmpty()) {
-            supportActionBar?.title = filename
+            pdf_viewer_toolbar.title = filename
        }
    }

--- a/app/src/main/res/layout/activity_favorites.xml
+++ b/app/src/main/res/layout/activity_favorites.xml
@ -1,11 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/manage_favorites_wrapper"
+    android:id="@+id/manage_favorites_coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/manage_favorites_app_bar_layout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/manage_favorites_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu_favorites"
+            app:title="@string/manage_favorites"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <RelativeLayout
+        android:id="@+id/manage_favorites_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
        <com.simplemobiletools.commons.views.MyRecyclerView
            android:id="@+id/manage_favorites_list"
            android:layout_width="match_parent"
@ -46,3 +68,4 @@
            android:visibility="gone" />

    </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_mimetypes.xml
+++ b/app/src/main/res/layout/activity_mimetypes.xml
@ -1,9 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/mimetypes_coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/mimetypes_app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/mimetypes_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu"
+            app:title=""
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <RelativeLayout
        android:id="@+id/mimetypes_holder"
        android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <com.simplemobiletools.commons.views.MyTextView
            android:id="@+id/mimetypes_placeholder"
@ -52,3 +74,4 @@

        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
    </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_pdf_viewer.xml
+++ b/app/src/main/res/layout/activity_pdf_viewer.xml
@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pdf_viewer_wrapper"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pdf_viewer_coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/pdf_viewer_app_bar_layout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/pdf_viewer_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu_pdf_viewer"
+            app:title="@string/pdf_viewer"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <RelativeLayout
+        android:id="@+id/pdf_viewer_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
        <com.github.barteksc.pdfviewer.PDFView
            android:id="@+id/pdf_viewer"
            android:layout_width="match_parent"
@ -17,3 +40,4 @@
            android:contentDescription="@null" />

    </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>