Add UI visibility toggle

Ruin0x11 · Jun 16, 2021 · 4135610 · 4135610
1 parent e2fc38a
commit 4135610
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 9 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/xyz/ruin/droidref/MainActivity.kt b/app/src/main/java/xyz/ruin/droidref/MainActivity.kt
@@ -3,7 +3,6 @@ package xyz.ruin.droidref
 import android.Manifest
 import android.app.Activity
 import android.app.AlertDialog
-import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.database.Cursor
@@ -41,6 +40,7 @@ import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.*
 
+
 class MainActivity : AppCompatActivity() {
     private lateinit var stickerViewModel: StickerViewModel
     private lateinit var binding: ActivityMainBinding
@@ -402,6 +402,24 @@ class MainActivity : AppCompatActivity() {
         binding.buttonResetCrop.setOnClickListener {
             stickerViewModel.resetCurrentStickerCropping()
         }
+
+        binding.buttonHideShowUI.setOnCheckedChangeListener { _, isToggled ->
+            setUIVisibility(isToggled)
+        }
+    }
+
+    private fun setUIVisibility(isToggled: Boolean) {
+        if (isToggled) {
+            binding.toolbarTop.visibility = View.GONE;
+            binding.toolbarBottom.visibility = View.GONE;
+            val top = ContextCompat.getDrawable(this, R.drawable.ic_baseline_visibility_off_24)
+            binding.buttonHideShowUI.setCompoundDrawablesWithIntrinsicBounds(null, top, null, null)
+        } else {
+            binding.toolbarTop.visibility = View.VISIBLE;
+            binding.toolbarBottom.visibility = View.VISIBLE;
+            val top = ContextCompat.getDrawable(this, R.drawable.ic_baseline_visibility_24)
+            binding.buttonHideShowUI.setCompoundDrawablesWithIntrinsicBounds(null, top, null, null)
+        }
     }
 
     override fun onBackPressed() {

diff --git a/app/src/main/res/drawable/ic_baseline_visibility_24.xml b/app/src/main/res/drawable/ic_baseline_visibility_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_visibility_off_24.xml b/app/src/main/res/drawable/ic_baseline_visibility_off_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -17,6 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+
             <com.xiaopo.flying.sticker.StickerView
                 android:id="@+id/sticker_view"
                 android:layout_width="match_parent"
@@ -56,6 +57,40 @@
             </com.xiaopo.flying.sticker.StickerView>
 
             <HorizontalScrollView
+                android:id="@+id/toolbarHideShowUI"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="false"
+                android:background="#00000000"
+                android:foreground="#00000000"
+                android:scrollbars="none"
+                android:visibility="visible">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
+
+                    <ToggleButton
+                        android:id="@+id/buttonHideShowUI"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:checked="@={viewModel.isCropActive}"
+                        android:drawableTop="@drawable/ic_baseline_visibility_24"
+                        android:gravity="center"
+                        android:minWidth="1dp"
+                        android:textOff=""
+                        android:textOn=""
+                        android:textSize="0dp"
+                        android:visibility="visible"
+                        tools:visibility="visible" />
+                </LinearLayout>
+            </HorizontalScrollView>
+
+            <HorizontalScrollView
+                android:id="@+id/toolbarTop"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
@@ -106,6 +141,7 @@
             </HorizontalScrollView>
 
             <HorizontalScrollView
+                android:id="@+id/toolbarBottom"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
@@ -145,26 +181,26 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
+                        android:checked="@={viewModel.isLocked}"
                         android:drawableTop="@drawable/ic_lock_outline_black_24dp"
                         android:gravity="center"
                         android:minWidth="1dp"
                         android:textOff=""
                         android:textOn=""
-                        android:textSize="0dp"
-                        android:checked="@={viewModel.isLocked}"/>
+                        android:textSize="0dp" />
 
                     <ToggleButton
                         android:id="@+id/buttonCrop"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
+                        android:checked="@={viewModel.isCropActive}"
                         android:drawableTop="@drawable/ic_crop_black_24dp"
                         android:gravity="center"
                         android:minWidth="1dp"
                         android:textOff=""
                         android:textOn=""
-                        android:textSize="0dp"
-                        android:checked="@={viewModel.isCropActive}"/>
+                        android:textSize="0dp" />
 
                     <ImageButton
                         android:id="@+id/buttonResetCrop"

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha04'
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jan 01 02:21:34 PST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sticker/build.gradle b/sticker/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"