Build91

- Fixed the crash that occurred unexpectedly
Hamza417 · Aug 29, 2023 · 7c945bd · 7c945bd
1 parent 15ee405
commit 7c945bd
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId "app.simple.inure"
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 90
-        versionName "build90"
+        versionCode 91
+        versionName "build91"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/assets/html/changelogs.html b/app/src/main/assets/html/changelogs.html
@@ -13,7 +13,7 @@ <h1>Change Logs</h1>
 <br>
 
 <sub>(Current Version)</sub>
-<h2>Build90</h2>
+<h2>Build91</h2>
 
 <!-- Write change logs here -->
 
@@ -73,6 +73,11 @@ <h4>Changes</h4>
 
 <br>
 <br>
+<br>
+<p>
+    Build90 was skipped.
+</p>
+<br>
 <div class="wrap-collapsible">
     <input class="toggle" id="build_89" type="checkbox">
     <label class="lbl-toggle" for="build_89">Build89</label>

diff --git a/app/src/main/java/app/simple/inure/adapters/details/AdapterTags.kt b/app/src/main/java/app/simple/inure/adapters/details/AdapterTags.kt
@@ -41,7 +41,7 @@ class AdapterTags(private val tags: ArrayList<String>, private val showNewTag: B
     }
 
     override fun onBindViewHolder(holder: Holder, position: Int) {
-        if (tags.size == 0 || position == tags.size) {
+        if (position == tags.size && showNewTag) {
             holder.tag.text = holder.itemView.context.getString(R.string.add_tag)
             holder.tag.setChipIconResource(R.drawable.ic_add)
             holder.tag.chipStartPadding = 25F
@@ -81,14 +81,10 @@ class AdapterTags(private val tags: ArrayList<String>, private val showNewTag: B
     }
 
     override fun getItemCount(): Int {
-        return if (tags.size == 0) {
-            1
+        return if (showNewTag) {
+            tags.size.plus(1)
         } else {
-            if (showNewTag) {
-                tags.size.plus(1)
-            } else {
-                tags.size
-            }
+            tags.size
         }
     }
 

diff --git a/app/src/main/java/app/simple/inure/decorations/searchview/SearchViewEventListener.java b/app/src/main/java/app/simple/inure/decorations/searchview/SearchViewEventListener.java
@@ -29,4 +29,6 @@ public interface SearchViewEventListener {
     void onSearchTextChanged(@NotNull String keywords, int count);
 
     void onSearchRefreshPressed(View button);
+
+    void onClear(View button);
 }
diff --git a/app/src/main/java/app/simple/inure/ui/launcher/SplashScreen.kt b/app/src/main/java/app/simple/inure/ui/launcher/SplashScreen.kt
@@ -60,6 +60,7 @@ class SplashScreen : ScopedFragment() {
     private var isFrequentlyUsedLoaded = false
     private var isBatteryOptimizationLoaded = false
     private var isBootManagerLoaded = false
+    private var isTagsLoaded = false
 
     private val launcherViewModel: LauncherViewModel by viewModels()
 
@@ -172,6 +173,7 @@ class SplashScreen : ScopedFragment() {
         val batchViewModel = ViewModelProvider(requireActivity())[BatchViewModel::class.java]
         val notesViewModel = ViewModelProvider(requireActivity())[NotesViewModel::class.java]
         val apkBrowserViewModel = ViewModelProvider(requireActivity())[ApkBrowserViewModel::class.java]
+        val tagsViewModel = ViewModelProvider(requireActivity())[TagsViewModel::class.java]
 
         val batteryOptimizationViewModel = if (ConfigurationPreferences.isUsingRoot() || ConfigurationPreferences.isUsingShizuku()) {
             ViewModelProvider(requireActivity())[BatteryOptimizationViewModel::class.java]
@@ -267,6 +269,12 @@ class SplashScreen : ScopedFragment() {
             openApp()
         }
 
+        tagsViewModel.getTags().observe(viewLifecycleOwner) {
+            Log.d(TAG, "Tags data loaded in ${(System.currentTimeMillis() - startTime) / 1000} seconds")
+            isTagsLoaded = true
+            openApp()
+        }
+
         /**
          * One shell warning is enough, I guess!!
          * Skip the boot manager ones if the user has already seen the warning
@@ -340,7 +348,8 @@ class SplashScreen : ScopedFragment() {
                 isBatteryOptimizationLoaded &&
                 isBatchLoaded &&
                 isBootManagerLoaded &&
-                isNotesLoaded
+                isNotesLoaded &&
+                isTagsLoaded
     }
 
     private fun checkForPermission(): Boolean {

diff --git a/app/src/main/java/app/simple/inure/ui/panels/Search.kt b/app/src/main/java/app/simple/inure/ui/panels/Search.kt
@@ -232,6 +232,10 @@ class Search : KeyboardScopedFragment(), SharedPreferences.OnSharedPreferenceCha
             override fun onSearchRefreshPressed(button: View?) {
                 searchViewModel.reload()
             }
+
+            override fun onClear(button: View?) {
+                setTagsStripState("")
+            }
         })
     }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -699,6 +699,6 @@
     <string name="backup_and_restore_desc">Backup and Restore app\'s data.</string>
     <string name="import_">Import</string>
     <string name="tags">Tags</string>
-    <string name="add_tag">Assign a Tag</string>
+    <string name="add_tag">Add a New Tag</string>
     <string name="new_update_available">New update available</string>
 </resources>
diff --git a/.../metadata/android/en-US/changelogs/90.txt → .../metadata/android/en-US/changelogs/91.txt b/.../metadata/android/en-US/changelogs/90.txt → .../metadata/android/en-US/changelogs/91.txt