Issue #43: Implement create new folder option from link create view AmrDeveloper 20 minutes ago

Author: AmrDeveloper

app/src/main/java/com/amrdeveloper/linkhub/ui/adapter/FolderArrayAdapter.kt

@@ -9,17 +9,15 @@ import com.amrdeveloper.linkhub.R
 import com.amrdeveloper.linkhub.data.Folder
 import com.amrdeveloper.linkhub.databinding.ListItemFolderBinding
 
-private const val layoutID = R.layout.list_item_folder
-
 class FolderArrayAdapter(
     context: Context,
-) : ArrayAdapter<Folder>(context, layoutID) {
+) : ArrayAdapter<Folder>(context, R.layout.list_item_folder) {
 
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        val view = convertView ?: LayoutInflater.from(context).inflate(layoutID, parent, false)
+        val view = convertView ?: LayoutInflater.from(context).inflate(R.layout.list_item_folder, parent, false)
         val binding = ListItemFolderBinding.bind(view)
         val folder = getItem(position)
-        if(folder != null) {
+        if (folder != null) {
             binding.folderNameTxt.text = folder.name
             binding.folderPinImg.visibility = if(folder.isPinned) View.VISIBLE else View.INVISIBLE
             binding.folderIconImg.setImageResource(folder.folderColor.drawableId)

app/src/main/java/com/amrdeveloper/linkhub/ui/folder/FolderFragment.kt

@@ -11,6 +11,7 @@ import androidx.navigation.fragment.navArgs
 import com.amrdeveloper.linkhub.R
 import com.amrdeveloper.linkhub.data.Folder
 import com.amrdeveloper.linkhub.databinding.FragmentFolderBinding
+import com.amrdeveloper.linkhub.util.CREATED_FOLDER_NAME_KEY
 import com.amrdeveloper.linkhub.util.UiPreferences
 import com.amrdeveloper.linkhub.util.showError
 import com.amrdeveloper.linkhub.util.showSnackBar
@@ -110,6 +111,7 @@ class FolderFragment : Fragment() {
         val folderColor = binding.folderColorSelector.getCurrentFolderColor()
         val folder = Folder(name, isPinned, folderColor = folderColor)
 
+        findNavController().previousBackStackEntry?.savedStateHandle?.set(CREATED_FOLDER_NAME_KEY, folder.name)
         folderViewModel.createNewFolder(folder)
     }
 

app/src/main/java/com/amrdeveloper/linkhub/ui/link/LinkFragment.kt

@@ -15,10 +15,14 @@ import com.amrdeveloper.linkhub.data.Link
 import com.amrdeveloper.linkhub.databinding.FragmentLinkBinding
 import com.amrdeveloper.linkhub.ui.adapter.FolderArrayAdapter
 import com.amrdeveloper.linkhub.ui.widget.PinnedLinksWidget
+import com.amrdeveloper.linkhub.util.CREATED_FOLDER_NAME_KEY
+import com.amrdeveloper.linkhub.util.CREATE_FOLDER_ID
+import com.amrdeveloper.linkhub.util.FOLDER_NONE_ID
 import com.amrdeveloper.linkhub.util.UiPreferences
 import com.amrdeveloper.linkhub.util.showError
 import com.amrdeveloper.linkhub.util.showSnackBar
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 import java.text.DateFormat
 import javax.inject.Inject
 
@@ -79,11 +83,11 @@ class LinkFragment : Fragment() {
             binding.linkPinnedSwitch.isChecked = currentLink.isPinned
             val linkCreatedStamp = if (currentLink.createdTime == 0L) System.currentTimeMillis() else currentLink.createdTime
             val formattedCreationDate = dateFormatter.format(linkCreatedStamp)
-            binding.linkCreatedStatus.text =getString(R.string.created_at)+" ${formattedCreationDate}"
+            binding.linkCreatedStatus.text = getString(R.string.created_at) + " ${formattedCreationDate}"
             if (currentLink.isUpdated) {
                 val linkUpdatedStamp = if (currentLink.createdTime == 0L) System.currentTimeMillis() else currentLink.lastUpdatedTime
                 val formattedUpdateDate = dateFormatter.format(linkUpdatedStamp)
-                binding.linkUpdatedStatus.text =getString(R.string.updated_at)+" ${formattedUpdateDate}"
+                binding.linkUpdatedStatus.text = getString(R.string.updated_at) + " ${formattedUpdateDate}"
             }
             if (currentLink.folderId != -1) linkViewModel.getFolderWithId(currentLink.folderId)
         }
@@ -95,8 +99,19 @@ class LinkFragment : Fragment() {
             linkFolderID = it.id
         }
 
-        linkViewModel.folderLiveData.observe(viewLifecycleOwner) {
-            folderMenuAdapter.addAll(it)
+        linkViewModel.folderLiveData.observe(viewLifecycleOwner) { folders ->
+            folderMenuAdapter.clear()
+            folderMenuAdapter.add(Folder(getString(R.string.folder_create), false, id = CREATE_FOLDER_ID))
+            folderMenuAdapter.add(Folder(getString(R.string.none), false, id = FOLDER_NONE_ID))
+            folderMenuAdapter.addAll(folders)
+            binding.folderNameMenu.text.clear()
+
+            // Check if user created a new folder for this link and suggest it as the current link folder
+            val newFolderCreatedName = findNavController().currentBackStackEntry?.savedStateHandle?.get<String>(CREATED_FOLDER_NAME_KEY) ?: return@observe
+            val lastCreatedFolder = folders.find { it.name == newFolderCreatedName } ?: return@observe
+            binding.folderNameMenu.setText(newFolderCreatedName, false)
+            linkFolderID = lastCreatedFolder.id
+            findNavController().currentBackStackEntry?.savedStateHandle?.remove<String>(CREATED_FOLDER_NAME_KEY)
         }
 
         linkViewModel.linkInfoLiveData.observe(viewLifecycleOwner) {
@@ -116,12 +131,20 @@ class LinkFragment : Fragment() {
 
     private fun setupFolderListMenu() {
         binding.folderNameMenu.setOnItemClickListener { _, _, position, _ ->
-            val folder = folderMenuAdapter.getItem(position)
-            if (folder != null) linkFolderID = folder.id
+            val folder = folderMenuAdapter.getItem(position) ?: return@setOnItemClickListener
+            linkFolderID = when (folder.id) {
+                CREATE_FOLDER_ID -> {
+                    binding.folderNameMenu.setSelection(position + 1)
+                    findNavController().navigate(R.id.action_linkFragment_to_folderFragment)
+                    FOLDER_NONE_ID
+                }
+                else -> {
+                    folder.id
+                }
+            }
         }
 
         folderMenuAdapter = FolderArrayAdapter(requireContext())
-        folderMenuAdapter.add(Folder(getString(R.string.none), false, id = -1))
         binding.folderNameMenu.setAdapter(folderMenuAdapter)
     }
 

app/src/main/java/com/amrdeveloper/linkhub/util/Constants.kt

@@ -8,4 +8,8 @@ const val REPOSITORY_CONTRIBUTORS_URL = "$REPOSITORY_URL/graphs/contributors"
 const val REPOSITORY_SPONSORSHIP_URL = "https://github.com/sponsors/AmrDeveloper"
 
 const val WIDGET_REFRESH_ACTION = "${packageName}.action.REFRESH"
-const val WIDGET_ITEM_CLICK_ACTION = "${packageName}.action.ITEM_CLICK"
+const val WIDGET_ITEM_CLICK_ACTION = "${packageName}.action.ITEM_CLICK"
+
+const val CREATED_FOLDER_NAME_KEY = "CREATED_FOLDER_NAME"
+const val FOLDER_NONE_ID = -1
+const val CREATE_FOLDER_ID = -2

app/src/main/res/navigation/nav_graph.xml

@@ -63,6 +63,10 @@
             android:defaultValue="@null"
             app:argType="com.amrdeveloper.linkhub.data.Link"
             app:nullable="true" />
+
+        <action
+            android:id="@+id/action_linkFragment_to_folderFragment"
+            app:destination="@id/folderFragment" />
     </fragment>
 
     <fragment