Contacts functionality should now be functional. Also some UI color changes and stuff.

app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt

@@ -8,7 +8,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.LauncherActivityInfo
 import android.content.pm.LauncherApps
-import android.content.pm.PackageManager
 import android.database.Cursor
 import android.graphics.BlendMode
 import android.graphics.BlendModeColorFilter
@@ -35,8 +34,6 @@ import android.widget.ViewSwitcher
 import androidx.activity.OnBackPressedCallback
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.database.getStringOrNull
 import androidx.core.view.ViewCompat
@@ -61,7 +58,6 @@ import eu.ottop.yamlauncher.utils.PermissionUtils
 import eu.ottop.yamlauncher.utils.StringUtils
 import eu.ottop.yamlauncher.utils.UIUtils
 import eu.ottop.yamlauncher.utils.WeatherSystem
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -183,12 +179,12 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
 
         dateElements = mutableListOf(dateText.format12Hour.toString(), dateText.format24Hour.toString(), "", "")
 
+        searchView = binding.searchView
+
         menuView = binding.menuView
 
         searchSwitcher = binding.searchSwitcher
 
-        searchView = binding.searchView
-
         preferences = PreferenceManager.getDefaultSharedPreferences(this)
     }
 
@@ -271,9 +267,11 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
         try {
             // The menu opens from the top
             appRecycler.scrollToPosition(0)
-            contactRecycler.scrollToPosition(0)
+            if (sharedPreferenceManager.areContactsEnabled()) {
-            menuView.displayedChild = 0
+                contactRecycler.scrollToPosition(0)
-            searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.contacts_24px, null))
+                searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.contacts_24px, null))
+                menuView.displayedChild = 0
+            }
         }
         catch (_: UninitializedPropertyAccessException) {}
         animations.showApps(binding.homeView, binding.appView)
@@ -326,8 +324,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
 
         uiUtils.setMenuItemColors(binding.menuTitle, "A9")
 
-        uiUtils.setImageColor(searchSwitcher)
-
         uiUtils.setClockVisibility(clock)
         uiUtils.setDateVisibility(dateText)
         uiUtils.setSearchVisibility(searchView, binding.searchLayout, binding.searchReplacement)
@@ -491,7 +487,11 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
                 }
 
                 "contactsEnabled" -> {
-                    uiUtils.setContactsVisibility(searchSwitcher, binding.searchLayout, binding.searchReplacement)
+                    try{
+                        contactRecycler
+                    } catch(_: UninitializedPropertyAccessException) {
+                        setupContactRecycler()
+                    }
                 }
 
                 "clockAlignment" -> {
@@ -691,8 +691,9 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
             setupAppRecycler(newApps)
 
             setupSearch()
-            setupContactRecycler()
+            if (sharedPreferenceManager.areContactsEnabled()) {
-
+                setupContactRecycler()
+            }
         }
 
     }
@@ -723,15 +724,28 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
         })
     }
 
-    private suspend fun setupContactRecycler() {
+    private fun setupContactRecycler() {
+        uiUtils.setImageColor(searchSwitcher)
+
         contactAdapter = ContactsAdapter(this, mutableListOf(), this)
+        contactMenuLinearLayoutManager.stackFromEnd = true
         contactRecycler = binding.contactRecycler
-        withContext(Dispatchers.Main) {
+        contactRecycler.layoutManager = contactMenuLinearLayoutManager
-            contactRecycler.layoutManager = contactMenuLinearLayoutManager
+        contactRecycler.edgeEffectFactory = appMenuEdgeFactory
-            contactRecycler.edgeEffectFactory = appMenuEdgeFactory
+        contactRecycler.adapter = contactAdapter
-            contactRecycler.adapter = contactAdapter
-        }
         setupRecyclerListener(contactRecycler, contactMenuLinearLayoutManager)
+
+        searchSwitcher.setOnClickListener {
+            menuView.showNext()
+            when (menuView.displayedChild) {
+                0 -> searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.contacts_24px, null))
+                1 -> {
+                    lifecycleScope.launch(Dispatchers.Default) {
+                        filterItems(searchView.text.toString())
+                    }
+                    searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.apps_24px, null))}
+            }
+        }
     }
 
     private fun getContacts(filterString: String): MutableList<Pair<String, Int>> {
@@ -803,19 +817,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
                 }
             }
         })
-
-        searchSwitcher.setOnClickListener {
-            menuView.showNext()
-            when (menuView.displayedChild) {
-                0 -> searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.contacts_24px, null))
-                1 -> {
-                    lifecycleScope.launch(Dispatchers.Default) {
-                        updateContacts("")
-                    }
-                    searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.apps_24px, null))}
-            }
-        }
-
     }
 
     private suspend fun filterItems(query: String?) {

app/src/main/java/eu/ottop/yamlauncher/settings/AboutFragment.kt

@@ -1,9 +1,9 @@
 package eu.ottop.yamlauncher.settings
 
-import android.content.Intent
+import android.content.ComponentName
-import android.net.Uri
+import android.content.Context
+import android.content.pm.LauncherApps
 import android.os.Bundle
-import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -26,6 +26,8 @@ class AboutFragment : Fragment(), TitleProvider {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val launcherApps = requireActivity().getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
+
         // Set up about page links
         stringUtils.setLink(requireActivity().findViewById(R.id.creditText), getString(R.string.my_website_link))
         stringUtils.setLink(requireActivity().findViewById(R.id.codebergLink), getString(R.string.codeberg_link))
@@ -35,10 +37,12 @@ class AboutFragment : Fragment(), TitleProvider {
         stringUtils.setLink(requireActivity().findViewById(R.id.weatherLink), getString(R.string.weather_link))
 
         requireActivity().findViewById<ImageView>(R.id.iconView).setOnClickListener {
-            val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+            launcherApps.startAppDetailsActivity(
-                data = Uri.parse("package:${requireContext().packageName}")
+                ComponentName(requireContext(), this::class.java),
-            }
+                launcherApps.profiles[0],
-            startActivity(intent)
+                null,
+                null
+            )
         }
     }
 

app/src/main/java/eu/ottop/yamlauncher/settings/SettingsActivity.kt

@@ -12,14 +12,17 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import eu.ottop.yamlauncher.R
 import eu.ottop.yamlauncher.databinding.ActivitySettingsBinding
+import eu.ottop.yamlauncher.utils.PermissionUtils
 import org.json.JSONObject
 
 class SettingsActivity : AppCompatActivity() {
 
+    private val permissionUtils = PermissionUtils()
+
+    private lateinit var sharedPreferenceManager: SharedPreferenceManager
     private lateinit var preferences: SharedPreferences
     private lateinit var binding: ActivitySettingsBinding
     private lateinit var performBackup: ActivityResultLauncher<Intent>
@@ -28,6 +31,8 @@ class SettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        sharedPreferenceManager = SharedPreferenceManager(this@SettingsActivity)
+
         preferences = PreferenceManager.getDefaultSharedPreferences(this@SettingsActivity)
 
         binding = ActivitySettingsBinding.inflate(layoutInflater)
@@ -37,10 +42,12 @@ class SettingsActivity : AppCompatActivity() {
         supportActionBar?.title = "Launcher Settings"
         supportActionBar?.setDisplayShowTitleEnabled(true)
 
-        supportFragmentManager
+        if (supportFragmentManager.backStackEntryCount == 0) {
-            .beginTransaction()
+            supportFragmentManager
-            .replace(R.id.settingsLayout, SettingsFragment())
+                .beginTransaction()
-            .commit()
+                .replace(R.id.settingsLayout, SettingsFragment())
+                .commit()
+        }
 
         supportFragmentManager.addOnBackStackChangedListener {
             updateActionBarTitle()
@@ -209,4 +216,11 @@ class SettingsActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (!permissionUtils.hasContactsPermission(this@SettingsActivity, Manifest.permission.READ_CONTACTS)) {
+            sharedPreferenceManager.setContactsEnabled(false)
+        }
+    }
+
 }

app/src/main/java/eu/ottop/yamlauncher/settings/SettingsFragment.kt

@@ -6,7 +6,6 @@ import android.provider.Settings
 import android.widget.Toast
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreference
 import eu.ottop.yamlauncher.R
 import eu.ottop.yamlauncher.utils.UIUtils
 

app/src/main/java/eu/ottop/yamlauncher/utils/AppUtils.kt

@@ -1,14 +1,11 @@
 package eu.ottop.yamlauncher.utils
 
-import android.Manifest
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.LauncherActivityInfo
 import android.content.pm.LauncherApps
-import android.content.pm.PackageManager
 import android.os.UserHandle
 import android.widget.Toast
-import androidx.core.content.ContextCompat
 import eu.ottop.yamlauncher.settings.SharedPreferenceManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

app/src/main/res/drawable/apps_24px.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
+    android:viewportHeight="960">
-    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M240,800Q207,800 183.5,776.5Q160,753 160,720Q160,687 183.5,663.5Q207,640 240,640Q273,640 296.5,663.5Q320,687 320,720Q320,753 296.5,776.5Q273,800 240,800ZM480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM720,800Q687,800 663.5,776.5Q640,753 640,720Q640,687 663.5,663.5Q687,640 720,640Q753,640 776.5,663.5Q800,687 800,720Q800,753 776.5,776.5Q753,800 720,800ZM240,560Q207,560 183.5,536.5Q160,513 160,480Q160,447 183.5,423.5Q207,400 240,400Q273,400 296.5,423.5Q320,447 320,480Q320,513 296.5,536.5Q273,560 240,560ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM720,560Q687,560 663.5,536.5Q640,513 640,480Q640,447 663.5,423.5Q687,400 720,400Q753,400 776.5,423.5Q800,447 800,480Q800,513 776.5,536.5Q753,560 720,560ZM240,320Q207,320 183.5,296.5Q160,273 160,240Q160,207 183.5,183.5Q207,160 240,160Q273,160 296.5,183.5Q320,207 320,240Q320,273 296.5,296.5Q273,320 240,320ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320ZM720,320Q687,320 663.5,296.5Q640,273 640,240Q640,207 663.5,183.5Q687,160 720,160Q753,160 776.5,183.5Q800,207 800,240Q800,273 776.5,296.5Q753,320 720,320Z"/>

app/src/main/res/drawable/close_24px.xml

@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
+    android:viewportHeight="960">
-    android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#D3F3F3F3"
       android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z"/>
 </vector>

app/src/main/res/drawable/contacts_24px.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
+    android:viewportHeight="960">
-    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M160,920L160,840L800,840L800,920L160,920ZM160,120L160,40L800,40L800,120L160,120ZM480,520Q530,520 565,485Q600,450 600,400Q600,350 565,315Q530,280 480,280Q430,280 395,315Q360,350 360,400Q360,450 395,485Q430,520 480,520ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM230,720Q275,664 339,632Q403,600 480,600Q557,600 621,632Q685,664 730,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L230,720ZM348,720L612,720Q583,700 549.5,690Q516,680 480,680Q444,680 410.5,690Q377,700 348,720ZM480,440Q463,440 451.5,428.5Q440,417 440,400Q440,383 451.5,371.5Q463,360 480,360Q497,360 508.5,371.5Q520,383 520,400Q520,417 508.5,428.5Q497,440 480,440ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>

app/src/main/res/drawable/delete_24px.xml

@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
+    android:viewportHeight="960">
-    android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#D3F3F3F3"
       android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z"/>
 </vector>

app/src/main/res/drawable/edit_24px.xml

@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
+    android:viewportHeight="960">
-    android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#D3F3F3F3"
       android:pathData="M200,760L257,760L648,369L591,312L200,703L200,760ZM120,840L120,670L648,143Q660,132 674.5,126Q689,120 705,120Q721,120 736,126Q751,132 762,144L817,200Q829,211 834.5,226Q840,241 840,256Q840,272 834.5,286.5Q829,301 817,313L290,840L120,840ZM760,256L760,256L704,200L704,200L760,256ZM619,341L591,312L591,312L648,369L648,369L619,341Z"/>
 </vector>

app/src/main/res/drawable/info_24px.xml

@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
+    android:viewportHeight="960">
-    android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#D3F3F3F3"
       android:pathData="M440,680L520,680L520,440L440,440L440,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
 </vector>

app/src/main/res/drawable/visibility_off_24px.xml

@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
+    android:viewportHeight="960">
-    android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#D3F3F3F3"
       android:pathData="M644,532L586,474Q595,427 559,386Q523,345 466,354L408,296Q425,288 442.5,284Q460,280 480,280Q555,280 607.5,332.5Q660,385 660,460Q660,480 656,497.5Q652,515 644,532ZM772,658L714,602Q752,573 781.5,538.5Q811,504 832,460Q782,359 688.5,299.5Q595,240 480,240Q451,240 423,244Q395,248 368,256L306,194Q347,177 390,168.5Q433,160 480,160Q631,160 749,243.5Q867,327 920,460Q897,519 859.5,569.5Q822,620 772,658ZM792,904L624,738Q589,749 553.5,754.5Q518,760 480,760Q329,760 211,676.5Q93,593 40,460Q61,407 93,361.5Q125,316 166,280L56,168L112,112L848,848L792,904ZM222,336Q193,362 169,393Q145,424 128,460Q178,561 271.5,620.5Q365,680 480,680Q500,680 519,677.5Q538,675 558,672L522,634Q511,637 501,638.5Q491,640 480,640Q405,640 352.5,587.5Q300,535 300,460Q300,449 301.5,439Q303,429 306,418L222,336ZM541,429L541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429ZM390,504Q390,504 390,504Q390,504 390,504L390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Z"/>
 </vector>

app/src/main/res/layout/app_item_layout.xml

@@ -90,7 +90,7 @@
             android:text="@string/info"
             android:textAlignment="center"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-            android:textColor="#F3F3F3FF"
+            android:textColor="#E3F3F3F3"
             app:drawableTopCompat="@drawable/info_24px" />
 
         <TextView
@@ -104,7 +104,7 @@
             android:text="@string/uninstall"
             android:textAlignment="center"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-            android:textColor="#F3F3F3FF"
+            android:textColor="#E3F3F3F3"
             app:drawableTopCompat="@drawable/delete_24px" />
 
         <TextView
@@ -118,7 +118,7 @@
             android:text="@string/rename"
             android:textAlignment="center"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-            android:textColor="#F3F3F3FF"
+            android:textColor="#E3F3F3F3"
             app:drawableTopCompat="@drawable/edit_24px" />
 
         <TextView
@@ -132,7 +132,7 @@
             android:text="@string/hide"
             android:textAlignment="center"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-            android:textColor="#F3F3F3FF"
+            android:textColor="#E3F3F3F3"
             app:drawableTopCompat="@drawable/visibility_off_24px" />
 
         <TextView
@@ -146,7 +146,7 @@
             android:text="@string/close"
             android:textAlignment="center"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-            android:textColor="#F3F3F3FF"
+            android:textColor="#E3F3F3F3"
             app:drawableTopCompat="@drawable/close_24px" />
 
     </LinearLayout>