updating commons with some theming improvements

tibbi · tibbi · commit e3b84d7364b7 · 2022-07-08T18:28:57.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -63,6 +63,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:faa6a972c2'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:c05de1687e'
     implementation "androidx.print:print:1.0.0"
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
@@ -10,8 +10,6 @@ import android.graphics.drawable.GradientDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
-import android.view.Menu
-import android.view.MenuItem
 import android.view.WindowManager
 import android.webkit.MimeTypeMap
 import android.widget.SeekBar
@@ -72,6 +70,8 @@ class MainActivity : SimpleActivity(), CanvasListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        setupOptionsMenu()
+        refreshMenuItems()
         appLaunched(BuildConfig.APPLICATION_ID)
 
         eyeDropper = EyeDropper(my_canvas) { selectedColor ->
@@ -113,6 +113,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
 
     override fun onResume() {
         super.onResume()
+        setupToolbar(main_toolbar)
 
         val isShowBrushSizeEnabled = config.showBrushSize
         stroke_width_bar.beVisibleIf(isShowBrushSizeEnabled)
@@ -128,7 +129,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
         }
 
         requestedOrientation = if (config.forcePortraitMode) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-        invalidateOptionsMenu()
+        refreshMenuItems()
     }
 
     override fun onPause() {
@@ -145,33 +146,31 @@ class MainActivity : SimpleActivity(), CanvasListener {
         my_canvas.mListener = null
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu, menu)
-        menu.apply {
+    private fun refreshMenuItems() {
+        main_toolbar.menu.apply {
             findItem(R.id.menu_confirm).isVisible = isImageCaptureIntent || isEditIntent
             findItem(R.id.menu_save).isVisible = !isImageCaptureIntent && !isEditIntent
             findItem(R.id.menu_share).isVisible = !isImageCaptureIntent && !isEditIntent
             findItem(R.id.open_file).isVisible = !isEditIntent
         }
-
-        updateMenuItemColors(menu)
-        return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_confirm -> confirmImage()
-            R.id.menu_save -> trySaveImage()
-            R.id.menu_share -> shareImage()
-            R.id.clear -> clearCanvas()
-            R.id.open_file -> tryOpenFile()
-            R.id.change_background -> changeBackgroundClicked()
-            R.id.menu_print -> printImage()
-            R.id.settings -> launchSettings()
-            R.id.about -> launchAbout()
-            else -> return super.onOptionsItemSelected(item)
+    private fun setupOptionsMenu() {
+        main_toolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.menu_confirm -> confirmImage()
+                R.id.menu_save -> trySaveImage()
+                R.id.menu_share -> shareImage()
+                R.id.clear -> clearCanvas()
+                R.id.open_file -> tryOpenFile()
+                R.id.change_background -> changeBackgroundClicked()
+                R.id.menu_print -> printImage()
+                R.id.settings -> launchSettings()
+                R.id.about -> launchAbout()
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
         }
-        return true
     }
 
     override fun onBackPressed() {
@@ -261,7 +260,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
                 isImageCaptureIntent = true
                 intentUri = output
                 defaultPath = output.path!!
-                invalidateOptionsMenu()
+                refreshMenuItems()
             }
         }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/SettingsActivity.kt
@@ -1,8 +1,8 @@
 package com.simplemobiletools.draw.pro.activities
 
 import android.os.Bundle
-import android.view.Menu
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.draw.pro.R
 import com.simplemobiletools.draw.pro.extensions.config
 import kotlinx.android.synthetic.main.activity_settings.*
@@ -16,6 +16,7 @@ class SettingsActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
+        setupToolbar(settings_toolbar, NavigationIcon.Arrow)
 
         setupCustomizeColors()
         setupUseEnglish()
@@ -24,7 +25,6 @@ class SettingsActivity : SimpleActivity() {
         setupAllowZoomingCanvas()
         setupForcePortraitMode()
         updateTextColors(settings_holder)
-        invalidateOptionsMenu()
 
         arrayOf(settings_color_customization_label, settings_general_settings_label).forEach {
             it.setTextColor(getProperPrimaryColor())
@@ -35,11 +35,6 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        updateMenuItemColors(menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
     private fun setupCustomizeColors() {
         settings_customize_colors_holder.setOnClickListener {
             startCustomizationActivity()
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/pro/dialogs/SaveImageDialog.kt b/app/src/main/kotlin/com/simplemobiletools/draw/pro/dialogs/SaveImageDialog.kt
@@ -12,20 +12,24 @@ import com.simplemobiletools.draw.pro.helpers.SVG
 import kotlinx.android.synthetic.main.dialog_save_image.view.*
 import java.io.File
 
-class SaveImageDialog(val activity: SimpleActivity, val defaultPath: String, val defaultFilename: String, val defaultExtension: String,
-                      val hidePath: Boolean, callback: (fullPath: String, filename: String, extension: String) -> Unit) {
+class SaveImageDialog(
+    val activity: SimpleActivity, val defaultPath: String, val defaultFilename: String, val defaultExtension: String,
+    val hidePath: Boolean, callback: (fullPath: String, filename: String, extension: String) -> Unit
+) {
     private val SIMPLE_DRAW = "Simple Draw"
 
     init {
         val initialFilename = getInitialFilename()
         var folder = if (defaultPath.isEmpty()) "${activity.internalStoragePath}/$SIMPLE_DRAW" else defaultPath
         val view = activity.layoutInflater.inflate(R.layout.dialog_save_image, null).apply {
             save_image_filename.setText(initialFilename)
-            save_image_radio_group.check(when (defaultExtension) {
-                JPG -> R.id.save_image_radio_jpg
-                SVG -> R.id.save_image_radio_svg
-                else -> R.id.save_image_radio_png
-            })
+            save_image_radio_group.check(
+                when (defaultExtension) {
+                    JPG -> R.id.save_image_radio_jpg
+                    SVG -> R.id.save_image_radio_svg
+                    else -> R.id.save_image_radio_png
+                }
+            )
 
             if (hidePath) {
                 save_image_path_label.beGone()
@@ -41,13 +45,13 @@ class SaveImageDialog(val activity: SimpleActivity, val defaultPath: String, val
             }
         }
 
-        AlertDialog.Builder(activity)
+        activity.getAlertDialogBuilder()
             .setPositiveButton(R.string.ok, null)
             .setNegativeButton(R.string.cancel, null)
-            .create().apply {
-                activity.setupDialogStuff(view, this, R.string.save_as) {
-                    showKeyboard(view.save_image_filename)
-                    getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+            .apply {
+                activity.setupDialogStuff(view, this, R.string.save_as) { alertDialog ->
+                    alertDialog.showKeyboard(view.save_image_filename)
+                    alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                         val filename = view.save_image_filename.value
                         if (filename.isEmpty()) {
                             activity.toast(R.string.filename_cannot_be_empty)
@@ -70,11 +74,11 @@ class SaveImageDialog(val activity: SimpleActivity, val defaultPath: String, val
                             val title = String.format(activity.getString(R.string.file_already_exists_overwrite), newPath.getFilenameFromPath())
                             ConfirmationDialog(activity, title) {
                                 callback(newPath, filename, extension)
-                                dismiss()
+                                alertDialog.dismiss()
                             }
                         } else {
                             callback(newPath, filename, extension)
-                            dismiss()
+                            alertDialog.dismiss()
                         }
                     }
                 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,75 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main_holder"
+<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/main_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.simplemobiletools.draw.pro.views.MyCanvas
-        android:id="@+id/my_canvas"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/main_app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/main_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu"
+            app:title="@string/app_launcher_name"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <com.simplemobiletools.commons.views.MyScrollView
+        android:id="@+id/main_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white" />
+        android:fillViewport="true"
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <RelativeLayout
+            android:id="@+id/main_holder"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.simplemobiletools.draw.pro.views.MyCanvas
+                android:id="@+id/my_canvas"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@android:color/white" />
 
-    <ImageView
-        android:id="@+id/redo"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_toStartOf="@+id/eraser"
-        android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_redo_vector"
-        android:visibility="gone" />
+            <ImageView
+                android:id="@+id/redo"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_toStartOf="@+id/eraser"
+                android:padding="@dimen/medium_margin"
+                android:src="@drawable/ic_redo_vector"
+                android:visibility="gone" />
 
-    <ImageView
-        android:id="@+id/eraser"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_toStartOf="@+id/eye_dropper"
-        android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_eraser_on_vector" />
+            <ImageView
+                android:id="@+id/eraser"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_toStartOf="@+id/eye_dropper"
+                android:padding="@dimen/medium_margin"
+                android:src="@drawable/ic_eraser_on_vector" />
 
-    <ImageView
-        android:id="@+id/eye_dropper"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_toStartOf="@+id/color_picker"
-        android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_colorize_on_vector"
-        android:visibility="visible" />
+            <ImageView
+                android:id="@+id/eye_dropper"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_toStartOf="@+id/color_picker"
+                android:padding="@dimen/medium_margin"
+                android:src="@drawable/ic_colorize_on_vector"
+                android:visibility="visible" />
 
-    <ImageView
-        android:id="@+id/color_picker"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_alignParentEnd="true" />
+            <ImageView
+                android:id="@+id/color_picker"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_alignParentEnd="true" />
 
-    <ImageView
-        android:id="@+id/undo"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_below="@id/color_picker"
-        android:layout_alignParentEnd="true"
-        android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_undo_vector"
-        android:visibility="gone" />
+            <ImageView
+                android:id="@+id/undo"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_below="@id/color_picker"
+                android:layout_alignParentEnd="true"
+                android:padding="@dimen/medium_margin"
+                android:src="@drawable/ic_undo_vector"
+                android:visibility="gone" />
 
-    <ImageView
-        android:id="@+id/stroke_width_preview"
-        android:layout_width="@dimen/full_brush_size"
-        android:layout_height="@dimen/full_brush_size"
-        android:layout_above="@+id/stroke_width_bar"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/medium_margin"
-        android:background="@drawable/circle_background" />
+            <ImageView
+                android:id="@+id/stroke_width_preview"
+                android:layout_width="@dimen/full_brush_size"
+                android:layout_height="@dimen/full_brush_size"
+                android:layout_above="@+id/stroke_width_bar"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="@dimen/medium_margin"
+                android:background="@drawable/circle_background" />
 
-    <com.simplemobiletools.commons.views.MySeekBar
-        android:id="@+id/stroke_width_bar"
-        android:layout_width="@dimen/stroke_bar_size"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="12dp"
-        android:max="100"
-        android:padding="@dimen/medium_margin"
-        android:progress="50" />
+            <com.simplemobiletools.commons.views.MySeekBar
+                android:id="@+id/stroke_width_bar"
+                android:layout_width="@dimen/stroke_bar_size"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="12dp"
+                android:max="100"
+                android:padding="@dimen/medium_margin"
+                android:progress="50" />
 
-</RelativeLayout>
+        </RelativeLayout>
+    </com.simplemobiletools.commons.views.MyScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
diff --git a/app/src/main/res/layout/dialog_save_image.xml b/app/src/main/res/layout/dialog_save_image.xml

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,6 @@ android {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`dependencies {`
`66`		`- implementation 'com.github.SimpleMobileTools:Simple-Commons:faa6a972c2'`
	`66`	`+ implementation 'com.github.SimpleMobileTools:Simple-Commons:c05de1687e'`
`67`	`67`	`implementation "androidx.print:print:1.0.0"`
`68`	`68`	`}`