From 6ff3eb2e2a6a7b94a4f350380fd0e5456d28d074 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Mon, 11 Oct 2021 11:47:12 +0530
Subject: [PATCH] Fixed backups not visible

---
 .../retromusic/fragments/backup/BackupFragment.kt |  9 ++++-----
 .../fragments/backup/BackupViewModel.kt           | 15 ++++++---------
 .../name/monkey/retromusic/helper/BackupHelper.kt |  2 +-
 app/src/main/res/layout/fragment_backup.xml       |  8 +++-----
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
index 72235172..9098f244 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
@@ -58,11 +58,10 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC
     }
 
     private fun checkIsEmpty() {
-        binding.emptyText.setText(R.string.no_backups_found)
-        (backupAdapter!!.itemCount == 0).run {
-            binding.empty.isVisible = this
-            binding.backupTitle.isVisible = this
-        }
+        val isEmpty = backupAdapter!!.itemCount == 0
+        binding.empty.isVisible = isEmpty
+        binding.backupTitle.isVisible = !isEmpty
+        binding.backupRecyclerview.isVisible = !isEmpty
     }
 
     fun setupRecyclerview() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt
index 0a557ff5..d2194749 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt
@@ -2,12 +2,11 @@ package code.name.monkey.retromusic.fragments.backup
 
 import android.app.Activity
 import android.content.Intent
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import code.name.monkey.retromusic.helper.BackupHelper
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
 import kotlin.system.exitProcess
@@ -15,15 +14,13 @@ import kotlin.system.exitProcess
 
 class BackupViewModel : ViewModel() {
     private val backupsMutableLiveData = MutableLiveData<List<File>>()
-    val backupsLiveData = backupsMutableLiveData
+    val backupsLiveData: LiveData<List<File>> = backupsMutableLiveData
 
     fun loadBackups() {
-        viewModelScope.launch {
-            File(BackupHelper.backupRootPath).listFiles { file, _ ->
-                return@listFiles file.extension == BackupHelper.BACKUP_EXTENSION
-            }?.toList()?.let {
-                backupsMutableLiveData.value = it
-            }
+        File(BackupHelper.backupRootPath).listFiles { _, name ->
+            return@listFiles name.endsWith(BackupHelper.BACKUP_EXTENSION)
+        }?.toList()?.let {
+            backupsMutableLiveData.value = it
         }
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt
index b2712afc..82f18a22 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt
@@ -123,7 +123,7 @@ object BackupHelper {
 
     val backupRootPath =
         Environment.getExternalStorageDirectory().toString() + "/RetroMusic/Backups/"
-    const val BACKUP_EXTENSION = "zip"
+    const val BACKUP_EXTENSION = "rmbak"
     private const val APPEND_EXTENSION = ".$BACKUP_EXTENSION"
     private const val DATABASES_PATH = "databases"
     private const val SETTINGS_PATH = "prefs"
diff --git a/app/src/main/res/layout/fragment_backup.xml b/app/src/main/res/layout/fragment_backup.xml
index 33ded993..c24a3399 100644
--- a/app/src/main/res/layout/fragment_backup.xml
+++ b/app/src/main/res/layout/fragment_backup.xml
@@ -55,9 +55,8 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/backup_recyclerview"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/backup_title" />
@@ -66,14 +65,13 @@
         android:id="@android:id/empty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:gravity="center"
         android:orientation="vertical"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/create_backup"
         tools:visibility="visible">
 
         <com.google.android.material.textview.MaterialTextView
@@ -89,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/empty"
+            android:text="@string/no_backups_found"
             android:textAppearance="@style/TextViewHeadline5"
             android:textColor="?android:attr/textColorSecondary"
             tools:visibility="visible" />