From 37c17f1fd8033ecd5e22074691515dc3af644a67 Mon Sep 17 00:00:00 2001
From: Abdul Wadood <abdulwd97@gmail.com>
Date: Wed, 11 Jul 2018 05:47:50 +0530
Subject: [PATCH] Update local database migrations

---
 .../kiwixmobile/data/local/KiwixDatabase.java | 107 ++++++++----------
 .../main/res/layout/item_bookmark_history.xml |  12 +-
 2 files changed, 54 insertions(+), 65 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java b/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
index 39e8368b7..671063c0a 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
@@ -80,68 +80,51 @@ public class KiwixDatabase extends SquidDatabase {
 
   @Override
   protected boolean onUpgrade(SQLiteDatabaseWrapper db, int oldVersion, int newVersion) {
-    if (newVersion >= 3 && oldVersion < 3) {
-      db.execSQL("DROP TABLE IF EXISTS recents");
-      tryCreateTable(RecentSearch.TABLE);
-    }
-    if (newVersion >= 3 && (oldVersion < 3 || oldVersion == 7 || oldVersion == 6)) {
-      db.execSQL("DROP TABLE IF EXISTS recents");
-      db.execSQL("DROP TABLE IF EXISTS recentsearches");
-      tryCreateTable(RecentSearch.TABLE);
-    }
-    if (newVersion >= 3) {
-      tryCreateTable(RecentSearch.TABLE);
-    }
-    if (newVersion >= 4) {
-      tryCreateTable(Bookmark.TABLE);
-    }
-    if (newVersion >= 5 && oldVersion < 5) {
-      db.execSQL("DROP TABLE IF EXISTS book");
-      tryCreateTable(BookDatabaseEntity.TABLE);
-    }
-    if (newVersion >= 5) {
-      tryCreateTable(BookDatabaseEntity.TABLE);
-    }
-    if (newVersion >= 6 && oldVersion < 6) {
-      db.execSQL("DROP TABLE IF EXISTS Bookmarks");
-      tryCreateTable(Bookmark.TABLE);
-      migrateBookmarksVersion6();
-    }
-    if (newVersion >= 6) {
-      tryCreateTable(Bookmark.TABLE);
-    }
-    if (newVersion >= 9) {
-      db.execSQL("DROP TABLE IF EXISTS book");
-      tryCreateTable(BookDatabaseEntity.TABLE);
-    }
-    if (newVersion >= 10) {
-      tryCreateTable(NetworkLanguageDatabaseEntity.TABLE);
-    }
-    if (newVersion >= 11 && oldVersion < 11) {
-      db.execSQL("DROP TABLE IF EXISTS recentSearches");
-      tryCreateTable(RecentSearch.TABLE);
-    }
-    if (newVersion >= 11) {
-      tryCreateTable(RecentSearch.TABLE);
-    }
-    if (newVersion >= 12) {
-      tryAddColumn(BookDatabaseEntity.REMOTE_URL);
-    }
-    if (newVersion >= 13) {
-      tryAddColumn(BookDatabaseEntity.NAME);
-      tryAddColumn(Bookmark.ZIM_NAME);
-    }
-    if (newVersion >= 14 && oldVersion < 14) {
-      tryDropTable(BookDatabaseEntity.TABLE);
-      tryCreateTable(BookDatabaseEntity.TABLE);
-    }
-    if (newVersion >= 15 && oldVersion < 15) {
-      tryCreateTable(History.TABLE);
-    }
-    if (newVersion >= 16 && oldVersion < 16) {
-      tryAddColumn(Bookmark.ZIM_FILE_PATH);
-      tryAddColumn(Bookmark.FAVICON);
-      migrateBookmarksVersion16();
+    switch (oldVersion) {
+      case 1:
+      case 2:
+        db.execSQL("DROP TABLE IF EXISTS recents");
+        db.execSQL("DROP TABLE IF EXISTS recentsearches");
+        tryCreateTable(RecentSearch.TABLE);
+      case 3:
+        tryCreateTable(Bookmark.TABLE);
+      case 4:
+        db.execSQL("DROP TABLE IF EXISTS book");
+        tryCreateTable(BookDatabaseEntity.TABLE);
+      case 5:
+        db.execSQL("DROP TABLE IF EXISTS Bookmarks");
+        tryCreateTable(Bookmark.TABLE);
+        migrateBookmarksVersion6();
+      case 6:
+        db.execSQL("DROP TABLE IF EXISTS recents");
+        db.execSQL("DROP TABLE IF EXISTS recentsearches");
+        tryCreateTable(RecentSearch.TABLE);
+      case 7:
+        db.execSQL("DROP TABLE IF EXISTS recents");
+        db.execSQL("DROP TABLE IF EXISTS recentsearches");
+        tryCreateTable(RecentSearch.TABLE);
+      case 8:
+        db.execSQL("DROP TABLE IF EXISTS book");
+        tryCreateTable(BookDatabaseEntity.TABLE);
+      case 9:
+        tryCreateTable(NetworkLanguageDatabaseEntity.TABLE);
+      case 10:
+        db.execSQL("DROP TABLE IF EXISTS recentSearches");
+        tryCreateTable(RecentSearch.TABLE);
+      case 11:
+        tryAddColumn(BookDatabaseEntity.REMOTE_URL);
+      case 12:
+        tryAddColumn(BookDatabaseEntity.NAME);
+        tryAddColumn(Bookmark.ZIM_NAME);
+      case 13:
+        tryDropTable(BookDatabaseEntity.TABLE);
+        tryCreateTable(BookDatabaseEntity.TABLE);
+      case 14:
+        tryCreateTable(History.TABLE);
+      case 15:
+        tryAddColumn(Bookmark.ZIM_FILE_PATH);
+        tryAddColumn(Bookmark.FAVICON);
+        migrateBookmarksVersion16();
     }
     return true;
   }
diff --git a/app/src/main/res/layout/item_bookmark_history.xml b/app/src/main/res/layout/item_bookmark_history.xml
index 55eb7af2b..9b4b56161 100644
--- a/app/src/main/res/layout/item_bookmark_history.xml
+++ b/app/src/main/res/layout/item_bookmark_history.xml
@@ -3,29 +3,35 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="64dp">
+  android:layout_height="wrap_content">
 
   <ImageView
     android:id="@+id/favicon"
     android:layout_width="40dp"
     android:layout_height="40dp"
+    android:layout_marginBottom="8dp"
     android:layout_marginEnd="@dimen/activity_horizontal_margin"
     android:layout_marginStart="@dimen/activity_horizontal_margin"
+    android:layout_marginTop="8dp"
     android:contentDescription="@string/favicon"
     app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toStartOf="@id/title"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     tools:src="@mipmap/kiwix_icon_round" />
 
   <TextView
     android:id="@+id/title"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginEnd="@dimen/activity_horizontal_margin"
-    android:layout_marginStart="@dimen/activity_horizontal_margin"
+    android:layout_marginRight="@dimen/activity_horizontal_margin"
     android:alpha="0.87"
+    android:paddingBottom="8dp"
+    android:paddingTop="8dp"
     android:textAppearance="?android:attr/textAppearanceMedium"
     app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toEndOf="@id/favicon"
     app:layout_constraintTop_toTopOf="parent"
     tools:text="Wikipedia - Main Page" />