.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -23,6 +23,8 @@ body:
           required: true
         - label: "This issue contains only one bug."
           required: true
+        - label: "I optionally [donated](https://www.buymeacoffee.com/HeCodes2Much) to support the mLauncher mission."
+          required: false
 
   - type: input
     id: app-version
@@ -85,6 +87,8 @@ body:
       label: Expected behavior
       description: |
         Tell us what you expect to happen.
+    validations:
+      required: true
 
   - type: textarea
     id: screen-media
@@ -114,13 +118,13 @@ body:
       label: Additional information
       description: |
         Any other information you'd like to include.
-        
+
   - type: checkboxes
     id: checklist-accept
     attributes:
       label: "Terms and Conditions"
       options:
         - label: "I have read all the rules above and filled in the requiered fields to the best of my ability."
           required: true
-        - label: "I accept that if I fail to follow the rules stated above that I will recieve a 30 day block."
+        - label: "I accept that if I fail to follow the rules listed above that i will be blocked from interactions with this project."
           required: true

.github/ISSUE_TEMPLATE/CRASH_REPORT.yml

@@ -19,6 +19,8 @@ body:
           required: true
         - label: "I have created the title to best match the issue."
           required: true
+        - label: "I optionally [donated](https://www.buymeacoffee.com/HeCodes2Much) to support the mLauncher mission."
+          required: false
 
   - type: input
     id: app-version
@@ -50,7 +52,7 @@ body:
         - Built from Source
     validations:
       required: true
-      
+
   - type: textarea
     id: crash-description
     attributes:
@@ -81,6 +83,8 @@ body:
       label: Expected behavior
       description: |
         Tell us what you expect to happen.
+    validations:
+      required: true
 
   - type: textarea
     id: screen-media
@@ -110,13 +114,13 @@ body:
       label: Additional information
       description: |
         Any other information you'd like to include.
-        
+
   - type: checkboxes
     id: checklist-accept
     attributes:
       label: "Terms and Conditions"
       options:
         - label: "I have read all the rules above and filled in the requiered fields to the best of my ability."
           required: true
-        - label: "I accept that if I fail to follow the rules stated above that I will recieve a 30 day block."
+        - label: "I accept that if I fail to follow the rules listed above that i will be blocked from interactions with this project."
           required: true

.github/ISSUE_TEMPLATE/ENHANCEMENT.yml

@@ -25,6 +25,8 @@ body:
           required: true
         - label: "This issue contains only one feature request."
           required: true
+        - label: "I optionally [donated](https://www.buymeacoffee.com/HeCodes2Much) to support the mLauncher mission."
+          required: false
 
   - type: textarea
     id: feature-description
@@ -40,13 +42,13 @@ body:
     attributes:
       label: Additional information
       description: Any other information you'd like to include.
-      
+
   - type: checkboxes
     id: checklist-accept
     attributes:
       label: "Terms and Conditions"
       options:
         - label: "I have read all the rules above and filled in the requiered fields to the best of my ability."
           required: true
-        - label: "I accept that if I fail to follow the rules stated above that I will recieve a 30 day block."
+        - label: "I accept that if I fail to follow the rules listed above that i will be blocked from interactions with this project."
           required: true

.github/ISSUE_TEMPLATE/QUESTION.yml

@@ -22,6 +22,8 @@ body:
           required: true
         - label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
           required: true
+        - label: "I optionally [donated](https://www.buymeacoffee.com/HeCodes2Much) to support the mLauncher mission."
+          required: false
 
   - type: textarea
     id: what-is-the-question
@@ -43,5 +45,5 @@ body:
       options:
         - label: "I have read all the rules above and filled in the requiered fields to the best of my ability."
           required: true
-        - label: "I accept that if I fail to follow the rules stated above that I will recieve a 30 day block."
+        - label: "I accept that if I fail to follow the rules listed above that i will be blocked from interactions with this project."
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -4,11 +4,11 @@ contact_links:
     url: https://github.com/orgs/community/discussions
     about: Please ask and answer questions here.
   - name: Organization wide discussions
