From 8005454c49feb58053f3ae35fc31993728d4522c Mon Sep 17 00:00:00 2001
From: tuancoltech <tuancoltech@gmail.com>
Date: Sun, 30 Mar 2025 11:20:17 +0700
Subject: [PATCH] * Tweak activity's Toolbar. * Remove redundant dependencies

---
 .../com/tymex/github/users/ui/BaseActivity.kt | 20 ++++++--
 .../github/users/ui/UserDetailsActivity.kt    |  4 ++
 .../tymex/github/users/ui/UsersActivity.kt    |  4 +-
 .../tymex/github/users/ui/WindowExtensions.kt | 47 +++++++++++++++++++
 .../main/res/layout/activity_user_details.xml |  1 +
 .../res/layout/custom_actionbar_title.xml     | 11 -----
 app/src/main/res/layout/toolbar.xml           | 32 +++++++++++++
 app/src/main/res/values-night/themes.xml      |  2 +-
 app/src/main/res/values/dimens.xml            |  1 +
 data-core/src/main/AndroidManifest.xml        |  2 +-
 .../github/data/core/data/model/FlowState.kt  | 12 +++++
 .../data/core/data/model/GetUsersResult.kt    |  6 ++-
 .../users/local/UserLocalDataSourceImpl.kt    |  5 +-
 .../users/remote/UserRemoteDataSourceImpl.kt  |  4 +-
 .../github/data/core/di/CoroutinesModule.kt   |  8 ----
 .../tymex/github/data/core/di/JsonHelper.kt   | 16 -------
 .../tymex/github/data/core/di/ParserModule.kt |  5 --
 .../github/{ => data/core}/LinkHeaderTest.kt  |  0
 .../{ => data/core}/NetworkResponseTest.kt    |  0
 19 files changed, 127 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/java/com/tymex/github/users/ui/WindowExtensions.kt
 delete mode 100644 app/src/main/res/layout/custom_actionbar_title.xml
 create mode 100644 app/src/main/res/layout/toolbar.xml
 delete mode 100644 data-core/src/main/java/com/tymex/github/data/core/di/JsonHelper.kt
 rename data-core/src/test/java/com/tymex/github/{ => data/core}/LinkHeaderTest.kt (100%)
 rename data-core/src/test/java/com/tymex/github/{ => data/core}/NetworkResponseTest.kt (100%)

