updated commons package name

Author: p-vincen-t

app/src/main/java/promise/base/AppDatabase.kt

@@ -17,7 +17,7 @@ import promise.base.comment.PostComment
 import promise.base.photo.Photo
 import promise.base.post.Post
 import promise.base.todo.Todo
-import promise.db.DatabaseEntity
+import promise.database.DatabaseEntity
 import promise.db.FastDatabase
 import promise.db.PromiseDatabase
 

app/src/main/java/promise/base/AppTypeConverter.kt

@@ -13,7 +13,7 @@
 
 package promise.base
 
-import promise.db.TypeConverter
+import promise.database.TypeConverter
 
 @TypeConverter
 class AppTypeConverter {

app/src/main/java/promise/base/comment/PostComment.java

@@ -7,8 +7,8 @@
 import promise.base.ID;
 import promise.base.post.Post;
 import promise.db.ActiveRecord;
-import promise.db.Entity;
-import promise.db.HasOne;
+import promise.database.Entity;
+import promise.database.HasOne;
 
 @SuppressLint("ParcelCreator")
 @Entity

app/src/main/java/promise/base/photo/Photo.kt

@@ -1,13 +1,10 @@
 package promise.base.photo
 
 import android.annotation.SuppressLint
-import android.os.Parcel
-import android.os.Parcelable
-import promise.base.ID
 import promise.base.post.Post
 import promise.db.ActiveRecord
-import promise.db.Entity
-import promise.db.HasOne
+import promise.database.Entity
+import promise.database.HasOne
 
 @SuppressLint("ParcelCreator")
 @Entity

app/src/main/java/promise/base/post/Post.java

@@ -10,8 +10,8 @@
 import promise.base.comment.PostComment;
 import promise.base.photo.Photo;
 import promise.db.ActiveRecord;
-import promise.db.Entity;
-import promise.db.HasMany;
+import promise.database.Entity;
+import promise.database.HasMany;
 
 @SuppressLint("ParcelCreator")
 @Entity

app/src/main/java/promise/base/todo/Todo.java

@@ -6,8 +6,8 @@
 
 import promise.base.photo.Photo;
 import promise.db.ActiveRecord;
-import promise.db.Entity;
-import promise.db.HasOne;
+import promise.database.Entity;
+import promise.database.HasOne;
 
 @SuppressLint("ParcelCreator")
 @Entity

app/src/main/java/promise/dbapp/DatabaseDependencies.kt

@@ -14,24 +14,22 @@
 package promise.dbapp
 
 import dagger.Module
-//import dagger.Provides
-//import promise.base.AppDatabase
-//import promise.base.AppDatabaseImpl
-//import promise.base.post.PostRelationsDao
-//import javax.inject.Singleton
+import dagger.Provides
+import promise.base.AppDatabase
+import promise.base.AppDatabaseImpl
+import promise.base.post.PostRelationsDao
+import javax.inject.Singleton
 
 @Module
 object DatabaseDependencies {
 
-//  @Provides
-//  @Singleton
-//  @JvmStatic
-//  fun provideAppDatabase(): AppDatabaseImpl = AppDatabaseImpl.createDatabase("blog_db")
-//
-//  @Provides
-//  @JvmStatic
-//  fun providePostRelationsDao(appDatabase: AppDatabaseImpl): PostRelationsDao =
-//      appDatabase.postRelationsDao
-
+  @Provides
+  @Singleton
+  @JvmStatic
+  fun provideAppDatabase(): AppDatabaseImpl = AppDatabaseImpl.createDatabase("blog_db")
 
+  @Provides
+  @JvmStatic
+  fun providePostRelationsDao(appDatabase: AppDatabaseImpl): PostRelationsDao =
+      appDatabase.postRelationsDao
 }

app/src/main/java/promise/dbapp/MainActivity.kt

@@ -64,14 +64,27 @@ class MainActivity : DaggerAppCompatActivity() {
 
    postRelationsDao.saveWithComments(posts)
 
-   val persons = postRelationsDao.listWithComments()
+    showInfo()
 
-   complex_values_textview.text = persons.toString()
+    clear_button.setOnClickListener {
+      deleteInfo()
+      showInfo()
+    }
+  }
+
+  private fun showInfo() {
+
+    val persons = postRelationsDao.listWithComments()
 
-   persons.forEach {
-     postRelationsDao.deleteComments(it)
-     it.delete()
-   }
+    complex_values_textview.text = persons.toString()
+  }
+
+  private fun deleteInfo() {
+    val persons = postRelationsDao.listWithComments()
+    persons.forEach {
+      postRelationsDao.deleteComments(it)
+      it.delete()
+    }
   }
 
 }

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

@@ -11,31 +11,29 @@
   ~ limitations under the License.
   -->
 
-<androidx.appcompat.widget.LinearLayoutCompat
+<ScrollView
     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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
+    android:layout_height="wrap_content"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context=".MainActivity"
     tools:showIn="@layout/activity_main">
-    <ScrollView
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
         <TextView
             android:id="@+id/complex_values_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Hello World!"
-           />
-    </ScrollView>
-
-    <Button
-        android:id="@+id/clear_button"
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:text="Clear" />
-
-</androidx.appcompat.widget.LinearLayoutCompat>
+            />
+        <Button
+            android:id="@+id/clear_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Clear" />
+    </androidx.appcompat.widget.LinearLayoutCompat>
+</ScrollView>

commons/src/main/java/promise/db/AddedEntity.kt renamed to commons/src/main/java/promise/database/AddedEntity.kt

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package promise.db
+package promise.database
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.SOURCE)