-    url: https://github.com/orgs/HeCodes2Much/discussions
+    url: https://github.com/orgs/HeAndroids2Much/discussions
     about: For any discussion within our community
   - name: GitHub Security Bug Bounty
     url: https://bounty.github.com/
     about: Please report security vulnerabilities here.
-  - name: 💬 Email
-    url: wayne6324@proton.me
+  - name: Email Me
+    url: mailto://wayne6324@proton.me
     about: Contact me via sending email

.github/workflows/add-comment-for-help-wanted_ci.yml

@@ -16,13 +16,13 @@ on:
 
 jobs:
   add-comment:
-    if: github.event.label.name == 'Help wanted'
+    if: contains(github.event.label.name, 'Help Wanted')
     runs-on: ubuntu-latest
     permissions:
       issues: write
     steps:
       - name: Create comment
-        uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
         with:
           token: ${{ secrets.GIT_BOT_TOKEN }}
           issue-number: ${{ github.event.issue.number }}

.gitignore

@@ -14,6 +14,7 @@
 /build
 /captures
 /fdroid
+/pages
 /app/release
 .externalNativeBuild
 .cxx

CHANGELOG.md

@@ -2,7 +2,19 @@
 
 ## [Coming Soon](https://github.com/HeAndroids2Much/mLauncher/tree/HEAD)
 
