Fix some UI issues

arrazyfathan · Mar 19, 2023 · a739e68 · a739e68
1 parent b64f1da
commit a739e68
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 37 deletions.
diff --git a/app/src/main/java/com/example/kbbikamusbesarbahasaindonesia/ui/detail/DetailActivity.kt b/app/src/main/java/com/example/kbbikamusbesarbahasaindonesia/ui/detail/DetailActivity.kt
@@ -28,8 +28,8 @@ class DetailActivity : AppCompatActivity() {
         handleIntent()
         setupRecyclerView()
         checkIfWordSaved()
-        observe()
         setupView()
+        observe()
     }
 
     private fun observe() {

diff --git a/app/src/main/java/com/example/kbbikamusbesarbahasaindonesia/ui/home/HomeFragment.kt b/app/src/main/java/com/example/kbbikamusbesarbahasaindonesia/ui/home/HomeFragment.kt
@@ -95,8 +95,9 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
                     is Resource.Loading -> showLoading(true)
                     is Resource.Success -> {
                         showLoading(false)
-                        navigateToDetail(result, word)
                         saveWordToHistory(word)
+                        binding.editTextSearch.setText("")
+                        navigateToDetail(result, word)
                     }
                     is Resource.Error -> {
                         showLoading(false)

diff --git a/...src/main/java/com/example/kbbikamusbesarbahasaindonesia/ui/home/adapter/HistoryAdapter.kt b/...src/main/java/com/example/kbbikamusbesarbahasaindonesia/ui/home/adapter/HistoryAdapter.kt
@@ -51,5 +51,5 @@ class HistoryAdapter(
 
     fun isEmpty(): Boolean = differ.currentList.isEmpty()
 
-    override fun getItemCount() = differ.currentList.size.coerceAtMost(7)
+    override fun getItemCount() = differ.currentList.size
 }
diff --git a/app/src/main/java/com/example/kbbikamusbesarbahasaindonesia/ui/words/WordFragment.kt b/app/src/main/java/com/example/kbbikamusbesarbahasaindonesia/ui/words/WordFragment.kt
@@ -1,26 +1,26 @@
 package com.example.kbbikamusbesarbahasaindonesia.ui.words
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
 import android.view.*
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.kbbikamusbesarbahasaindonesia.R
 import com.example.kbbikamusbesarbahasaindonesia.core.data.Resource
+import com.example.kbbikamusbesarbahasaindonesia.core.data.source.local.KosaKata
 import com.example.kbbikamusbesarbahasaindonesia.core.domain.model.ListWordModel
 import com.example.kbbikamusbesarbahasaindonesia.core.domain.model.WordModel
-import com.example.kbbikamusbesarbahasaindonesia.core.data.source.local.KosaKata
 import com.example.kbbikamusbesarbahasaindonesia.databinding.FragmentWordBinding
 import com.example.kbbikamusbesarbahasaindonesia.ui.adapter.KosaKataAdapter
 import com.example.kbbikamusbesarbahasaindonesia.ui.detail.DetailActivity
+import com.example.kbbikamusbesarbahasaindonesia.utils.toJson
 import com.example.kbbikamusbesarbahasaindonesia.utils.viewBinding
-import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
+import com.jakewharton.rxbinding4.widget.textChanges
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import java.io.IOException
 
@@ -30,13 +30,7 @@ class WordFragment : Fragment(R.layout.fragment_word) {
     private val viewModel: WordViewModel by viewModel()
     private lateinit var adapter: KosaKataAdapter
 
-    private var filtered = KosaKata()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
+    @SuppressLint("CheckResult", "NotifyDataSetChanged")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -51,27 +45,21 @@ class WordFragment : Fragment(R.layout.fragment_word) {
         }
         binding.rvListKosaKata.adapter = adapter
 
-        binding.editTextSearchWord.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-            }
-
-            override fun onTextChanged(char: CharSequence?, p1: Int, p2: Int, p3: Int) {
-            }
-
-            override fun afterTextChanged(char: Editable?) {
-                if (char.toString().isEmpty()) {
+        binding.editTextSearchWord.textChanges()
+            .skipInitialValue()
+            .subscribe { text ->
+                if (text.toString().isEmpty()) {
                     binding.rvListKosaKata.adapter = KosaKataAdapter(list) {
                         getMeaningOfWord(it)
                     }
                     adapter.notifyDataSetChanged()
                 } else {
-                    adapter.filter.filter(char)
+                    adapter.filter.filter(text)
                     binding.rvListKosaKata.adapter = KosaKataAdapter(adapter.kataFilterList) {
                         getMeaningOfWord(it)
                     }
                 }
             }
-        })
     }
 
     private fun getMeaningOfWord(word: String) {
@@ -100,11 +88,13 @@ class WordFragment : Fragment(R.layout.fragment_word) {
         val listWordModel = ListWordModel(
             word = word,
             listWords = result.data!!,
+        ).toJson()
+        startActivity(
+            Intent(requireActivity(), DetailActivity::class.java).putExtra(
+                "data",
+                listWordModel,
+            ),
         )
-        val dataJson = Gson().toJson(listWordModel)
-        val intent = Intent(requireActivity(), DetailActivity::class.java)
-        intent.putExtra("data", dataJson)
-        startActivity(intent)
     }
 
     private fun getJsonDataFromAsset(context: Context, fileName: String): String? {
@@ -118,7 +108,7 @@ class WordFragment : Fragment(R.layout.fragment_word) {
         return jsonString
     }
 
-    fun showLoadingState(state: Boolean) {
+    private fun showLoadingState(state: Boolean) {
         if (state) {
             binding.loadingState.visibility =
                 View.VISIBLE

diff --git a/app/src/main/res/color/text_selection_state.xml b/app/src/main/res/color/text_selection_state.xml
@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/white" />
+    <item android:color="@color/text_p" />
+</selector>
diff --git a/app/src/main/res/layout/item_list_arti.xml b/app/src/main/res/layout/item_list_arti.xml
@@ -37,12 +37,14 @@
 
         <TextView
             android:id="@+id/lemma"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginStart="16dp"
+            android:paddingVertical="4dp"
             android:fontFamily="@font/inter_semibold"
-            android:text="de.mo.kra.si /démokrasi/"
+            tools:text="de.mo.kra.si /démokrasi/"
             android:textColor="@color/text_h1"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="@id/container_number"

diff --git a/app/src/main/res/layout/item_list_child_arti.xml b/app/src/main/res/layout/item_list_child_arti.xml
@@ -17,15 +17,16 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:fontFamily="@font/inter_regular"
-            android:justificationMode="inter_word"
-            android:textColor="@color/text_p"
+            android:layout_margin="4dp"
+            android:textColor="@color/text_selection_state"
             android:textSize="16sp"
             android:textIsSelectable="true"
+            android:textColorHighlight="@color/text_primary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:text="(bentuk atau sistem) pemerintahan yang seluruh rakyatnya turut serta memerintah dengan perantaraan wakilnya; pemerintahan rakyat" />
+            tools:text="(bentuk atau sistem) pemerintahan yang seluruh rakyatnya turut serta memerintah dengan perantaraan wakilnya; pemerintahan rakyat" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/item_list_favorite.xml b/app/src/main/res/layout/item_list_favorite.xml
@@ -37,6 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="32dp"
             android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
             android:layout_width="wrap_content"
             android:textColor="@color/text_p"

diff --git a/app/version.properties b/app/version.properties
@@ -1,4 +1,4 @@
-#Sun Mar 19 21:17:31 WIB 2023
+#Sun Mar 19 22:14:19 WIB 2023
 VERSION_ALPHA=0
 VERSION_MINOR=0
 VERSION_DEV=0