Merge Dev

app/build.gradle

@@ -31,6 +31,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
@@ -47,18 +50,20 @@ dependencies {
 //    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     // Coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2-native-mt'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt'
 
     testImplementation 'junit:junit:4.13.2'
+    testImplementation 'com.google.truth:truth:1.1.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'com.google.truth:truth:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
 //    Like button
     implementation 'com.github.jd-alexander:LikeButton:0.2.3'
 
 //    Room persistence library
-    implementation "androidx.room:room-runtime:2.3.0"
+    implementation "androidx.room:room-ktx:2.3.0"
     kapt "androidx.room:room-compiler:2.3.0"
 
 //    Paging
@@ -68,10 +73,10 @@ dependencies {
     implementation 'com.github.ibrahimsn98:SmoothBottomBar:1.7.6'
 
 //    round cardview
-    implementation 'com.github.captain-miao:optroundcardview:1.0.0'
+    implementation 'com.github.captain-miao:optroundcardview:1.1.0'
 
 //   lottie
-    implementation "com.airbnb.android:lottie:3.4.0"
+    implementation 'com.airbnb.android:lottie:4.1.0'
 
 //    page indicator
     implementation "com.romandanylyk:pageindicatorview:1.0.3@aar"
@@ -83,8 +88,8 @@ dependencies {
     implementation 'de.hdodenhof:circleimageview:3.1.0'
 
 //    glide
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-    kapt 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    kapt 'com.github.bumptech.glide:compiler:4.12.0'
 
 //    recyclerViewSwipeDecorator
     implementation 'it.xabaras.android:recyclerview-swipedecorator:1.2.3'

app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Notes"
         tools:replace="android:theme">
-        <activity android:name=".ui.MainActivity"
+        <activity android:name=".view.Main.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/certified/notes/adapters/BookMarkRecyclerAdapter.kt

@@ -39,19 +39,15 @@ class BookMarkRecyclerAdapter(
     }
 
     inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val noteContent: TextView
-        val noteTitle: TextView
-        val likeButton: LikeButton
-        val ivBookMark: ImageView
 
-        init {
-            noteContent = itemView.findViewById(R.id.tv_note_content)
-            noteTitle = itemView.findViewById(R.id.tv_note_title)
-            likeButton = itemView.findViewById(R.id.likeButton)
-            ivBookMark = itemView.findViewById(R.id.iv_bookmark)
+        val noteContent: TextView = itemView.findViewById(R.id.tv_note_content)
+        val noteTitle: TextView = itemView.findViewById(R.id.tv_note_title)
+        val likeButton: LikeButton = itemView.findViewById(R.id.likeButton)
+        val ivBookMark: ImageView = itemView.findViewById(R.id.iv_bookmark)
 
+        init {
             itemView.setOnClickListener {
-                val position = adapterPosition
+                val position = absoluteAdapterPosition
                 if (position != RecyclerView.NO_POSITION) {
                     listener.onBookMarkClick(getItem(position))
                 }
@@ -84,6 +80,7 @@ class BookMarkRecyclerAdapter(
         holder.noteContent.text = currentBookMark.noteContent
         holder.noteTitle.text = currentBookMark.noteTitle
         holder.ivBookMark.visibility = View.VISIBLE
+//        holder.itemView.setOnClickListener{ onBookMarkClicked?.invoke(currentBookMark)}
 //        holder.likeButton.isLiked = true
 //        holder.likeButton.setOnLikeListener(object : OnLikeListener {
 //            override fun liked(likeButton: LikeButton?) {

app/src/main/java/com/certified/notes/adapters/CourseRecyclerAdapter.kt

@@ -29,8 +29,8 @@ class CourseRecyclerAdapter :
 
         init {
 
-            itemView.setOnClickListener{
-                val position = adapterPosition
+            itemView.setOnClickListener {
+                val position = absoluteAdapterPosition
                 if (position != RecyclerView.NO_POSITION)
                     listener.onCourseClicked(getItem(position))
             }

app/src/main/java/com/certified/notes/adapters/NoteRecyclerAdapter.kt

@@ -77,7 +77,7 @@ class NoteRecyclerAdapter(context: Context) :
     }
 
     interface OnNoteClickedListener {
-        fun onNoteClick(note: Note?)
+        fun onNoteClick(note: Note)
     }
 
     inner class ViewHolder(itemView: View) :

app/src/main/java/com/certified/notes/adapters/ResultRecyclerAdapter.kt

@@ -16,11 +16,11 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.certified.notes.R
 import com.certified.notes.model.Course
-import com.certified.notes.room.NotesViewModel
+import com.certified.notes.view.Main.MainActivityViewModel
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
-class ResultRecyclerAdapter(val context: Context, private val viewModel: NotesViewModel) :
+class ResultRecyclerAdapter(val context: Context, private val viewModel: MainActivityViewModel) :
     ListAdapter<Course, ResultRecyclerAdapter.ViewHolder>(DIFF_CALLBACK) {
 
     inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

app/src/main/java/com/certified/notes/adapters/TodoRecyclerAdapter.kt

@@ -14,11 +14,11 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.certified.notes.R
 import com.certified.notes.model.Todo
-import com.certified.notes.room.NotesViewModel
+import com.certified.notes.view.Home.HomeViewModel
 import com.google.android.material.checkbox.MaterialCheckBox
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
-class TodoRecyclerAdapter(val context: Context, private val viewModel: NotesViewModel) :
+class TodoRecyclerAdapter(val context: Context, private val viewModel: HomeViewModel) :
     ListAdapter<Todo, TodoRecyclerAdapter.ViewHolder>(DIFF_CALLBACK) {
 
     private lateinit var listener: OnTodoClickedListener
@@ -98,7 +98,7 @@ class TodoRecyclerAdapter(val context: Context, private val viewModel: NotesView
                 }
                 builder.setNegativeButton(context.getString(R.string.no)) { dialog, _ ->
                     val todo1 = Todo(todoContent, true)
-                    todo1.id = getItem(position).id
+                    todo1.id = todo.id
                     viewModel.updateTodo(todo1)
                     dialog.cancel()
                 }

app/src/main/java/com/certified/notes/model/BookMark.kt

@@ -5,12 +5,16 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "bookmark_table")
-class BookMark(
-        @field:ColumnInfo(name = "note_id") val noteId: Int,
-        @field:ColumnInfo(name = "course_code") val courseCode: String,
-        @field:ColumnInfo(name = "note_title") val noteTitle: String,
-        @field:ColumnInfo(name = "note_content") val noteContent: String
+data class BookMark(
+    @ColumnInfo(name = "note_id")
+    val noteId: Int,
+    @ColumnInfo(name = "course_code")
+    val courseCode: String,
+    @ColumnInfo(name = "note_title")
+    val noteTitle: String,
+    @ColumnInfo(name = "note_content")
+    val noteContent: String
 ) {
     @PrimaryKey(autoGenerate = true)
-    var id = 0
+    var id: Int = 0;
 }

app/src/main/java/com/certified/notes/model/Course.kt

@@ -5,15 +5,22 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "course_table")
-class Course(
-        @field:ColumnInfo(name = "course_code") val courseCode: String,
-        @field:ColumnInfo(name = "course_title") val courseTitle: String,
-        @field:ColumnInfo(name = "course_unit") val courseUnit: Int,
-        @field:ColumnInfo(name = "course_mark") val courseMark: Int,
-        @field:ColumnInfo(name = "course_grade") val courseGrade: String,
-        @field:ColumnInfo(name = "course_grade_point") val courseGradePoint: Int
+data class Course(
+    @ColumnInfo(name = "course_code")
+    val courseCode: String,
+    @ColumnInfo(name = "course_title")
+    val courseTitle: String,
+    @ColumnInfo(name = "course_unit")
+    val courseUnit: Int,
+    @ColumnInfo(name = "course_mark")
+    val courseMark: Int,
+    @ColumnInfo(name = "course_grade")
+    val courseGrade: String,
+    @ColumnInfo(name = "course_grade_point")
+    val courseGradePoint: Int,
+    @ColumnInfo(name = "course_credit_point")
+    val courseCreditPoint: Int = courseGradePoint * courseUnit
 ) {
     @PrimaryKey(autoGenerate = true)
-    var id = 0
-    @field:ColumnInfo(name = "course_credit_point") var courseCreditPoint: Int = courseGradePoint * courseUnit
+    var id: Int = 0
 }

app/src/main/java/com/certified/notes/model/Note.kt

@@ -5,11 +5,14 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "note_table")
-class Note(
-        @field:ColumnInfo(name = "course_code") val courseCode: String?,
-        @field:ColumnInfo(name = "note_title") val title: String,
-        @field:ColumnInfo(name = "note_content") val content: String?
+data class Note(
+    @ColumnInfo(name = "course_code")
+    val courseCode: String,
+    @ColumnInfo(name = "note_title")
+    val title: String,
+    @ColumnInfo(name = "note_content")
+    val content: String?
 ) {
     @PrimaryKey(autoGenerate = true)
-    var id = 0
+    var id: Int = 0
 }

app/src/main/java/com/certified/notes/model/Result.kt

@@ -4,11 +4,11 @@ import androidx.room.ColumnInfo
 import androidx.room.PrimaryKey
 
 //@Entity(tableName = "result_table")
-class Result(
-        @field:ColumnInfo(name = "course_code") val courseCode: String,
-        @field:ColumnInfo(name = "course_unit") val courseUnit: String,
-        @field:ColumnInfo(name = "course_mark") val courseMark: String
+data class Result(
+    @ColumnInfo(name = "course_code") val courseCode: String,
+    @ColumnInfo(name = "course_unit") val courseUnit: String,
+    @ColumnInfo(name = "course_mark") val courseMark: String
 ) {
     @PrimaryKey(autoGenerate = true)
-    var id = 0
+    var id: Int = 0
 }

app/src/main/java/com/certified/notes/model/SliderItem.kt

@@ -1,3 +1,3 @@
 package com.certified.notes.model
 
-class SliderItem (val animation: Int, val title: String, val description: String)
+data class SliderItem (val animation: Int, val title: String, val description: String)

app/src/main/java/com/certified/notes/model/Todo.kt

@@ -4,7 +4,10 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "todo_table")
-class Todo(val todo: String, val isDone: Boolean) {
+data class Todo(
+    val todo: String,
+    val isDone: Boolean
+) {
     @PrimaryKey(autoGenerate = true)
-    var id = 0
+    var id: Int = 0
 }

app/src/main/java/com/certified/notes/model/User.kt

@@ -6,13 +6,13 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "user_table")
-class User(
+data class User(
     val name: String,
     val school: String,
     val department: String,
     val level: String,
-    @field:ColumnInfo(name = "profile_image") val profileImage: Bitmap?
+    @ColumnInfo(name = "profile_image") val profileImage: Bitmap?
 ) {
     @PrimaryKey
-    var id = 0
+    var id: Int = 0
 }