change tab count border when incognito mode is turned on

plateaukao · Jun 5, 2021 · af96e02 · af96e02
1 parent c8b25bd
commit af96e02
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 22 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
     buildToolsVersion '30.0.3'
 
     defaultConfig {
-        //applicationId "info.plateaukao.einkbro"
-        applicationId "info.plateaukao.einkbro.debug"
+        applicationId "info.plateaukao.einkbro"
+        //applicationId "info.plateaukao.einkbro.debug"
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 881

diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt
@@ -35,7 +35,6 @@ import android.widget.AdapterView.OnItemClickListener
 import android.widget.TextView.OnEditorActionListener
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
@@ -196,9 +195,12 @@ class BrowserActivity : AppCompatActivity(), BrowserController, OnClickListener
         initSearchPanel()
         initOverview()
         initTouchArea()
+        updateWebViewCountUI()
+
         AdBlock(this) // For AdBlock cold boot
         Javascript(this)
         Cookie(this)
+
         downloadReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
                 showOkCancelDialog(
@@ -666,7 +668,9 @@ class BrowserActivity : AppCompatActivity(), BrowserController, OnClickListener
         ninjaWebView.settings.textZoom = size
     }
 
-    private fun increaseFontSize() = changeFontSize(config.fontSize + 20)
+    private fun increaseFontSize() {
+        changeFontSize(config.fontSize + 20)
+    }
 
     private fun decreaseFontSize() {
         if (config.fontSize <= 50) return
@@ -864,7 +868,7 @@ class BrowserActivity : AppCompatActivity(), BrowserController, OnClickListener
 
         // long click on overview, show bookmark
         binding.omniboxTabcount.setOnLongClickListener {
-            openBookmarkPage()
+            config.isIncognitoMode = !config.isIncognitoMode
             true
         }
 
@@ -898,13 +902,16 @@ class BrowserActivity : AppCompatActivity(), BrowserController, OnClickListener
                     ninjaWebView.reload()
                 }
             }
-            key.equals((ConfigManager.K_FONT_STYLE_SERIF)) -> {
+            key.equals(ConfigManager.K_FONT_STYLE_SERIF) -> {
                 if (config.fontStyleSerif) {
                     ninjaWebView.updateCssStyle()
                 } else {
                     ninjaWebView.reload()
                 }
             }
+            key.equals(ConfigManager.K_IS_INCOGNITO_MODE) -> {
+                updateWebViewCountUI()
+            }
         }
     }
 
@@ -1275,6 +1282,12 @@ class BrowserActivity : AppCompatActivity(), BrowserController, OnClickListener
         binding.omniboxTabcount.text = BrowserContainer.size().toString()
     }
 
+    private fun updateWebViewCountUI() {
+        binding.omniboxTabcount.setBackgroundResource(
+            if (config.isIncognitoMode) R.drawable.button_border_bg_dash else R.drawable.button_border_bg
+        )
+    }
+
     @Synchronized
     private fun updateAlbum(url: String?) {
         if (url == null) return

diff --git a/app/src/main/java/de/baumann/browser/view/NinjaToast.java b/app/src/main/java/de/baumann/browser/view/NinjaToast.java
diff --git a/app/src/main/java/de/baumann/browser/view/NinjaToast.kt b/app/src/main/java/de/baumann/browser/view/NinjaToast.kt
@@ -0,0 +1,21 @@
+package de.baumann.browser.view
+
+import android.content.Context
+import android.widget.Toast
+
+object NinjaToast {
+    @JvmStatic
+    fun show(context: Context?, stringResId: Int) {
+        Toast.makeText(context, stringResId, Toast.LENGTH_LONG).show()
+    }
+
+    @JvmStatic
+    fun show(context: Context?, text: String?) {
+        Toast.makeText(context, text, Toast.LENGTH_LONG).show()
+    }
+
+    @JvmStatic
+    fun showShort(context: Context?, text: String?) {
+        Toast.makeText(context, text, Toast.LENGTH_SHORT).show()
+    }
+}
diff --git a/app/src/main/res/drawable/button_border_bg_dash.xml b/app/src/main/res/drawable/button_border_bg_dash.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="9dp"
+        android:right="9dp"
+        android:top="14dp"
+        android:bottom="14dp">
+
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="4dp" />
+            <solid android:color="@android:color/transparent" />
+            <stroke
+                android:width="2dp"
+                android:dashWidth="2px"
+                android:dashGap="2dp"
+                android:color="?attr/colorControlNormal" />
+        </shape>
+    </item>
+</layer-list>
+