From 7e8d24dc25700745b725b8d11d47fb4a051bd53c Mon Sep 17 00:00:00 2001
From: Deep Vora <70479785+deeppp15@users.noreply.github.com>
Date: Mon, 14 Oct 2024 15:20:13 -0400
Subject: [PATCH 1/9] courses: smoother survey retake (fixes #4608) (#4619)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                              |  4 +-
 .../myplanet/ui/courses/CourseStepFragment.kt | 53 ++++++++-----------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ad349919e..96265559c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2020
-        versionName "0.20.20"
+        versionCode 2021
+        versionName "0.20.21"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/courses/CourseStepFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/courses/CourseStepFragment.kt
index 16cc4fb21..c79d8bfd1 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/courses/CourseStepFragment.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/courses/CourseStepFragment.kt
@@ -8,7 +8,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import io.realm.Case
 import io.realm.Realm
 import org.ole.planet.myplanet.MainApplication
 import org.ole.planet.myplanet.R
@@ -127,40 +126,34 @@ class CourseStepFragment : BaseContainerFragment(), ImageCaptureCallback {
         fragmentCourseStepBinding.btnTakeSurvey.visibility = View.GONE
         if (stepExams.isNotEmpty()) {
             val firstStepId = stepExams[0].id
-            val questions = cRealm.where(RealmExamQuestion::class.java).equalTo("examId", firstStepId).findAll()
-            val submissionsCount = step.courseId?.let {
-                cRealm.where(RealmSubmission::class.java).equalTo("userId",user?.id).contains("parentId", it)
-                    .notEqualTo("status", "pending", Case.INSENSITIVE).count()
-            }
-            if (questions != null && questions.size > 0) {
-                val examId=questions[0]?.examId
-
-                val isSubmitted = step.courseId?.let { courseId ->
-                    val parentId = "$examId@$courseId"
-                    cRealm.where(RealmSubmission::class.java)
-                        .equalTo("userId",user?.id)
-                        .equalTo("parentId", parentId)
-                        .equalTo("type", "exam")
-                        .findFirst() != null
-                } ?: false
-                fragmentCourseStepBinding.btnTakeTest.text = if (isSubmitted) { getString(R.string.retake_test, stepExams.size) } else { getString(R.string.take_test, stepExams.size) }
-                fragmentCourseStepBinding.btnTakeTest.visibility = View.VISIBLE
-            }
+            val isTestPersent = existsSubmission(firstStepId, "exam")
+            fragmentCourseStepBinding.btnTakeTest.text = if (isTestPersent) { getString(R.string.retake_test, stepExams.size) } else { getString(R.string.take_test, stepExams.size) }
+            fragmentCourseStepBinding.btnTakeTest.visibility = View.VISIBLE
         }
         if (stepSurvey.isNotEmpty()) {
             val firstStepId = stepSurvey[0].id
-            val questions = cRealm.where(RealmExamQuestion::class.java).equalTo("examId", firstStepId).findAll()
-            val submissionsCount = step.courseId?.let {
-                cRealm.where(RealmSubmission::class.java).contains("parentId", it)
-                    .notEqualTo("status", "pending", Case.INSENSITIVE).count()
-            }
-            if (questions != null && questions.size > 0) {
-                if (submissionsCount != null) {
-                    fragmentCourseStepBinding.btnTakeSurvey.text = if (submissionsCount > 0) { "redo survey" } else { "record survey" }
-                }
-                fragmentCourseStepBinding.btnTakeSurvey.visibility = View.VISIBLE
+            val isSurveyPresent = existsSubmission(firstStepId, "survey")
+            fragmentCourseStepBinding.btnTakeSurvey.text = if (isSurveyPresent) { "redo survey" } else { "record survey" }
+            fragmentCourseStepBinding.btnTakeSurvey.visibility = View.VISIBLE
             }
         }
+
+    private fun existsSubmission(firstStepId:String? , submissionType: String): Boolean{
+        val questions = cRealm.where(RealmExamQuestion::class.java).equalTo("examId", firstStepId).findAll()
+        var isPresent=false
+        if (questions != null && questions.size > 0) {
+            val examId=questions[0]?.examId
+            val isSubmitted = step.courseId?.let { courseId ->
+                val parentId = "$examId@$courseId"
+                cRealm.where(RealmSubmission::class.java)
+                    .equalTo("userId",user?.id)
+                    .equalTo("parentId", parentId)
+                    .equalTo("type", submissionType)
+                    .findFirst() != null
+            } ?: false
+            isPresent= isSubmitted
+        }
+        return isPresent
     }
 
     override fun setMenuVisibility(visible: Boolean) {

From 87996858529894e521659ff25fcaf586c44296c4 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Mon, 14 Oct 2024 22:34:33 +0300
Subject: [PATCH 2/9] all: smoother notifications (fixes #4623) (#4625)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                              | 4 ++--
 .../ui/dashboard/notification/NotificationsFragment.kt        | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 96265559c..d1b63943f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2021
-        versionName "0.20.21"
+        versionCode 2022
+        versionName "0.20.22"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/notification/NotificationsFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/notification/NotificationsFragment.kt
index be41e5748..b642cd3b8 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/notification/NotificationsFragment.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/notification/NotificationsFragment.kt
@@ -197,6 +197,8 @@ class NotificationsFragment : Fragment() {
 
     override fun onDestroy() {
         super.onDestroy()
-        mRealm.close()
+        if (::mRealm.isInitialized) {
+            mRealm.close()
+        }
     }
 }

From d83e15e9e6c37b4fd05bb97c31a2dcbf821785d7 Mon Sep 17 00:00:00 2001
From: Deep Vora <70479785+deeppp15@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:05:43 -0400
Subject: [PATCH 3/9] login: smoother learner list (fixes #4571) (#4624)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                           | 4 ++--
 app/src/main/res/layout/activity_login.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d1b63943f..1488167c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2022
-        versionName "0.20.22"
+        versionCode 2023
+        versionName "0.20.23"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index d8e2c73e5..6e0f82c04 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -350,11 +350,11 @@
                     android:id="@+id/recyclerView"
                     android:layout_width="match_parent"
                     android:layout_height="350dp"
-                    android:layout_marginTop="@dimen/_10dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/team" />
+                    app:layout_constraintTop_toBottomOf="@+id/team"
+                    app:layout_constraintVertical_bias="0.1" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
     </LinearLayout>

From 0013b443e7c4378ad0e707259b5f5c6529e1d215 Mon Sep 17 00:00:00 2001
From: Deep Vora <70479785+deeppp15@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:11:21 -0400
Subject: [PATCH 4/9] mylife: smoother myhealth dark mode (fixes #4598) (#4627)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                              |  4 +-
 .../ui/myhealth/AddMyHealthActivity.kt        | 23 ++++++
 .../res/layout/activity_add_my_health.xml     | 80 ++++++++++++-------
 3 files changed, 77 insertions(+), 30 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1488167c9..a50823c01 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2023
-        versionName "0.20.23"
+        versionCode 2024
+        versionName "0.20.24"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt
index 75f277d10..a5fabaf09 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt
@@ -4,6 +4,10 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import com.google.gson.Gson
 import io.realm.Realm
@@ -19,6 +23,7 @@ import org.ole.planet.myplanet.utilities.AndroidDecrypter.Companion.encrypt
 import org.ole.planet.myplanet.utilities.AndroidDecrypter.Companion.generateKey
 import org.ole.planet.myplanet.utilities.Utilities
 
+
 class AddMyHealthActivity : AppCompatActivity() {
     private lateinit var activityAddMyHealthBinding: ActivityAddMyHealthBinding
     lateinit var realm: Realm
@@ -47,6 +52,24 @@ class AddMyHealthActivity : AppCompatActivity() {
             createMyHealth()
             Utilities.toast(this@AddMyHealthActivity, getString(R.string.my_health_saved_successfully))
         }
+        val spinner: Spinner = findViewById(R.id.spn_contact_type)
+
+        val adapter = object : ArrayAdapter<String>(
+            this, R.layout.spinner_item, resources.getStringArray(R.array.contact_type)
+        ) {
+            override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+                val view = super.getView(position, convertView, parent) as TextView
+                return view
+            }
+
+            override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
+                val view = super.getDropDownView(position, convertView, parent) as TextView
+                return view
+            }
+        }
+
+        spinner.adapter = adapter
+
         initViews()
     }
 
diff --git a/app/src/main/res/layout/activity_add_my_health.xml b/app/src/main/res/layout/activity_add_my_health.xml
index b43da97cc..d0d2d4649 100644
--- a/app/src/main/res/layout/activity_add_my_health.xml
+++ b/app/src/main/res/layout/activity_add_my_health.xml
@@ -5,16 +5,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/padding_large"
-    tools:context=".ui.myhealth.AddMyHealthActivity">
+    tools:context=".ui.myhealth.AddMyHealthActivity"
+    android:background="@color/secondary_bg">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/secondary_bg">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:background="@color/secondary_bg">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -24,44 +27,49 @@
                     android:id="@+id/et_fname"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/first_name"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_mname"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/middle_name"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_lname"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/last_name"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
-
             </LinearLayout>
 
             <LinearLayout
@@ -72,7 +80,8 @@
                     android:id="@+id/et_email"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
@@ -80,14 +89,16 @@
                         android:hint="@string/email"
                         android:inputType="textEmailAddress"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor" />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_phone"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
@@ -95,7 +106,8 @@
                         android:hint="@string/phone_number"
                         android:inputType="phone"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -107,28 +119,32 @@
                     android:id="@+id/et_birthplace"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/birth_place"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_birthdate"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/birth_date"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -140,43 +156,48 @@
                     android:id="@+id/et_emergency"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/emergency_contact"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor" />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <Spinner
                     android:id="@+id/spn_contact_type"
+                    style="@style/SpinnerItemStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
-                    android:entries="@array/contact_type"
-                    android:padding="@dimen/padding_normal" />
+                    android:padding="@dimen/padding_large" />
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_contact"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/contact"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor" />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/et_special_need"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:textColorHint="@color/hint_color">
 
                 <EditText
                     android:layout_width="match_parent"
@@ -184,13 +205,15 @@
                     android:hint="@string/special_needs"
                     android:lines="2"
                     android:padding="@dimen/padding_normal"
-                    android:backgroundTint="@color/daynight_textColor"  />
+                    android:backgroundTint="@color/daynight_textColor"
+                    android:textColor="@color/daynight_textColor" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/et_other_need"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:textColorHint="@color/hint_color">
 
                 <EditText
                     android:layout_width="match_parent"
@@ -198,7 +221,8 @@
                     android:hint="@string/other_need"
                     android:lines="2"
                     android:padding="@dimen/padding_normal"
-                    android:backgroundTint="@color/daynight_textColor" />
+                    android:backgroundTint="@color/daynight_textColor"
+                    android:textColor="@color/daynight_textColor" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <Button

From 50c14c44e86a71dcbd8c66b3736f2bcf91775e5a Mon Sep 17 00:00:00 2001
From: Kuljeet Singh Bhengura <47841620+Kuljeet1998@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:16:49 -0400
Subject: [PATCH 5/9] all: smoother feedback translation (fixes #4587) (#4628)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                             | 4 ++--
 .../planet/myplanet/ui/feedback/FeedbackDetailActivity.kt    | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a50823c01..cf7472f53 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2024
-        versionName "0.20.24"
+        versionCode 2025
+        versionName "0.20.25"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/feedback/FeedbackDetailActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/feedback/FeedbackDetailActivity.kt
index d13de41fe..0f29f8d60 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/feedback/FeedbackDetailActivity.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/feedback/FeedbackDetailActivity.kt
@@ -22,6 +22,7 @@ import org.ole.planet.myplanet.model.FeedbackReply
 import org.ole.planet.myplanet.model.RealmFeedback
 import org.ole.planet.myplanet.ui.dashboard.DashboardActivity
 import org.ole.planet.myplanet.ui.feedback.FeedbackDetailActivity.RvFeedbackAdapter.ReplyViewHolder
+import org.ole.planet.myplanet.utilities.LocaleHelper
 import org.ole.planet.myplanet.utilities.TimeUtils.getFormatedDateWithTime
 import java.util.Date
 
@@ -33,6 +34,10 @@ class FeedbackDetailActivity : AppCompatActivity() {
     lateinit var realm: Realm
     private lateinit var rowFeedbackReplyBinding: RowFeedbackReplyBinding
 
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(LocaleHelper.onAttach(base))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         activityFeedbackDetailBinding = ActivityFeedbackDetailBinding.inflate(layoutInflater)

From 77235ad364abca5c8ed549fba68202b3545a69f7 Mon Sep 17 00:00:00 2001
From: Deep Vora <70479785+deeppp15@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:22:48 -0400
Subject: [PATCH 6/9] resources: smoother mylibrary icons (fixes #4526) (#4631)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                      |  4 ++--
 .../planet/myplanet/ui/resources/AdapterResource.kt   | 11 +++++------
 app/src/main/res/layout/row_library.xml               |  1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cf7472f53..71f3108b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2025
-        versionName "0.20.25"
+        versionCode 2026
+        versionName "0.20.26"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/resources/AdapterResource.kt b/app/src/main/java/org/ole/planet/myplanet/ui/resources/AdapterResource.kt
index 5640656e0..a259a71a4 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/resources/AdapterResource.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/resources/AdapterResource.kt
@@ -85,12 +85,11 @@ class AdapterResource(private val context: Context, private var libraryList: Lis
             displayTagCloud(holder.rowLibraryBinding.flexboxDrawable, position)
             holder.itemView.setOnClickListener { openLibrary(libraryList[position]) }
             userModel = UserProfileDbHandler(context).userModel
-            holder.rowLibraryBinding.ivDownloaded.setImageResource(
-                if (libraryList[position]?.isResourceOffline() == true) {
-                    R.drawable.ic_eye
-                } else {
-                    R.drawable.ic_download
-                })
+            if (libraryList[position]?.isResourceOffline() == true) {
+                holder.rowLibraryBinding.ivDownloaded.visibility = View.INVISIBLE
+            } else {
+                holder.rowLibraryBinding.ivDownloaded.visibility = View.VISIBLE
+            }
             holder.rowLibraryBinding.ivDownloaded.contentDescription =
                 if (libraryList[position]?.isResourceOffline() == true) {
                     context.getString(R.string.view)
diff --git a/app/src/main/res/layout/row_library.xml b/app/src/main/res/layout/row_library.xml
index afd952f00..c83647bd3 100644
--- a/app/src/main/res/layout/row_library.xml
+++ b/app/src/main/res/layout/row_library.xml
@@ -75,6 +75,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:src="@drawable/ic_download"
                 android:layout_margin="@dimen/padding_small" />
             <LinearLayout
                 android:id="@+id/ll_rating"

From 47a6ac7e06564e66e410b69cb301baec5e1f0707 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:27:56 -0400
Subject: [PATCH 7/9] all: bump `org.jetbrains:annotations` to 26.0.1 (fixes
 #4644) (#4634)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 71f3108b1..5dca640fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2026
-        versionName "0.20.26"
+        versionCode 2027
+        versionName "0.20.27"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -189,7 +189,7 @@ dependencies {
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'de.rtner:PBKDF2:1.1.4'
     implementation 'org.osmdroid:osmdroid-android:6.1.20'
-    implementation 'org.jetbrains:annotations:26.0.0'
+    implementation 'org.jetbrains:annotations:26.0.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.29'

From f271722a7a18bc7c58fd10ce69d1584581343def Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:33:32 -0400
Subject: [PATCH 8/9] all: bump `com.android.tools.build:gradle` to 8.7.1
 (fixes #4645) (#4635)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle | 4 ++--
 build.gradle     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5dca640fa..b079f756b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2027
-        versionName "0.20.27"
+        versionCode 2028
+        versionName "0.20.28"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/build.gradle b/build.gradle
index ad7cbef75..29aff5033 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.0'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath "io.realm:realm-gradle-plugin:10.19.0"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

From 42c04dbf456b485694784980bdbad4e43b2b90b8 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Tue, 15 Oct 2024 22:46:34 +0300
Subject: [PATCH 9/9] all: smoother logout (fixes #4636) (#4637)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                              |  4 +-
 .../myplanet/service/UserProfileDbHandler.kt  | 43 +++++++++-------
 .../ui/sync/DashboardElementActivity.kt       | 49 +++++++++++--------
 3 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b079f756b..bd5094f5c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2028
-        versionName "0.20.28"
+        versionCode 2029
+        versionName "0.20.29"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/service/UserProfileDbHandler.kt b/app/src/main/java/org/ole/planet/myplanet/service/UserProfileDbHandler.kt
index 621469a78..c1cf2115d 100644
--- a/app/src/main/java/org/ole/planet/myplanet/service/UserProfileDbHandler.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/service/UserProfileDbHandler.kt
@@ -3,6 +3,8 @@ package org.ole.planet.myplanet.service
 import android.content.Context
 import android.content.SharedPreferences
 import io.realm.Realm
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.ole.planet.myplanet.datamanager.DatabaseService
 import org.ole.planet.myplanet.model.RealmMyLibrary
 import org.ole.planet.myplanet.model.RealmOfflineActivity
@@ -15,6 +17,7 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.UUID
+
 class UserProfileDbHandler(context: Context) {
     private val settings: SharedPreferences
     var mRealm: Realm
@@ -56,13 +59,18 @@ class UserProfileDbHandler(context: Context) {
         mRealm.commitTransaction()
     }
 
-    fun onLogout() {
-        if (!mRealm.isInTransaction) {
-            mRealm.beginTransaction()
+    suspend fun onLogout() {
+        withContext(Dispatchers.IO) {
+            val realm = realmService.realmInstance
+            try {
+                realm.executeTransaction {
+                    val offlineActivities = getRecentLogin(it)
+                    offlineActivities?.logoutTime = Date().time
+                }
+            } finally {
+                realm.close()
+            }
         }
-        val offlineActivities = getRecentLogin(mRealm) ?: return
-        offlineActivities.logoutTime = Date().time
-        mRealm.commitTransaction()
     }
 
     fun onDestroy() {
@@ -93,6 +101,7 @@ class UserProfileDbHandler(context: Context) {
             0
         }
     }
+
     fun getLastVisit(m: RealmUserModel): String {
         val realm = Realm.getDefaultInstance()
         realm.beginTransaction()
@@ -107,6 +116,7 @@ class UserProfileDbHandler(context: Context) {
             "No logout record found"
         }
     }
+
     fun setResourceOpenCount(item: RealmMyLibrary) {
         setResourceOpenCount(item, KEY_RESOURCE_OPEN)
     }
@@ -126,9 +136,7 @@ class UserProfileDbHandler(context: Context) {
     }
 
     private fun createResourceUser(model: RealmUserModel?): RealmResourceActivity {
-        val offlineActivities = mRealm.createObject(
-            RealmResourceActivity::class.java, UUID.randomUUID().toString()
-        )
+        val offlineActivities = mRealm.createObject(RealmResourceActivity::class.java, "${UUID.randomUUID()}")
         offlineActivities.user = model?.name
         offlineActivities.parentCode = model?.parentCode
         offlineActivities.createdOn = model?.planetCode
@@ -141,19 +149,20 @@ class UserProfileDbHandler(context: Context) {
                 .equalTo("type", KEY_RESOURCE_OPEN).count()
             return if (count == 0L) "" else "Resource opened $count times."
         }
+
     val maxOpenedResource: String
         get() {
-            val result = mRealm.where(
-                RealmResourceActivity::class.java
-            ).equalTo("user", fullName).equalTo("type", KEY_RESOURCE_OPEN).findAll().where()
-                .distinct("resourceId").findAll()
+            val result = mRealm.where(RealmResourceActivity::class.java)
+                .equalTo("user", fullName).equalTo("type", KEY_RESOURCE_OPEN)
+                .findAll().where().distinct("resourceId").findAll()
             var maxCount = 0L
             var maxOpenedResource = ""
             for (realmResourceActivities in result) {
-                val count =
-                    mRealm.where(RealmResourceActivity::class.java).equalTo("user", fullName)
-                        .equalTo("type", KEY_RESOURCE_OPEN)
-                        .equalTo("resourceId", realmResourceActivities.resourceId).count()
+                val count = mRealm.where(RealmResourceActivity::class.java)
+                    .equalTo("user", fullName)
+                    .equalTo("type", KEY_RESOURCE_OPEN)
+                    .equalTo("resourceId", realmResourceActivities.resourceId).count()
+
                 if (count > maxCount) {
                     maxCount = count
                     maxOpenedResource = "${realmResourceActivities.title}"
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt
index b1736eaa0..62a21a1a2 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt
@@ -19,6 +19,9 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.google.android.material.bottomnavigation.BottomNavigationView
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.ole.planet.myplanet.R
 import org.ole.planet.myplanet.callback.OnRatingChangeListener
 import org.ole.planet.myplanet.service.UserProfileDbHandler
@@ -89,7 +92,7 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
     }
 
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-        goOnline.setVisible(showBetaFeature(Constants.KEY_SYNC, this))
+        goOnline.isVisible = showBetaFeature(Constants.KEY_SYNC, this)
         return super.onPrepareOptionsMenu(menu)
     }
 
@@ -130,7 +133,7 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
                 DrawableCompat.setTintMode(resIcon.mutate(), PorterDuff.Mode.SRC_ATOP)
                 DrawableCompat.setTint(resIcon, ContextCompat.getColor(this, R.color.green))
             }
-            goOnline.setIcon(resIcon)
+            goOnline.icon = resIcon
             Toast.makeText(this, getString(R.string.wifi_is_turned_off_saving_battery_power), Toast.LENGTH_LONG).show()
         } else {
             wifi.setWifiEnabled(true)
@@ -140,7 +143,7 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
                 DrawableCompat.setTintMode(resIcon.mutate(), PorterDuff.Mode.SRC_ATOP)
                 DrawableCompat.setTint(resIcon, ContextCompat.getColor(this, R.color.accent))
             }
-            goOnline.setIcon(resIcon)
+            goOnline.icon = resIcon
         }
     }
 
@@ -160,14 +163,16 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
     }
 
     fun logout() {
-        profileDbHandler.onLogout()
-        settings.edit().putBoolean(Constants.KEY_LOGIN, false).apply()
-        settings.edit().putBoolean(Constants.KEY_NOTIFICATION_SHOWN, false).apply()
-        val loginScreen = Intent(this, LoginActivity::class.java)
-            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(loginScreen)
-        doubleBackToExitPressedOnce = true
-        finish()
+        CoroutineScope(Dispatchers.Main).launch {
+            profileDbHandler.onLogout()
+            settings.edit().putBoolean(Constants.KEY_LOGIN, false).apply()
+            settings.edit().putBoolean(Constants.KEY_NOTIFICATION_SHOWN, false).apply()
+            val loginScreen = Intent(this@DashboardElementActivity, LoginActivity::class.java)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(loginScreen)
+            doubleBackToExitPressedOnce = true
+            finish()
+        }
     }
 
     override fun finish() {
@@ -176,9 +181,7 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
         } else {
             doubleBackToExitPressedOnce = true
             Toast.makeText(this, getString(R.string.press_back_again_to_exit), Toast.LENGTH_SHORT).show()
-            Handler(Looper.getMainLooper()).postDelayed({
-                doubleBackToExitPressedOnce = false
-            }, 2000)
+            Handler(Looper.getMainLooper()).postDelayed({ doubleBackToExitPressedOnce = false }, 2000)
         }
     }
 
@@ -192,15 +195,19 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
         val f = supportFragmentManager.findFragmentById(R.id.fragment_container)
         val fragmentTag = f?.tag
         if (f is CoursesFragment) {
-            if ("shelf" == fragmentTag) navigationView.menu.findItem(R.id.menu_mycourses)
-                .setChecked(true) else navigationView.menu.findItem(R.id.menu_courses)
-                .setChecked(true)
+            if ("shelf" == fragmentTag) {
+                navigationView.menu.findItem(R.id.menu_mycourses).isChecked = true
+            } else {
+                navigationView.menu.findItem(R.id.menu_courses).isChecked = true
+            }
         } else if (f is ResourcesFragment) {
-            if ("shelf" == fragmentTag) navigationView.menu.findItem(R.id.menu_mylibrary)
-                .setChecked(true) else navigationView.menu.findItem(R.id.menu_library)
-                .setChecked(true)
+            if ("shelf" == fragmentTag) {
+                navigationView.menu.findItem(R.id.menu_mylibrary).isChecked = true
+            } else {
+                navigationView.menu.findItem(R.id.menu_library).isChecked = true
+            }
         } else if (f is DashboardFragment) {
-            navigationView.menu.findItem(R.id.menu_home).setChecked(true)
+            navigationView.menu.findItem(R.id.menu_home).isChecked = true
         }
     }