Преглед на файлове

Fix up fixed dependencies | 100% Kotlin project

sduduzog преди 7 години
родител
ревизия
424d651a3b

+ 4 - 2
app/build.gradle

@@ -4,6 +4,8 @@ apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-android-extensions'
 
+apply plugin: 'kotlin-kapt'
+
 android {
     compileSdkVersion 28
     defaultConfig {
@@ -46,8 +48,8 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha06'
     implementation 'androidx.room:room-runtime:2.1.0-alpha01'
-    annotationProcessor "androidx.room:room-compiler:2.1.0-alpha01"
-    annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.0.0"
+    kapt "androidx.room:room-compiler:2.1.0-alpha01"
+    kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
 
     // 3rd Party libs
     implementation 'com.daasuu:EasingInterpolator:1.0.0'

+ 2 - 2
app/src/main/java/com/sduduzog/slimlauncher/ui/main/model/AppRepository.kt

@@ -1,16 +1,16 @@
 package com.sduduzog.slimlauncher.ui.main.model
 
 import android.app.Application
-import androidx.lifecycle.LiveData
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.os.AsyncTask
+import androidx.lifecycle.LiveData
 import java.util.*
 
 class AppRepository(application: Application) {
 
-    private val db: AppRoomDatabase = AppRoomDatabase.getDatabase(application)
+    private val db: AppRoomDatabase = AppRoomDatabase.getDatabase(application)!!
     private var appDao: AppDao = db.appDao()
     private var _apps: LiveData<List<App>> = appDao.apps
     private var _homeApps: LiveData<List<HomeApp>> = appDao.homeApps

+ 0 - 28
app/src/main/java/com/sduduzog/slimlauncher/ui/main/model/AppRoomDatabase.java

@@ -1,28 +0,0 @@
-package com.sduduzog.slimlauncher.ui.main.model;
-
-import androidx.room.Database;
-import androidx.room.Room;
-import androidx.room.RoomDatabase;
-import android.content.Context;
-
-@Database(entities = {App.class, HomeApp.class}, version = 1, exportSchema = false)
-public abstract class AppRoomDatabase extends RoomDatabase {
-    private static volatile AppRoomDatabase INSTANCE;
-
-    @SuppressWarnings("UnusedReturnValue")
-    public static AppRoomDatabase getDatabase(final Context context) {
-        if (INSTANCE == null) {
-            synchronized (AppRoomDatabase.class) {
-                if (INSTANCE == null) {
-                    INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
-                            AppRoomDatabase.class, "app_database")
-                            .build();
-                }
-            }
-        }
-        return INSTANCE;
-    }
-
-    @SuppressWarnings("UnusedReturnValue")
-    public abstract AppDao appDao();
-}

+ 29 - 0
app/src/main/java/com/sduduzog/slimlauncher/ui/main/model/AppRoomDatabase.kt

@@ -0,0 +1,29 @@
+package com.sduduzog.slimlauncher.ui.main.model
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+
+@Database(entities = [App::class, HomeApp::class], version = 1, exportSchema = false)
+abstract class AppRoomDatabase : RoomDatabase() {
+
+    abstract fun appDao(): AppDao
+
+    companion object {
+        @Volatile
+        @JvmStatic
+        private var INSTANCE: AppRoomDatabase? = null
+
+        fun getDatabase(context: Context): AppRoomDatabase? {
+            synchronized(AppRoomDatabase::class.java) {
+                if (INSTANCE == null) {
+                    INSTANCE = Room.databaseBuilder(context.applicationContext,
+                            AppRoomDatabase::class.java, "app_database")
+                            .build()
+                }
+                return INSTANCE
+            }
+        }
+    }
+}