Added renaming to home screen apps

tanujnotes · Dec 10, 2020 · 8f01409 · 8f01409
1 parent 7b17abf
commit 8f01409
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 24 deletions.
diff --git a/app/src/main/java/app/olauncher/ui/AppDrawerAdapter.kt b/app/src/main/java/app/olauncher/ui/AppDrawerAdapter.kt
@@ -30,6 +30,7 @@ class AppDrawerAdapter(
         )
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        if (appFilteredList.size == 0) return
         val appModel = appFilteredList[holder.adapterPosition]
         holder.bind(flag, appLabelGravity, appModel, clickListener, appInfoListener)
 

diff --git a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
@@ -38,7 +38,11 @@ class AppDrawerFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val flag = arguments?.getInt("flag") ?: 0
+
+        val flag = arguments?.getInt("flag", 0) ?: 0
+        val rename = arguments?.getBoolean("rename", false) ?: false
+        if (rename) appRename.setOnClickListener { renameListener(flag) }
+
         val viewModel = activity?.run {
             ViewModelProvider(this).get(MainViewModel::class.java)
         } ?: throw Exception("Invalid Activity")
@@ -73,6 +77,8 @@ class AppDrawerFragment : Fragment() {
 
             override fun onQueryTextChange(newText: String?): Boolean {
                 appAdapter.filter.filter(newText?.trim())
+                if (rename && newText?.trim()?.isNotEmpty()!!) appRename.visibility = View.VISIBLE
+                else appRename.visibility = View.GONE
                 return false
             }
         })
@@ -172,6 +178,23 @@ class AppDrawerFragment : Fragment() {
             }
         }
 
+    private fun renameListener(flag: Int) {
+        val name = search.query.toString().trim()
+        if (name.isEmpty()) return
+
+        when (flag) {
+            Constants.FLAG_SET_HOME_APP_1 -> Prefs(requireContext()).appName1 = name
+            Constants.FLAG_SET_HOME_APP_2 -> Prefs(requireContext()).appName2 = name
+            Constants.FLAG_SET_HOME_APP_3 -> Prefs(requireContext()).appName3 = name
+            Constants.FLAG_SET_HOME_APP_4 -> Prefs(requireContext()).appName4 = name
+            Constants.FLAG_SET_HOME_APP_5 -> Prefs(requireContext()).appName5 = name
+            Constants.FLAG_SET_HOME_APP_6 -> Prefs(requireContext()).appName6 = name
+            Constants.FLAG_SET_HOME_APP_7 -> Prefs(requireContext()).appName7 = name
+            Constants.FLAG_SET_HOME_APP_8 -> Prefs(requireContext()).appName8 = name
+        }
+        findNavController().popBackStack()
+    }
+
     private fun getRecyclerViewOnScrollListener(): RecyclerView.OnScrollListener {
         return object : RecyclerView.OnScrollListener() {
 

diff --git a/app/src/main/java/app/olauncher/ui/HomeFragment.kt b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
@@ -105,14 +105,14 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
 
     override fun onLongClick(view: View): Boolean {
         when (view.id) {
-            R.id.homeApp1 -> showAppList(Constants.FLAG_SET_HOME_APP_1)
-            R.id.homeApp2 -> showAppList(Constants.FLAG_SET_HOME_APP_2)
-            R.id.homeApp3 -> showAppList(Constants.FLAG_SET_HOME_APP_3)
-            R.id.homeApp4 -> showAppList(Constants.FLAG_SET_HOME_APP_4)
-            R.id.homeApp5 -> showAppList(Constants.FLAG_SET_HOME_APP_5)
-            R.id.homeApp6 -> showAppList(Constants.FLAG_SET_HOME_APP_6)
-            R.id.homeApp7 -> showAppList(Constants.FLAG_SET_HOME_APP_7)
-            R.id.homeApp8 -> showAppList(Constants.FLAG_SET_HOME_APP_8)
+            R.id.homeApp1 -> showAppList(Constants.FLAG_SET_HOME_APP_1, prefs.appName1.isNotEmpty())
+            R.id.homeApp2 -> showAppList(Constants.FLAG_SET_HOME_APP_2, prefs.appName2.isNotEmpty())
+            R.id.homeApp3 -> showAppList(Constants.FLAG_SET_HOME_APP_3, prefs.appName3.isNotEmpty())
+            R.id.homeApp4 -> showAppList(Constants.FLAG_SET_HOME_APP_4, prefs.appName4.isNotEmpty())
+            R.id.homeApp5 -> showAppList(Constants.FLAG_SET_HOME_APP_5, prefs.appName5.isNotEmpty())
+            R.id.homeApp6 -> showAppList(Constants.FLAG_SET_HOME_APP_6, prefs.appName6.isNotEmpty())
+            R.id.homeApp7 -> showAppList(Constants.FLAG_SET_HOME_APP_7, prefs.appName7.isNotEmpty())
+            R.id.homeApp8 -> showAppList(Constants.FLAG_SET_HOME_APP_8, prefs.appName8.isNotEmpty())
         }
         return true
     }
@@ -278,12 +278,12 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
         }
     }
 
-    private fun showAppList(flag: Int) {
+    private fun showAppList(flag: Int, rename: Boolean = false) {
         viewModel.getAppList()
         try {
             findNavController().navigate(
                 R.id.action_mainFragment_to_appListFragment,
-                bundleOf("flag" to flag)
+                bundleOf("flag" to flag, "rename" to rename)
             )
         } catch (e: Exception) {
         }

diff --git a/app/src/main/res/layout/fragment_app_drawer.xml b/app/src/main/res/layout/fragment_app_drawer.xml
@@ -6,22 +6,42 @@
     android:animateLayoutChanges="true"
     android:background="@color/colorPrimaryInverseTrans10">
 
-    <androidx.appcompat.widget.SearchView
-        android:id="@+id/search"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="88dp"
-        android:gravity="end"
-        android:imeOptions="actionNone"
-        android:paddingHorizontal="8dp"
-        android:paddingVertical="0dp"
-        android:textCursorDrawable="@null"
-        app:closeIcon="@null"
-        app:iconifiedByDefault="false"
-        app:queryBackground="@null"
-        app:queryHint="__"
-        app:searchIcon="@null"
-        app:theme="@style/AppSearchText" />
+        android:orientation="horizontal">
+
+        <androidx.appcompat.widget.SearchView
+            android:id="@+id/search"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="end"
+            android:imeOptions="actionNone"
+            android:paddingHorizontal="8dp"
+            android:paddingVertical="0dp"
+            android:textCursorDrawable="@null"
+            app:closeIcon="@null"
+            app:iconifiedByDefault="false"
+            app:queryBackground="@null"
+            app:queryHint="__"
+            app:searchIcon="@null"
+            app:theme="@style/AppSearchText" />
+
+        <TextView
+            android:id="@+id/appRename"
+            style="@style/TextSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="24dp"
+            android:paddingVertical="@dimen/app_padding_vertical"
+            android:text="@string/rename"
+            android:textAllCaps="true"
+            android:visibility="gone" />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/appDrawerTip"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -49,4 +49,5 @@
     <string name="about_hint">Tip: About has answers to your questions.</string>
     <string name="rate_us_hint">Loving Olauncher? Please rate us 10 stars. *giggles*</string>
     <string name="status_bar">Show status bar</string>
+    <string name="rename">Rename</string>
 </resources>