Skip to content

Commit 4f0043f

Browse files
committed
fixed some minor bugs
changed all adapter classes to kotlin files there's a bug with bookmarking a note
1 parent d9c447b commit 4f0043f

22 files changed

Lines changed: 607 additions & 914 deletions

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
minSdkVersion 18
1414
targetSdkVersion 30
1515
versionCode 2
16-
versionName "beta-release-1.1"
16+
versionName "beta-release-1.2"
1717

1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919

@@ -39,12 +39,12 @@ dependencies {
3939
implementation 'androidx.appcompat:appcompat:1.2.0'
4040
implementation 'com.google.android.material:material:1.3.0'
4141
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
42-
implementation 'androidx.navigation:navigation-fragment:2.3.3'
43-
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3'
44-
implementation 'androidx.navigation:navigation-ui:2.3.3'
45-
implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
42+
// implementation 'androidx.navigation:navigation-fragment:2.3.4'
43+
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
44+
// implementation 'androidx.navigation:navigation-ui:2.3.4'
45+
implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
4646
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
47-
implementation 'androidx.preference:preference:1.1.1'
47+
// implementation 'androidx.preference:preference:1.1.1'
4848
implementation 'androidx.preference:preference-ktx:1.1.1'
4949
implementation 'androidx.work:work-runtime:2.5.0'
5050
implementation 'androidx.legacy:legacy-support-v4:1.0.0'

app/release/app-release.apk

-5.01 MB
Binary file not shown.

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

Lines changed: 0 additions & 125 deletions
This file was deleted.

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

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
package com.certified.notes.adapters
22

3-
import android.content.Context
43
import android.view.LayoutInflater
54
import android.view.View
65
import android.view.ViewGroup
6+
import android.widget.ImageView
77
import android.widget.TextView
8-
import androidx.preference.PreferenceManager
98
import androidx.recyclerview.widget.DiffUtil
109
import androidx.recyclerview.widget.ListAdapter
1110
import androidx.recyclerview.widget.RecyclerView
1211
import com.certified.notes.R
1312
import com.certified.notes.model.BookMark
14-
import com.certified.notes.room.NotesViewModel
15-
import com.certified.notes.util.PreferenceKeys
1613
import com.like.LikeButton
17-
import com.like.OnLikeListener
1814

19-
class BookMarkRecyclerAdapterKt(
20-
private val context: Context,
21-
private val viewModel: NotesViewModel
15+
class BookMarkRecyclerAdapter(
16+
// private val context: Context,
17+
// private val viewModel: NotesViewModel
2218
) :
23-
ListAdapter<BookMark, BookMarkRecyclerAdapterKt.ViewHolder>(
19+
ListAdapter<BookMark, BookMarkRecyclerAdapter.ViewHolder>(
2420
DIFF_CALLBACK
2521
) {
2622

27-
private val listener: OnBookMarkClickedListener?
23+
private lateinit var listener: OnBookMarkClickedListener
2824

29-
init {
30-
listener = null
25+
// init {
26+
// listener = null
27+
// }
28+
29+
fun setOnBookMarkClickedListener(listener: OnBookMarkClickedListener) {
30+
this.listener = listener
3131
}
3232

3333
fun getBookMarkAt(position: Int): BookMark {
@@ -42,15 +42,17 @@ class BookMarkRecyclerAdapterKt(
4242
val noteContent: TextView
4343
val noteTitle: TextView
4444
val likeButton: LikeButton
45+
val ivBookMark: ImageView
4546

4647
init {
4748
noteContent = itemView.findViewById(R.id.tv_note_content)
4849
noteTitle = itemView.findViewById(R.id.tv_note_title)
4950
likeButton = itemView.findViewById(R.id.likeButton)
51+
ivBookMark = itemView.findViewById(R.id.iv_bookmark)
5052

51-
itemView.setOnClickListener{
53+
itemView.setOnClickListener {
5254
val position = adapterPosition
53-
if (listener != null && position != RecyclerView.NO_POSITION) {
55+
if (position != RecyclerView.NO_POSITION) {
5456
listener.onBookMarkClick(getItem(position))
5557
}
5658
}
@@ -80,34 +82,35 @@ class BookMarkRecyclerAdapterKt(
8082
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
8183
val currentBookMark = getItem(position)
8284
holder.noteContent.text = currentBookMark.noteContent
83-
holder.noteTitle.text = currentBookMark.noteContent
84-
holder.likeButton.isLiked = true
85-
holder.likeButton.setOnLikeListener(object : OnLikeListener {
86-
override fun liked(likeButton: LikeButton?) {
87-
88-
}
89-
90-
override fun unLiked(likeButton: LikeButton?) {
91-
val noteId = currentBookMark.noteId
92-
val courseCode = currentBookMark.courseCode
93-
val noteTitle = currentBookMark.noteTitle
94-
val noteContent = currentBookMark.noteContent
95-
val bookMark = BookMark(noteId, courseCode, noteTitle, noteContent)
96-
bookMark.id = currentBookMark.id
97-
viewModel.deleteBookMark(bookMark)
98-
99-
val preferences = PreferenceManager.getDefaultSharedPreferences(context)
100-
val editor = preferences.edit()
101-
102-
val defValues = HashSet<String>()
103-
defValues.add("-1")
104-
val noteIds =
105-
HashSet<String>(preferences.getStringSet(PreferenceKeys.NOTE_IDS, defValues))
106-
noteIds.remove(noteId.toString())
107-
108-
editor.putStringSet(PreferenceKeys.NOTE_IDS, noteIds)
109-
editor.apply()
110-
}
111-
})
85+
holder.noteTitle.text = currentBookMark.noteTitle
86+
holder.ivBookMark.visibility = View.VISIBLE
87+
// holder.likeButton.isLiked = true
88+
// holder.likeButton.setOnLikeListener(object : OnLikeListener {
89+
// override fun liked(likeButton: LikeButton?) {
90+
//
91+
// }
92+
//
93+
// override fun unLiked(likeButton: LikeButton?) {
94+
// val noteId = currentBookMark.noteId
95+
// val courseCode = currentBookMark.courseCode
96+
// val noteTitle = currentBookMark.noteTitle
97+
// val noteContent = currentBookMark.noteContent
98+
// val bookMark = BookMark(noteId, courseCode, noteTitle, noteContent)
99+
// bookMark.id = currentBookMark.id
100+
// viewModel.deleteBookMark(bookMark)
101+
//
102+
// val preferences = PreferenceManager.getDefaultSharedPreferences(context)
103+
// val editor = preferences.edit()
104+
//
105+
// val defValues = HashSet<String>()
106+
// defValues.add("-1")
107+
// val noteIds =
108+
// HashSet<String>(preferences.getStringSet(PreferenceKeys.NOTE_IDS, defValues))
109+
// noteIds.remove(noteId.toString())
110+
//
111+
// editor.putStringSet(PreferenceKeys.NOTE_IDS, noteIds)
112+
// editor.apply()
113+
// }
114+
// })
112115
}
113116
}

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

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)