Align the Navigation Menu icon with the Close Tab icon. https://redmine.stoutner...

diff --git a/app/build.gradle b/app/build.gradle
index 1edc15e97d467fb7723608c1220af9c6bf152928..2ed6e4d09393acd8b60032a695b3711963d66260 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -91,5 +91,5 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.10'
 
     // Include the Google material library.
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.10'
 
     // Include the Google material library.

-    implementation 'com.google.android.material:material:1.13.0'
+    implementation 'com.google.android.material:material:1.14.0'

 }
 }

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
index 04295ede39ddf927570043122cd9dcdd274fad05..bbeaef0a83f6fb73c6f50ea2db0050a684b49360 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
@@ -468,7 +468,8 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
                                     }
                                 } else {  // There was an unspecified error while saving the temporary MHT file.
                                     // Display a snackbar.
                                     }
                                 } else {  // There was an unspecified error while saving the temporary MHT file.
                                     // Display a snackbar.

-                                    Snackbar.make(currentWebView!!, getString(R.string.error_saving_file, fileNameString, getString(R.string.unknown_error)), Snackbar.LENGTH_INDEFINITE).show()
+                                    Snackbar.make(currentWebView!!, getString(R.string.error_saving_file, fileNameString, getString(R.string.unknown_error)),
+                                                  Snackbar.LENGTH_INDEFINITE).show()

                                 }
                             }
                         }
                                 }
                             }
                         }


@@ -626,6 +627,9 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
             // Display the custom app bar layout.
             appBar.displayOptions = ActionBar.DISPLAY_SHOW_CUSTOM
 
             // Display the custom app bar layout.
             appBar.displayOptions = ActionBar.DISPLAY_SHOW_CUSTOM
 

+            // Set the toolbar content insets so that the navigation icon aligns vertically with the close tab icon.  For some reason this doesn't work when set in XML.
+            toolbar.setContentInsetsRelative(29, 0)
+

             // Get handles for the views in the URL app bar.
             urlRelativeLayout = findViewById(R.id.url_relativelayout)
             urlEditText = findViewById(R.id.url_edittext)
             // Get handles for the views in the URL app bar.
             urlRelativeLayout = findViewById(R.id.url_relativelayout)
             urlEditText = findViewById(R.id.url_edittext)


@@ -4299,7 +4303,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
                     // Select the same page in the view pager.
                     webViewViewPager2.currentItem = tab.position
 
                     // Select the same page in the view pager.
                     webViewViewPager2.currentItem = tab.position
 

-                    // Set the current WebView after the tab layout has quiesced (otherwise, sometimes the wong WebView might be used).  See <https://redmine.stoutner.com/issues/1136>
+                    // Set the current WebView after the tab layout has quiesced (otherwise, sometimes the wrong WebView might be used).  See <https://redmine.stoutner.com/issues/1136>

                     tabLayout.post {
                         setCurrentWebView(tab.position)
                     }
                     tabLayout.post {
                         setCurrentWebView(tab.position)
                     }

diff --git a/app/src/main/res/layout/url_app_bar.xml b/app/src/main/res/layout/url_app_bar.xml
index ac058b011528206e63ff912fbe64c59d2c08a184..d05df2f47fb0575e9d4cacfc7b62bb29434b05cd 100644 (file)
--- a/app/src/main/res/layout/url_app_bar.xml
+++ b/app/src/main/res/layout/url_app_bar.xml
@@ -31,7 +31,7 @@
         android:layout_height="match_parent"
         android:layout_width="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_height="match_parent"
         android:layout_width="wrap_content"
         android:layout_gravity="center_vertical"

-        android:paddingEnd="10dp"
+        android:paddingEnd="6dp"

         android:src="@drawable/menu"
         android:contentDescription="@string/navigation_drawer"
         android:onClick="openNavigationDrawer"
         android:src="@drawable/menu"
         android:contentDescription="@string/navigation_drawer"
         android:onClick="openNavigationDrawer"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8c0cbb58bcb0b17f771c230fb753e54bbb38fc11..3b109d6cc894d288650853133bedcb67bfb968c2 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip