Removed character scrolling in the app drawer

13 files changed, 8 insertions, 406 deletions

diff --git a/app/src/main/java/app/olauncher/MainViewModel.kt b/app/src/main/java/app/olauncher/MainViewModel.kt
index 155f3e4..a06a35e 100644
--- a/app/src/main/java/app/olauncher/MainViewModel.kt
+++ b/app/src/main/java/app/olauncher/MainViewModel.kt
@@ -16,8 +16,6 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import app.olauncher.data.AppModel
 import app.olauncher.data.Constants
-import app.olauncher.data.Constants.CharacterIndicator
-import app.olauncher.data.DrawerCharacterModel
 import app.olauncher.data.Prefs
 import app.olauncher.helper.SingleLiveEvent
 import app.olauncher.helper.WallpaperWorker
@@ -36,7 +34,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     val toggleDateTime = MutableLiveData<Unit>()
     val updateSwipeApps = MutableLiveData<Any>()
     val appList = MutableLiveData<List<AppModel>?>()
-    val drawerCharacterList = MutableLiveData<List<DrawerCharacterModel>>()
     val hiddenApps = MutableLiveData<List<AppModel>?>()
     val isOlauncherDefault = MutableLiveData<Boolean>()
     val launcherResetFailed = MutableLiveData<Boolean>()
@@ -246,26 +243,4 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         prefs.homeAlignment = gravity
         homeAppAlignment.value = prefs.homeAlignment
     }
