Fixes (#44)

- Add Fix for API 26-30 Dynamic Color
- Add Fix for Back Press in WebView
- Add Database Migration

Author: smashedr

app/src/main/java/com/djangofiles/djangofiles/db/ServerDao.kt

@@ -11,6 +11,8 @@ import androidx.room.Query
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.Upsert
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 
 
 @Dao
@@ -61,13 +63,25 @@ abstract class ServerDatabase : RoomDatabase() {
         @Volatile
         private var instance: ServerDatabase? = null
 
+        private val MIGRATION_1_2 = object : Migration(1, 2) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("ALTER TABLE Server ADD COLUMN size INTEGER")
+                database.execSQL("ALTER TABLE Server ADD COLUMN count INTEGER")
+                database.execSQL("ALTER TABLE Server ADD COLUMN shorts INTEGER")
+                database.execSQL("ALTER TABLE Server ADD COLUMN humanSize TEXT")
+            }
+        }
+
         fun getInstance(context: Context): ServerDatabase =
             instance ?: synchronized(this) {
                 instance ?: Room.databaseBuilder(
                     context.applicationContext,
                     ServerDatabase::class.java,
                     "server-database"
-                ).build().also { instance = it }
+                )
+                    //.fallbackToDestructiveMigration(true) // Destructive Operation
+                    .addMigrations(MIGRATION_1_2)
+                    .build().also { instance = it }
             }
     }
 }

app/src/main/java/com/djangofiles/djangofiles/ui/home/HomeFragment.kt

@@ -13,6 +13,7 @@ import android.view.ViewGroup
 import android.webkit.CookieManager
 import android.webkit.JavascriptInterface
 import android.webkit.ValueCallback
+import android.webkit.WebBackForwardList
 import android.webkit.WebChromeClient
 import android.webkit.WebResourceError
 import android.webkit.WebResourceRequest
@@ -135,9 +136,16 @@ class HomeFragment : Fragment() {
 
         val callback = object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-                if (binding.webView.canGoBack()) {
+                val mWebBackForwardList: WebBackForwardList = binding.webView.copyBackForwardList()
+                val historyUrl: String? =
+                    mWebBackForwardList.getItemAtIndex(mWebBackForwardList.currentIndex - 1)?.url
+                Log.d("Home[OnBackPressedCallback]", "historyUrl: $historyUrl")
+                Log.d("Home[OnBackPressedCallback]", "currentUrl: $currentUrl")
+                if (binding.webView.canGoBack() && historyUrl?.startsWith(currentUrl) == true) {
+                    Log.d("Home[OnBackPressedCallback]", "binding.webView.goBack")
                     binding.webView.goBack()
                 } else {
+                    Log.d("Home[OnBackPressedCallback]", "onBackPressedDispatcher.onBackPressed")
                     isEnabled = false
                     requireActivity().onBackPressedDispatcher.onBackPressed()
 

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@android:color/transparent" />
-    <stroke android:width="3dp" android:color="@color/material_dynamic_primary80" />
+    <stroke android:width="3dp" android:color="@color/selected_border" />
     <corners android:radius="4dp" />
 </shape>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@android:color/transparent" />
-    <stroke android:width="2dp" android:color="@color/material_dynamic_primary80" />
+    <stroke android:width="2dp" android:color="@color/selected_border" />
     <corners android:radius="6dp" />
 </shape>

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

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
@@ -19,7 +21,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/drawer_menu" />
 </androidx.drawerlayout.widget.DrawerLayout>

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

@@ -15,7 +15,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="10dp"
         android:columnCount="2">
 
         <ImageView

app/src/main/res/values/colors.xml

@@ -4,4 +4,6 @@
 
     <color name="header_start">#7D81D1</color>
     <color name="header_end">#A4A7E0</color>
+
+    <color name="selected_border">#87b3f4</color>
 </resources>