improve ui + hide compat sticker dir

FredHappyface · Jun 23, 2021 · 3a17799 · 3a17799
1 parent 7f9debf
commit 3a17799
Show file tree

Hide file tree

Showing 22 changed files with 361 additions and 140 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.fredhappyface.ewesticker"
         minSdkVersion 28
         targetSdkVersion 30
-        versionCode 20210612
-        versionName "2021.06.12"
+        versionCode 20210623
+        versionName "2021.06.23"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -43,9 +43,6 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.5.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'

diff --git a/app/debug/app-debug_2021.06.12_2021-06-12.apk b/app/debug/app-debug_2021.06.12_2021-06-12.apk
diff --git a/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt b/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt
@@ -45,7 +45,7 @@ class ImageKeyboard : InputMethodService() {
 		val packCard = layoutInflater.inflate(R.layout.pack_card, packContainer, false)
 		val backButton = packCard.findViewById<ImageButton>(R.id.ib3)
 		val icon =
-			ResourcesCompat.getDrawable(resources, R.drawable.tabler_icon_arrow_back_white, null)
+			ResourcesCompat.getDrawable(resources, R.drawable.ic_chevron_left, null)
 		backButton.setImageDrawable(icon)
 		backButton.setOnClickListener {
 			val inputMethodManager = applicationContext
@@ -299,7 +299,8 @@ class ImageKeyboard : InputMethodService() {
 	private fun reloadPacks() {
 		loadedPacks = HashMap()
 		internalDir = File(filesDir, "stickers")
-		val packs = internalDir.listFiles { obj: File -> obj.isDirectory }
+		val packs =
+			internalDir.listFiles { obj: File -> obj.isDirectory && !obj.absolutePath.contains("stickers/__compatSticker__") }
 		if (packs != null) {
 			for (file in packs) {
 				val pack = StickerPack(file)

diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/app/src/main/res/drawable/ic_chevron_left.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="@color/fg"
+        android:fillType="evenOdd"
+        android:pathData="M9.78,12.78a0.75,0.75 0,0 1,-1.06 0L4.47,8.53a0.75,0.75 0,0 1,0 -1.06l4.25,-4.25a0.75,0.75 0,0 1,1.06 1.06L6.06,8l3.72,3.72a0.75,0.75 0,0 1,0 1.06z" />
+</vector>
diff --git a/app/src/main/res/drawable/tabler_icon_arrow_back_white.png b/app/src/main/res/drawable/tabler_icon_arrow_back_white.png
diff --git a/app/src/main/res/font/firasans_nf.ttf b/app/src/main/res/font/firasans_nf.ttf