From 49e376e2ec15c04af63581b0a3519f50e4d4024d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 18 May 2018 12:16:22 +0200
Subject: [PATCH] renaming GalleryDataBase to GalleryDatabase

---
 .../gallery/activities/MainActivity.kt              |  4 ++--
 .../{GalleryDataBase.kt => GalleryDatabase.kt}      | 10 +++++-----
 .../simplemobiletools/gallery/extensions/Context.kt |  4 ++--
 .../res/drawable-v26/ic_launcher_foreground.xml     | 13 -------------
 4 files changed, 9 insertions(+), 22 deletions(-)
 rename app/src/main/kotlin/com/simplemobiletools/gallery/databases/{GalleryDataBase.kt => GalleryDatabase.kt} (79%)
 delete mode 100644 app/src/main/res/drawable-v26/ic_launcher_foreground.xml

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 39a4d24de..1f3ad621f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -26,7 +26,7 @@ import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.gallery.BuildConfig
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.adapters.DirectoryAdapter
-import com.simplemobiletools.gallery.databases.GalleryDataBase
+import com.simplemobiletools.gallery.databases.GalleryDatabase
 import com.simplemobiletools.gallery.dialogs.ChangeSortingDialog
 import com.simplemobiletools.gallery.dialogs.FilterMediaDialog
 import com.simplemobiletools.gallery.extensions.*
@@ -191,7 +191,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         mTempShowHiddenHandler.removeCallbacksAndMessages(null)
         removeTempFolder()
         if (!isChangingConfigurations) {
-            GalleryDataBase.destroyInstance()
+            GalleryDatabase.destroyInstance()
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDataBase.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt
similarity index 79%
rename from app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDataBase.kt
rename to app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt
index de7f425f2..b8bd5f47c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDataBase.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt
@@ -10,20 +10,20 @@ import com.simplemobiletools.gallery.models.Directory
 import com.simplemobiletools.gallery.models.Medium
 
 @Database(entities = [(Directory::class), (Medium::class)], version = 2)
-abstract class GalleryDataBase : RoomDatabase() {
+abstract class GalleryDatabase : RoomDatabase() {
 
     abstract fun DirectoryDao(): DirectoryDao
 
     abstract fun MediumDao(): MediumDao
 
     companion object {
-        private var db: GalleryDataBase? = null
+        private var db: GalleryDatabase? = null
 
-        fun getInstance(context: Context): GalleryDataBase {
+        fun getInstance(context: Context): GalleryDatabase {
             if (db == null) {
-                synchronized(GalleryDataBase::class) {
+                synchronized(GalleryDatabase::class) {
                     if (db == null) {
-                        db = Room.databaseBuilder(context.applicationContext, GalleryDataBase::class.java, "gallery.db")
+                        db = Room.databaseBuilder(context.applicationContext, GalleryDatabase::class.java, "gallery.db")
                                 .fallbackToDestructiveMigration()
                                 .build()
                     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
index 0a70c6a61..783792998 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
@@ -20,7 +20,7 @@ import com.simplemobiletools.commons.helpers.OTG_PATH
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.activities.SettingsActivity
 import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask
-import com.simplemobiletools.gallery.databases.GalleryDataBase
+import com.simplemobiletools.gallery.databases.GalleryDatabase
 import com.simplemobiletools.gallery.helpers.*
 import com.simplemobiletools.gallery.interfaces.DirectoryDao
 import com.simplemobiletools.gallery.models.Directory
@@ -70,7 +70,7 @@ fun Context.launchSettings() {
 
 val Context.config: Config get() = Config.newInstance(applicationContext)
 
-val Context.galleryDB: GalleryDataBase get() = GalleryDataBase.getInstance(applicationContext)
+val Context.galleryDB: GalleryDatabase get() = GalleryDatabase.getInstance(applicationContext)
 
 fun Context.movePinnedDirectoriesToFront(dirs: ArrayList<Directory>): ArrayList<Directory> {
     val foundFolders = ArrayList<Directory>()
diff --git a/app/src/main/res/drawable-v26/ic_launcher_foreground.xml b/app/src/main/res/drawable-v26/ic_launcher_foreground.xml
deleted file mode 100644
index 5f01b3af0..000000000
--- a/app/src/main/res/drawable-v26/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M63.58,40.16m-5.73,0a5.73,5.73 0,1 1,11.47 0a5.73,5.73 0,1 1,-11.47 0"/>
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M47.37,46.64l-17.45,25.43l45.46,0l-9.89,-16.21l-5.9,8.39z"/>
-</vector>