-[Full Changelog](https://github.com/HeAndroids2Much/mLauncher/compare/1.3.3...HEAD)
+[Full Changelog](https://github.com/HeAndroids2Much/mLauncher/compare/1.3.4...HEAD)
+
+**Fixed Bugs:**
+
+- \[Bug\] - Fixed Strength for search filter. [\#366](https://github.com/HeAndroids2Much/mLauncher/pull/366) ([HeCodes2Much](https://github.com/HeCodes2Much))
+
+**Release:**
+
+- \[Release\] new release [\#367](https://github.com/HeAndroids2Much/mLauncher/pull/367) ([HeCodes2Much](https://github.com/HeCodes2Much))
+
+## [1.3.4](https://github.com/HeAndroids2Much/mLauncher/tree/1.3.4) (17, March 2024)
+
+[Full Changelog](https://github.com/HeAndroids2Much/mLauncher/compare/1.3.3...1.3.4)
 
 **Implemented Enhancements:**
 

README.md

@@ -4,6 +4,7 @@
     <a href='https://f-droid.org/packages/app.mlauncher'><img src='https://camo.githubusercontent.com/f422f6f830e814ec7e766de8fef4db949c6add75a9d58548ab2f5d29855c0616/68747470733a2f2f6664726f69642e6769746c61622e696f2f617274776f726b2f62616467652f6765742d69742d6f6e2e706e67'></a>
 </div>
 
+- Chat with us at [mLauncher](https://t.me/mLauncherAndroid) on telegram.
 - This application can be found on [F-Droid](https://f-droid.org/packages/app.mlauncher/) and [Github](https://github.com/HeCodes2Much/mLauncher/releases/).
 - You can also add this repo to [Obtanium](https://github.com/ImranR98/Obtainium) to get auto updates that are faster then F-Droid.
 - The latest stable version is available on the [`main`](https://github.com/HeCodes2Much/mLauncher/tree/main) branch, which can be cloned to build the application independently.

app/build.gradle.kts

@@ -13,8 +13,8 @@ android {
         applicationId = "app.mlauncher"
         minSdk = 23
         targetSdk = 34
-        versionCode = 71
-        versionName = "1.3.4"
+        versionCode = 72
+        versionName = "1.3.5"
     }
 
     buildTypes {

app/src/main/java/com/github/hecodes2much/fuzzywuzzy/finder.kt

@@ -3,19 +3,22 @@ package com.github.hecodes2much.fuzzywuzzy
 import com.github.hecodes2much.mlauncher.data.AppModel
 import java.util.*
 
-fun scoreApp(app: AppModel, searchChars: String): Float {
-    val appChars = app.appAlias.ifEmpty {
-        app.appLabel
-    }
+fun scoreApp(app: AppModel, searchChars: String): Int {
+    val appChars = app.appAlias.ifEmpty { app.appLabel }
 
-    return calculateFuzzyScore(
-        appChars.uppercase(Locale.getDefault())
-            .replace(Regex("\\p{InCombiningDiacriticalMarks}+"), "")
-            .replace(Regex("[-_+,.]"), ""),
-        searchChars.uppercase()
-            .replace(Regex("\\p{InCombiningDiacriticalMarks}+"), "")
-            .replace(Regex("[-_+,.]"), "")
+    val fuzzyScore = calculateFuzzyScore(
+        normalizeString(appChars),
+        normalizeString(searchChars)
     )
+
+    return (fuzzyScore * 99).toInt()
+}
+
+fun normalizeString(input: String): String {
+    // Remove diacritical marks and special characters, and convert to uppercase
+    return input
+        .uppercase(Locale.getDefault())
+        .replace(Regex("[\\p{InCombiningDiacriticalMarks}-_+,.]"), "")
 }
 
 fun calculateFuzzyScore(s1: String, s2: String): Float {
@@ -25,14 +28,12 @@ fun calculateFuzzyScore(s1: String, s2: String): Float {
     var s1Index = 0
 
     // Iterate over each character in s2 and check if it exists in s1
-    for (i in 0 until n) {
-        val c2 = s2[i]
+    for (c2 in s2) {
         var found = false
 
         // Start searching for c2 from the current s1Index
         for (j in s1Index until m) {
-            val c1 = s1[j]
-            if (c1 == c2) {
+            if (s1[j] == c2) {
                 found = true
                 // Update s1Index to the next position for the next iteration
                 s1Index = j + 1
@@ -50,6 +51,5 @@ fun calculateFuzzyScore(s1: String, s2: String): Float {
     }
 
     // Calculate the score as the ratio of matched characters to the longer string length
-    val maxLength = maxOf(m, n)
-    return matchCount.toFloat() / maxLength
-}
+    return matchCount.toFloat() / maxOf(m, n)
+}

app/src/main/java/com/github/hecodes2much/mlauncher/data/Prefs.kt

@@ -110,11 +110,11 @@ class Prefs(val context: Context) {
         set(value) = prefs.edit().putBoolean(LOCK_MODE, value).apply()
 
     var autoOpenApp: Boolean
-        get() = prefs.getBoolean(AUTO_OPEN_APP, true)
+        get() = prefs.getBoolean(AUTO_OPEN_APP, false)
         set(value) = prefs.edit().putBoolean(AUTO_OPEN_APP, value).apply()
 
     var filterStrength: Int
-        get() = prefs.getInt(FILTER_STRENGTH, 50)
+        get() = prefs.getInt(FILTER_STRENGTH, 25)
         set(value) = prefs.edit().putInt(FILTER_STRENGTH, value).apply()
 
     var searchFromStart: Boolean
@@ -126,36 +126,20 @@ class Prefs(val context: Context) {
         set(value) = prefs.edit().putBoolean(AUTO_SHOW_KEYBOARD, value).apply()
 
     var homeAppsNum: Int
-        get() {
-            return try {
-                prefs.getInt(HOME_APPS_NUM, 4)
-            } catch (_: Exception) {
-                4
-            }
-        }
+        get() = prefs.getInt(HOME_APPS_NUM, 4)
         set(value) = prefs.edit().putInt(HOME_APPS_NUM, value).apply()
 
     var opacityNum: Int
-        get() {
-            return try {
-                prefs.getInt(APP_OPACITY, 50)
-            } catch (_: Exception) {
-                50
-            }
-        }
+        get() = prefs.getInt(APP_OPACITY, 128)
         set(value) = prefs.edit().putInt(APP_OPACITY, value).apply()
 
     var homeAlignment: Gravity
         get() {
-            return try {
-                val string = prefs.getString(
-                    HOME_ALIGNMENT,
-                    Gravity.Left.name
-                ).toString()
-                Gravity.valueOf(string)
-            } catch (_: Exception) {
-                Gravity.Left
-            }
+            val string = prefs.getString(
+                HOME_ALIGNMENT,
+                Gravity.Left.name
+            ).toString()
+            return Gravity.valueOf(string)
         }
         set(value) = prefs.edit().putString(HOME_ALIGNMENT, value.toString()).apply()
 

app/src/main/java/com/github/hecodes2much/mlauncher/ui/AppDrawerAdapter.kt

@@ -1,13 +1,15 @@
 package com.github.hecodes2much.mlauncher.ui
 
 import android.annotation.SuppressLint
+import android.os.Build
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.Gravity.*
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.annotation.RequiresApi
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.res.ResourcesCompat
@@ -37,6 +39,7 @@ class AppDrawerAdapter(
     var appFilteredList: MutableList<AppModel> = mutableListOf()
     private lateinit var binding: AdapterAppDrawerBinding
 
+    @RequiresApi(Build.VERSION_CODES.Q)
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         binding = AdapterAppDrawerBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         prefs = Prefs(parent.context)
@@ -54,7 +57,6 @@ class AppDrawerAdapter(
         return ViewHolder(binding)
     }
 
-    @Suppress("DEPRECATION")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         if (appFilteredList.size == 0) return
         val appModel = appFilteredList[holder.absoluteAdapterPosition]
@@ -86,19 +88,19 @@ class AppDrawerAdapter(
             override fun performFiltering(constraint: CharSequence?): FilterResults {
                 val searchChars = constraint.toString()
 
-                val scoredApps = mutableMapOf<AppModel, Float>()
+                val scoredApps = mutableMapOf<AppModel, Int>()
                 for (app in appsList) {
                     scoredApps[app] = scoreApp(app, searchChars)
                 }
 
                 val filteredApps = if (searchChars.isNotEmpty()) {
                     if (prefs.searchFromStart) {
                         scoredApps.filter { (app, _) -> app.name.startsWith(searchChars, ignoreCase = true) }
+                            .filter { (_, score) -> score > prefs.filterStrength }
                             .map { it.key }
-                            .filter { scoredApps[it] != 0.0f }
                             .toMutableList()
                     } else {
-                        scoredApps.filterValues { it != 0.0f }
+                        scoredApps.filterValues { it > prefs.filterStrength }
                             .keys
                             .toMutableList()
                     }

app/src/main/java/com/github/hecodes2much/mlauncher/ui/SettingsFragment.kt

@@ -53,7 +53,6 @@ import com.github.hecodes2much.mlauncher.style.SettingsTheme
 import com.github.hecodes2much.mlauncher.ui.compose.SettingsComposable.SettingsArea
 import com.github.hecodes2much.mlauncher.ui.compose.SettingsComposable.SettingsGestureItem
 import com.github.hecodes2much.mlauncher.ui.compose.SettingsComposable.SettingsItem
-import com.github.hecodes2much.mlauncher.ui.compose.SettingsComposable.SettingsNumberItem
 import com.github.hecodes2much.mlauncher.ui.compose.SettingsComposable.SettingsSliderItem
 import com.github.hecodes2much.mlauncher.ui.compose.SettingsComposable.SettingsTextButton
 import com.github.hecodes2much.mlauncher.ui.compose.SettingsComposable.SettingsToggle
@@ -272,7 +271,7 @@ class SettingsFragment : Fragment() {
                         ) { toggleAutoOpenApp() }
                     },
                     { open, onChange ->
-                        SettingsNumberItem(
+                        SettingsSliderItem(
                             title = stringResource(R.string.filter_strength),
                             fontSize = iconFs,
                             open = open,