diff --git a/app/src/main/java/com/tymex/github/users/ui/BaseActivity.kt b/app/src/main/java/com/tymex/github/users/ui/BaseActivity.kt
index 6d307dc..9483d8b 100644
--- a/app/src/main/java/com/tymex/github/users/ui/BaseActivity.kt
+++ b/app/src/main/java/com/tymex/github/users/ui/BaseActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.Gravity
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
-import com.tymex.github.users.databinding.CustomActionbarTitleBinding
+import com.tymex.github.users.databinding.ToolbarBinding
 
 abstract class BaseActivity : AppCompatActivity() {
 
@@ -12,12 +12,15 @@ abstract class BaseActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         supportActionBar?.let {
-            it.setDisplayHomeAsUpEnabled(true)
+            it.setDisplayHomeAsUpEnabled(false)
             it.setDisplayShowTitleEnabled(false)
             it.setDisplayShowCustomEnabled(true)
 
-            val titleBinding = CustomActionbarTitleBinding.inflate(layoutInflater)
-            titleBinding.root.text = getToolbarTitle()
+            val titleBinding = ToolbarBinding.inflate(layoutInflater)
+            titleBinding.tvTitle.text = getToolbarTitle()
+            titleBinding.ivBack.setOnClickListener {
+                onBackPressedDispatcher.onBackPressed()
+            }
             val actionBarParams = ActionBar.LayoutParams(
                 ActionBar.LayoutParams.MATCH_PARENT,
                 ActionBar.LayoutParams.WRAP_CONTENT,
@@ -25,7 +28,16 @@ abstract class BaseActivity : AppCompatActivity() {
             )
             it.setCustomView(titleBinding.root, actionBarParams)
         }
+
+        window.apply {
+            setLightStatusBar()
+            setStatusBarColorCompat(android.R.color.white)
+        }
+
     }
 
+    /**
+     * Override this to set Toolbar's title text
+     */
     abstract fun getToolbarTitle(): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tymex/github/users/ui/UserDetailsActivity.kt b/app/src/main/java/com/tymex/github/users/ui/UserDetailsActivity.kt
index df3b823..6d469c4 100644
--- a/app/src/main/java/com/tymex/github/users/ui/UserDetailsActivity.kt
+++ b/app/src/main/java/com/tymex/github/users/ui/UserDetailsActivity.kt
@@ -46,6 +46,10 @@ class UserDetailsActivity : BaseActivity() {
         usersViewModel = ViewModelProvider(this)[UserViewModelImpl::class.java]
     }
 
+
+    /**
+     * Parse & display user details from a [FlowState]
+     */
     private fun handleUserDetailsFlow(flowState: FlowState) {
         when (flowState) {
             is FlowState.Loading -> {
diff --git a/app/src/main/java/com/tymex/github/users/ui/UsersActivity.kt b/app/src/main/java/com/tymex/github/users/ui/UsersActivity.kt
index 2f945c0..99b83d7 100644
--- a/app/src/main/java/com/tymex/github/users/ui/UsersActivity.kt
+++ b/app/src/main/java/com/tymex/github/users/ui/UsersActivity.kt
@@ -42,7 +42,6 @@ class UsersActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityUsersBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
         initUsersList()
         initViewModel()
 
@@ -98,6 +97,9 @@ class UsersActivity : BaseActivity() {
         }
     }
 
+    /**
+     * Parse users data from [FlowState] to inflate into list view
+     */
     private fun handleUsersFlow(flowState: FlowState) {
         when (flowState) {
             is FlowState.Loading -> {
diff --git a/app/src/main/java/com/tymex/github/users/ui/WindowExtensions.kt b/app/src/main/java/com/tymex/github/users/ui/WindowExtensions.kt
new file mode 100644
index 0000000..c700109
--- /dev/null
+++ b/app/src/main/java/com/tymex/github/users/ui/WindowExtensions.kt
@@ -0,0 +1,47 @@
+package com.tymex.github.users.ui
+
+import android.R
+import android.os.Build
+import android.view.View
+import android.view.Window
+import android.view.WindowInsetsController
+import android.view.WindowManager
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+fun Window.setLightStatusBar() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        this.insetsController?.setSystemBarsAppearance(
+            WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS,
+            WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
+        )
+    } else {
+        this.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+    }
+}
+
+fun Window.setStatusBarColorCompat(color: Int) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+
+        this.decorView.setBackgroundColor(ContextCompat.getColor(this.context, color))
+
+        // Apply window insets to avoid overlapping with system bars
+        ViewCompat.setOnApplyWindowInsetsListener(
+            this.decorView.findViewById(R.id.content)
+        ) { v, insets ->
+            val systemBarsInsets =
+                insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(
+                v.getPaddingLeft(),
+                systemBarsInsets.top,
+                v.getPaddingRight(),
+                systemBarsInsets.bottom
+            )
+            WindowInsetsCompat.CONSUMED
+        }
+    } else {
+        this.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+        this.statusBarColor = ContextCompat.getColor(this.context, color)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml
index eb70f0a..edaae87 100644
--- a/app/src/main/res/layout/activity_user_details.xml
+++ b/app/src/main/res/layout/activity_user_details.xml
@@ -51,6 +51,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/common_margin"
+        android:gravity="center_horizontal"
         app:layout_constraintEnd_toEndOf="@+id/iv_following"
         app:layout_constraintStart_toStartOf="@+id/iv_following"
         app:layout_constraintTop_toBottomOf="@+id/iv_followers"
diff --git a/app/src/main/res/layout/custom_actionbar_title.xml b/app/src/main/res/layout/custom_actionbar_title.xml
deleted file mode 100644
index cf40e6f..0000000
--- a/app/src/main/res/layout/custom_actionbar_title.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/action_bar_title"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:textColor="@android:color/black"
-    android:textStyle="bold"
-    android:gravity="center_horizontal"
-    tools:text="My Centered Title" />
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
new file mode 100644
index 0000000..5db6b71
--- /dev/null
+++ b/app/src/main/res/layout/toolbar.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_back"
+        android:layout_width="@dimen/toolbar_back_indicator_size"
+        android:layout_height="@dimen/toolbar_back_indicator_size"
+        android:padding="12dp"
+        android:src="@drawable/ic_back"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/toolbar_back_indicator_size"
+        android:gravity="center_horizontal"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@android:color/black"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="My Centered Title" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index deddcd0..9544c00 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.GithubUsers" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 42652d3..edcc79d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,4 +2,5 @@
 <resources>
     <dimen name="common_margin">20dp</dimen>
     <dimen name="small_image_view_size">40dp</dimen>
+    <dimen name="toolbar_back_indicator_size">48dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/data-core/src/main/AndroidManifest.xml b/data-core/src/main/AndroidManifest.xml
index a5918e6..44008a4 100644
--- a/data-core/src/main/AndroidManifest.xml
+++ b/data-core/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/data-core/src/main/java/com/tymex/github/data/core/data/model/FlowState.kt b/data-core/src/main/java/com/tymex/github/data/core/data/model/FlowState.kt
index 02bdf79..40019d3 100644
--- a/data-core/src/main/java/com/tymex/github/data/core/data/model/FlowState.kt
+++ b/data-core/src/main/java/com/tymex/github/data/core/data/model/FlowState.kt
@@ -1,10 +1,22 @@
 package com.tymex.github.data.core.data.model
 
+/**
+ * A sealed hierarchy describing the state of the feed of users lists/user details
+ */
 sealed class FlowState {
 
+    /**
+     * User(s) data is loading
+     */
     data object Loading : FlowState()
 
+    /**
+     * There's an error with loading user(s) data
+     */
     data class Error(val message: String? = null) : FlowState()
 
+    /**
+     * User data is successfully loaded and ready to use
+     */
     data class Success<T>(val data: T) : FlowState()
 }
\ No newline at end of file
diff --git a/data-core/src/main/java/com/tymex/github/data/core/data/model/GetUsersResult.kt b/data-core/src/main/java/com/tymex/github/data/core/data/model/GetUsersResult.kt
index ee28245..b6a8990 100644
--- a/data-core/src/main/java/com/tymex/github/data/core/data/model/GetUsersResult.kt
+++ b/data-core/src/main/java/com/tymex/github/data/core/data/model/GetUsersResult.kt
@@ -1,7 +1,11 @@
 package com.tymex.github.data.core.data.model
 
+/**
+ * A wrapper of users list returned from a data repository
+ * [users] List of users
+ * [isFinalPage] true if this is the final page of data available, false otherwise
+ */
 data class GetUsersResult(
     val users: List<User>,
     val isFinalPage: Boolean = false,
-    var isDirty: Boolean = false
 )
diff --git a/data-core/src/main/java/com/tymex/github/data/core/data/repository/users/local/UserLocalDataSourceImpl.kt b/data-core/src/main/java/com/tymex/github/data/core/data/repository/users/local/UserLocalDataSourceImpl.kt
index cd73ddf..a117006 100644
--- a/data-core/src/main/java/com/tymex/github/data/core/data/repository/users/local/UserLocalDataSourceImpl.kt
+++ b/data-core/src/main/java/com/tymex/github/data/core/data/repository/users/local/UserLocalDataSourceImpl.kt
@@ -22,9 +22,8 @@ class UserLocalDataSourceImpl @Inject constructor(
         return flow {
             emit(FlowState.Loading)
             val since = (page - 1) * pageSize
-            Log.d(
-                TAG,
-                "getUsers page: " + page + ". pageSize: " + pageSize + ". since: " + since
+            Log.d(TAG,
+                "getUsers page: $page. pageSize: $pageSize. since: $since"
             )
             try {
                 val response = userDao.getUsers(pageSize, since)
diff --git a/data-core/src/main/java/com/tymex/github/data/core/data/repository/users/remote/UserRemoteDataSourceImpl.kt b/data-core/src/main/java/com/tymex/github/data/core/data/repository/users/remote/UserRemoteDataSourceImpl.kt
index ab1d4b1..27f67c0 100644
--- a/data-core/src/main/java/com/tymex/github/data/core/data/repository/users/remote/UserRemoteDataSourceImpl.kt
+++ b/data-core/src/main/java/com/tymex/github/data/core/data/repository/users/remote/UserRemoteDataSourceImpl.kt
@@ -24,7 +24,7 @@ class UserRemoteDataSourceImpl @Inject constructor(
 
             var isFinalPage = false
             val since = (page - 1) * pageSize
-            Log.d(TAG, "getUsers page: $page"+ ". pageSize: $pageSize"+ ". since: $since")
+            Log.d(TAG, "getUsers page: $page. pageSize: $pageSize. since: $since")
             val networkResponse: NetworkResponse<List<User>> = try {
                 val response = userService.getUsers(pageSize, since)
                 isFinalPage = response.headers()["Link"]?.isLastPage() ?: false
@@ -52,7 +52,7 @@ class UserRemoteDataSourceImpl @Inject constructor(
         return flow {
             emit(FlowState.Loading)
 
-            Log.i(TAG, "getUserDetails login: " + login)
+            Log.i(TAG, "getUserDetails login: $login")
             val networkResponse: NetworkResponse<UserDetails> = try {
                 userService.getUserDetails(login).toNetworkResponse()
             } catch (ex: Exception) {
diff --git a/data-core/src/main/java/com/tymex/github/data/core/di/CoroutinesModule.kt b/data-core/src/main/java/com/tymex/github/data/core/di/CoroutinesModule.kt
index ee2f0ef..0feed11 100644
--- a/data-core/src/main/java/com/tymex/github/data/core/di/CoroutinesModule.kt
+++ b/data-core/src/main/java/com/tymex/github/data/core/di/CoroutinesModule.kt
@@ -14,18 +14,10 @@ import javax.inject.Singleton
 @Retention(AnnotationRetention.RUNTIME)
 annotation class IoScope
 
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class DefaultScope
-
 @Retention(AnnotationRetention.RUNTIME)
 @Qualifier
 annotation class MainScope
 
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class ApplicationScope
-
 @Module
 @InstallIn(SingletonComponent::class)
 object CoroutineScopeModule {
diff --git a/data-core/src/main/java/com/tymex/github/data/core/di/JsonHelper.kt b/data-core/src/main/java/com/tymex/github/data/core/di/JsonHelper.kt
deleted file mode 100644
index 9b7eacf..0000000
--- a/data-core/src/main/java/com/tymex/github/data/core/di/JsonHelper.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.tymex.github.data.core.di
-
-import com.squareup.moshi.Moshi
-import javax.inject.Inject
-
-class JsonHelper @Inject constructor(private val moshi: Moshi) {
-
-    fun <T : Any> toObject(strJson: String?, clazz: Class<T>): T? {
-        return if (!strJson.isNullOrEmpty()) {
-            val adapter = moshi.adapter(clazz)
-            adapter.fromJson(strJson)
-        } else {
-            null
-        }
-    }
-}
\ No newline at end of file
diff --git a/data-core/src/main/java/com/tymex/github/data/core/di/ParserModule.kt b/data-core/src/main/java/com/tymex/github/data/core/di/ParserModule.kt
index 4d8a1d7..326a5cc 100644
--- a/data-core/src/main/java/com/tymex/github/data/core/di/ParserModule.kt
+++ b/data-core/src/main/java/com/tymex/github/data/core/di/ParserModule.kt
@@ -15,9 +15,4 @@ class ParserModule {
     @Singleton
     @Provides
     fun provideMoshi(): Moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
-
-
-    @Singleton
-    @Provides
-    fun provideJsonHelper(moshi: Moshi): JsonHelper = JsonHelper(moshi)
 }
\ No newline at end of file
diff --git a/data-core/src/test/java/com/tymex/github/LinkHeaderTest.kt b/data-core/src/test/java/com/tymex/github/data/core/LinkHeaderTest.kt
similarity index 100%
rename from data-core/src/test/java/com/tymex/github/LinkHeaderTest.kt
rename to data-core/src/test/java/com/tymex/github/data/core/LinkHeaderTest.kt
diff --git a/data-core/src/test/java/com/tymex/github/NetworkResponseTest.kt b/data-core/src/test/java/com/tymex/github/data/core/NetworkResponseTest.kt
similarity index 100%
rename from data-core/src/test/java/com/tymex/github/NetworkResponseTest.kt
rename to data-core/src/test/java/com/tymex/github/data/core/NetworkResponseTest.kt