-
-    fun updateDrawerCharacterList(characters:List<DrawerCharacterModel>){
-        drawerCharacterList.value = characters
-    }
-
-    fun updateRangeDrawerCharacterList(char:String){
-        val charRegex = Regex("[0-9\\\\$&+,:;=?@#|/'<>.^*()%!-]")
-        val characters = drawerCharacterList.value ?: emptyList()
-        if (characters.isNotEmpty()){
-            val checkAndReplaceIfNum = if (charRegex.matches(char)) "#" else char
-
-            val updatedCharacters =
-                characters.map {
-                    DrawerCharacterModel(
-                        it.character,
-                        it.character.equals(checkAndReplaceIfNum, true)
-                    )
-                }
-
-            drawerCharacterList.value = updatedCharacters
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/olauncher/ui/AppDrawerAdapter.kt b/app/src/main/java/app/olauncher/ui/AppDrawerAdapter.kt
index d9bfacd..76a0ebf 100644
--- a/app/src/main/java/app/olauncher/ui/AppDrawerAdapter.kt
+++ b/app/src/main/java/app/olauncher/ui/AppDrawerAdapter.kt
@@ -26,7 +26,6 @@ import java.text.Normalizer
 
 class AppDrawerAdapter(
     private var flag: Int,
-    private val appFilterHelper: AppFilterHelper,
     private val appLabelGravity: Int,
     private val appClickListener: (AppModel) -> Unit,
     private val appInfoListener: (AppModel) -> Unit,
@@ -101,7 +100,6 @@ class AppDrawerAdapter(
                 results?.values?.let {
                     val items = it as MutableList<AppModel>
                     appFilteredList = items
-                    appFilterHelper.onAppFiltered(items.toList())
                     submitList(appFilteredList) {
                         autoLaunch()
                     }
diff --git a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
index 8a1a82e..cd8e30f 100644
--- a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
@@ -1,33 +1,23 @@
 package app.olauncher.ui
 
-import android.content.res.Configuration.ORIENTATION_PORTRAIT
 import android.os.Bundle
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AnimationUtils
-import android.widget.FrameLayout
-import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.widget.SearchView
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.Recycler
 import app.olauncher.MainViewModel
 import app.olauncher.R
-import app.olauncher.data.AppModel
 import app.olauncher.data.Constants
-import app.olauncher.data.Constants.CharacterIndicator
-import app.olauncher.data.DrawerCharacterModel
 import app.olauncher.data.Prefs
 import app.olauncher.databinding.FragmentAppDrawerBinding
-import app.olauncher.helper.AppFilterHelper
 import app.olauncher.helper.hideKeyboard
 import app.olauncher.helper.isEinkDisplay
 import app.olauncher.helper.isSystemApp
@@ -38,8 +28,6 @@ import app.olauncher.helper.searchOnPlayStore
 import app.olauncher.helper.showKeyboard
 import app.olauncher.helper.showToast
 import app.olauncher.helper.uninstall
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 
 
 class AppDrawerFragment : Fragment() {
@@ -47,7 +35,6 @@ class AppDrawerFragment : Fragment() {
     private lateinit var prefs: Prefs
     private lateinit var adapter: AppDrawerAdapter
     private lateinit var linearLayoutManager: LinearLayoutManager
-    private lateinit var drawerCharacterAdapter: DrawerCharacterAdapter
 
     private var flag = Constants.FLAG_LAUNCH_APP
     private var canRename = false
@@ -79,67 +66,7 @@ class AppDrawerFragment : Fragment() {
         initClickListeners()
     }
 
-    private fun setAppDrawerPortraitMargins(center: Boolean) {
-        val centerValue = if (center) 5 else 48
-
-        val rv = binding.recyclerView
-        val params = rv.layoutParams as FrameLayout.LayoutParams
-        val scale = resources.displayMetrics.density
-        val marginTop = (180 * scale).toInt()
-        val marginBottom = (24 * scale).toInt()
-        val marginRight = if (prefs.autoShowKeyboard) 0 else (centerValue * scale).toInt()
-        params.setMargins(0, marginTop, marginRight, marginBottom)
-        rv.layoutParams = params
-    }
-
-    private fun setAppDrawerLandMargins() {
-        val rv = binding.recyclerView
-        val params = rv.layoutParams as FrameLayout.LayoutParams
-        val scale = resources.displayMetrics.density
-        val marginTop = (80 * scale).toInt()
-        val marginBottom = 0
-        val marginRight = (56 * scale).toInt()
-        val marginLeft = (56 * scale).toInt()
-        params.setMargins(marginLeft, marginTop, marginRight, marginBottom)
-        rv.layoutParams = params
-    }
-
-    private fun setIndicatorMargins(x: Float, y: Float, isLast: Boolean, isFirst: Boolean) {
-        val indicator = binding.characterIndicator
-        val params = indicator.layoutParams as LinearLayout.LayoutParams
-        val scale = resources.displayMetrics.density
-        val marginTop = y.toInt() - 80
-        val marginRight = (8 * scale).toInt()
-        val marginLeft = x.toInt()
-        val marginBottom = 0
-        params.setMargins(marginLeft, marginTop, marginRight, marginBottom)
-        indicator.layoutParams = params
-    }
-
-
-    private fun setIndicatorLayoutLandMargins() {
-        val indicatorLayout = binding.indicatorLayout
-        val params = indicatorLayout.layoutParams as FrameLayout.LayoutParams
-        val scale = resources.displayMetrics.density
-        val marginTop = (6 * scale).toInt()
-        val marginRight = 0
-        val marginLeft = 0
-        val marginBottom = (6 * scale).toInt()
-        params.setMargins(marginLeft, marginTop, marginRight, marginBottom)
-        indicatorLayout.layoutParams = params
-    }
-
-
     private fun initViews() {
-        binding.characterRecyclerView.isVisible = prefs.autoShowKeyboard.not()
-
-        if (requireContext().resources.configuration.orientation == ORIENTATION_PORTRAIT) {
-            setAppDrawerPortraitMargins(prefs.appLabelAlignment == Gravity.CENTER)
-        } else {
-            setAppDrawerLandMargins()
-            setIndicatorLayoutLandMargins()
-        }
-
         if (flag == Constants.FLAG_HIDDEN_APPS)
             binding.search.queryHint = getString(R.string.hidden_apps)
         else if (flag in Constants.FLAG_SET_HOME_APP_1..Constants.FLAG_SET_CALENDAR_APP)
@@ -179,17 +106,8 @@ class AppDrawerFragment : Fragment() {
     }
 
     private fun initAdapter() {
-
-        val appFilterHelper = object : AppFilterHelper {
-            override fun onAppFiltered(items: List<AppModel>) {
-                submitDrawerCharacters(items)
-            }
-        }
-        drawerCharacterAdapter = DrawerCharacterAdapter()
-
         adapter = AppDrawerAdapter(
             flag,
-            appFilterHelper,
             prefs.appLabelAlignment,
             appClickListener = {
                 if (it.appPackage.isEmpty())
@@ -260,40 +178,6 @@ class AppDrawerFragment : Fragment() {
                 return scrollRange
             }
         }
-        binding.characterRecyclerView.addOnItemTouchListener(
-            DrawerCharacterAdapter.CharacterTouchListener(drawerCharacterAdapter) { char, mode, pos ->
-
-                if (mode != CharacterIndicator.HIDE) {
-                    binding.characterIndicator.apply {
-                        setIndicatorMargins(
-                            pos.first,
-                            pos.second,
-                            char.equals("Z", true),
-                            char.equals("A", true)
-                        )
-                        text = char
-                        isVisible = true
-                    }
-                    viewModel.updateRangeDrawerCharacterList(char)
-                    val matchIndex = try {
-                        val match = adapter.currentList.find {
-                            char.equals(it.appLabel.first().toString(), true)
-                        }
-                        adapter.currentList.indexOf(match)
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                        0
-                    }
-                    linearLayoutManager.scrollToPositionWithOffset(matchIndex, 0)
-                }
-
-                if (mode == CharacterIndicator.HIDE) {
-                    lifecycleScope.launch {
-                        delay(300L)
-                        binding.characterIndicator.isVisible = false
-                    }
-                }
-            })
 
         binding.recyclerView.layoutManager = linearLayoutManager
         binding.recyclerView.adapter = adapter
@@ -302,8 +186,6 @@ class AppDrawerFragment : Fragment() {
         if (requireContext().isEinkDisplay().not())
             binding.recyclerView.layoutAnimation =
                 AnimationUtils.loadLayoutAnimation(requireContext(), R.anim.layout_anim_from_bottom)
-        binding.characterRecyclerView.adapter = drawerCharacterAdapter
-        binding.characterRecyclerView.itemAnimator = null
     }
 
     private fun initObservers() {
@@ -317,7 +199,6 @@ class AppDrawerFragment : Fragment() {
             viewModel.hiddenApps.observe(viewLifecycleOwner) {
                 it?.let {
                     adapter.setAppList(it.toMutableList())
-                    submitDrawerCharacters(it)
                 }
             }
         } else {
@@ -325,14 +206,9 @@ class AppDrawerFragment : Fragment() {
                 it?.let { appModels ->
                     adapter.setAppList(appModels.toMutableList())
                     adapter.filter.filter(binding.search.query)
-                    submitDrawerCharacters(appModels)
                 }
             }
         }
-
-        viewModel.drawerCharacterList.observe(viewLifecycleOwner) { characters ->
-            drawerCharacterAdapter.submitList(characters)
-        }
     }
 
     private fun initClickListeners() {
@@ -389,16 +265,6 @@ class AppDrawerFragment : Fragment() {
                     }
                 }
             }
-
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                super.onScrolled(recyclerView, dx, dy)
-                if (linearLayoutManager.itemCount == 0)
-                    return
-                val visiblePosition = linearLayoutManager.findFirstVisibleItemPosition()
-                val position = if (visiblePosition >= 0) visiblePosition else 0
-                val item = adapter.currentList[position]
-                viewModel.updateRangeDrawerCharacterList(item.appLabel.first().toString())
-            }
         }
     }
 
@@ -408,41 +274,6 @@ class AppDrawerFragment : Fragment() {
             viewModel.checkForMessages.call()
     }
 
-    private fun submitDrawerCharacters(drawerItems: List<AppModel>) {
-        if (drawerItems.isEmpty()) {
-            viewModel.updateDrawerCharacterList(emptyList())
-            return
-        }
-
-
-        val charRegex = Regex("[0-9\\\\$&+,:;=?@#|/'<>.^*()%!-]")
-        val emojiRegex = Regex("\\p{So}+")
-        val emojiRegex2 = Regex("[\uD800-\uDBFF\uDC00-\uDFFF]+")
-
-        val firstVisibleItemPosition =
-            linearLayoutManager.findFirstCompletelyVisibleItemPosition()
-
-        val position =
-            if (firstVisibleItemPosition >= 0) firstVisibleItemPosition else 0
-        val firstVisibleItem = if (position < drawerItems.size) drawerItems[position] else null
-
-        val drawerCharacters =
-            drawerItems.filter { it.appLabel.isNotEmpty() }.map { char ->
-                val firstLetter = char.appLabel.first().toString()
-                val regexMatch = charRegex.matches(firstLetter) || emojiRegex.matches(
-                    char.appLabel.first().toString()
-                ) || emojiRegex2.matches(char.appLabel.first().toString())
-
-                if (regexMatch) "#" else firstLetter.uppercase()
-            }.toSet()
-                .map { str ->
-                    DrawerCharacterModel(str, str.equals(firstVisibleItem?.appLabel?.first().toString(), true))
-                }
-
-        viewModel.updateDrawerCharacterList(drawerCharacters)
-    }
-
-
     override fun onStart() {
         super.onStart()
         binding.search.showKeyboard(prefs.autoShowKeyboard)
diff --git a/app/src/main/java/app/olauncher/ui/DrawerCharacterAdapter.kt b/app/src/main/java/app/olauncher/ui/DrawerCharacterAdapter.kt
deleted file mode 100644
index f589adb..0000000
--- a/app/src/main/java/app/olauncher/ui/DrawerCharacterAdapter.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package app.olauncher.ui
-
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener
-import app.olauncher.R
-import app.olauncher.data.Constants.CharacterIndicator
-import app.olauncher.data.DrawerCharacterModel
-import app.olauncher.databinding.DrawerAlphabetBinding
-import app.olauncher.helper.getColorFromAttr
-
-class DrawerCharacterAdapter : ListAdapter<DrawerCharacterModel, DrawerCharacterAdapter.ViewHolder>(diffObject) {
-    inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        private val binding = DrawerAlphabetBinding.bind(view)
-        fun bind(character: DrawerCharacterModel) {
-
-            val textColor = if (character.inRange)
-                itemView.context.getColor(R.color.colorAccent)
-            else
-                itemView.context.getColorFromAttr(R.attr.primaryColor)
-            binding.character.setTextColor(textColor)
-            binding.character.text = character.character
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
-        ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.drawer_alphabet, parent, false))
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) = holder.bind(getItem(position))
-
-    companion object {
-        val diffObject = object : DiffUtil.ItemCallback<DrawerCharacterModel>() {
-            override fun areItemsTheSame(
-                oldItem: DrawerCharacterModel,
-                newItem: DrawerCharacterModel,
-            ): Boolean = oldItem.character == newItem.character
-
-            override fun areContentsTheSame(
-                oldItem: DrawerCharacterModel,
-                newItem: DrawerCharacterModel,
-            ): Boolean = oldItem.hashCode() == newItem.hashCode()
-        }
-    }
-
-    class CharacterTouchListener(
-        private val adapter: DrawerCharacterAdapter,
-        private val clickListener: ((String, Int, Pair<Float, Float>) -> Unit)?,
-    ) : OnItemTouchListener {
-
-        override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
-            updateIndicatorView(rv, e)
-            return true
-        }
-
-        override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) = updateIndicatorView(rv, e)
-
-        override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) = Unit
-
-        private fun updateIndicatorView(rv: RecyclerView, e: MotionEvent) {
-            val child = rv.findChildViewUnder(e.x, e.y)
-            child?.let {
-                val view = rv.getChildViewHolder(child).itemView
-                val itemPosition = rv.getChildAdapterPosition(child)
-
-                clickListener?.let {
-                    it(
-                        adapter.currentList[itemPosition].character,
-                        CharacterIndicator.SHOW,
-                        Pair(view.x, view.y)
-                    )
-                }
-                if (e.action == MotionEvent.ACTION_UP)
-                    clickListener?.let { it("", CharacterIndicator.HIDE, Pair(e.x, e.y)) }
-            } ?: clickListener?.let { it("", CharacterIndicator.HIDE, Pair(e.x, e.y)) }
-        }
-    }
-}
-
diff --git a/app/src/main/res/drawable/rounded_rect_shade_color.xml b/app/src/main/res/drawable/rounded_rect_shade_color.xml
index b3274c4..aed3918 100644
--- a/app/src/main/res/drawable/rounded_rect_shade_color.xml
+++ b/app/src/main/res/drawable/rounded_rect_shade_color.xml
@@ -4,6 +4,6 @@
     <solid android:color="?attr/primaryShadeDarkColor" />
     <corners android:radius="24dp" />
     <stroke
-        android:width="0.6dp"
+        android:width="0.5dp"
         android:color="?attr/primaryColorTrans50" />
 </shape>
diff --git a/app/src/main/res/layout-land/drawer_alphabet.xml b/app/src/main/res/layout-land/drawer_alphabet.xml
deleted file mode 100644
index a40caca..0000000
--- a/app/src/main/res/layout-land/drawer_alphabet.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/character"
-        style="@style/TextSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:autoSizeMinTextSize="12sp"
-        android:includeFontPadding="false"
-        android:maxLines="1"
-        android:paddingVertical="2.5dp"
-        android:paddingStart="24dp"
-        android:paddingEnd="56dp"
-        android:textAlignment="center"
-        android:textSize="13sp"
-        tools:targetApi="o"
-        tools:text="W" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_app_drawer.xml b/app/src/main/res/layout-land/fragment_app_drawer.xml
index 8d29128..c15bbb1 100644
--- a/app/src/main/res/layout-land/fragment_app_drawer.xml
+++ b/app/src/main/res/layout-land/fragment_app_drawer.xml
@@ -75,40 +75,4 @@
         android:requiresFadingEdge="vertical"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-    <LinearLayout
-        android:id="@+id/indicatorLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|end"
-        android:alpha="0.8"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-
-        <TextView
-            android:id="@+id/characterIndicator"
-            style="@style/TextLarge"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:background="@drawable/bg_shade_circular"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:maxLines="1"
-            android:textAlignment="center"
-            android:visibility="invisible"
-            tools:text="W"
-            tools:visibility="visible" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/character_recycler_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:fadingEdgeLength="24dp"
-            android:paddingVertical="36dp"
-            android:requiresFadingEdge="vertical"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:itemCount="26"
-            tools:listitem="@layout/drawer_alphabet" />
-    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_settings.xml b/app/src/main/res/layout-land/fragment_settings.xml
index 0f51313..9e00ebc 100644
--- a/app/src/main/res/layout-land/fragment_settings.xml
+++ b/app/src/main/res/layout-land/fragment_settings.xml
@@ -4,14 +4,14 @@
     android:id="@+id/mainActivityLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:animateLayoutChanges="true">
+    android:animateLayoutChanges="true"
+    android:background="?attr/primaryShadeDarkColor">
 
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:animateLayoutChanges="true"
-        android:background="?attr/primaryShadeDarkColor"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:fadingEdgeLength="24dp"
diff --git a/app/src/main/res/layout/adapter_app_drawer.xml b/app/src/main/res/layout/adapter_app_drawer.xml
index 5549104..92cf344 100644
--- a/app/src/main/res/layout/adapter_app_drawer.xml
+++ b/app/src/main/res/layout/adapter_app_drawer.xml
@@ -31,12 +31,14 @@
         android:id="@+id/appHideLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginVertical="1dp"
         android:animateLayoutChanges="true"
+        android:background="?attr/primaryShadeDarkColor"
         android:clickable="true"
         android:focusable="true"
         android:gravity="end|center_vertical"
         android:visibility="gone"
-        tools:visibility="gone">
+        tools:visibility="visible">
 
         <TextView
             android:id="@+id/appDelete"
diff --git a/app/src/main/res/layout/drawer_alphabet.xml b/app/src/main/res/layout/drawer_alphabet.xml
deleted file mode 100644
index 912e7bb..0000000
--- a/app/src/main/res/layout/drawer_alphabet.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/character"
-        style="@style/TextSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:autoSizeMinTextSize="12sp"
-        android:includeFontPadding="false"
-        android:maxLines="1"
-        android:paddingVertical="2.5dp"
-        android:paddingStart="20dp"
-        android:paddingEnd="16dp"
-        android:textAlignment="center"
-        android:textSize="13sp"
-        tools:targetApi="o"
-        tools:text="W" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_app_drawer.xml b/app/src/main/res/layout/fragment_app_drawer.xml
index c6cc2fb..91d0484 100644
--- a/app/src/main/res/layout/fragment_app_drawer.xml
+++ b/app/src/main/res/layout/fragment_app_drawer.xml
@@ -74,41 +74,4 @@
         android:fadingEdgeLength="24dp"
         android:requiresFadingEdge="vertical" />
 
-    <LinearLayout
-        android:id="@+id/indicatorLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|end"
-        android:alpha="0.8"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-
-        <TextView
-            android:id="@+id/characterIndicator"
-            style="@style/TextLarge"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:background="@drawable/bg_shade_circular"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:maxLines="1"
-            android:textAlignment="center"
-            android:visibility="invisible"
-            tools:text="W"
-            tools:visibility="visible" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/character_recycler_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:fadingEdgeLength="24dp"
-            android:paddingVertical="36dp"
-            android:requiresFadingEdge="vertical"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:itemCount="26"
-            tools:listitem="@layout/drawer_alphabet" />
-    </LinearLayout>
-
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index f4d4142..6f292f2 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
-    android:background="?attr/primaryColorInverseTrans50">
+    android:background="?attr/primaryShadeDarkColor">
 
     <ScrollView
         android:id="@+id/scrollView"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76c6d65..76f012a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -136,7 +136,7 @@
     <string name="adapter_show">Show</string>
     <string name="adapter_hide">Hide</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Are you using your phone, or is your phone using you?</string>
-    <string name="about_olauncher">About Olauncher</string>
+    <string name="about_olauncher">About and FAQs</string>
     <string name="digital_wellbeing">Digital Wellbeing</string>
     <string name="learn_more">Learn more</string>
     <string name="did_you_know">Did you know?</string>