Merge branch 'master' into 5111-button-text-colors-should-be-consiste…

…nt-all-over-the-app
open-learning-exchange · Jan 23, 2025 · bc3575a · bc3575a
2 parents dd22b40 + c911e7c
commit bc3575a
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -200,7 +200,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.1'
+    implementation 'org.jetbrains:annotations:26.0.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.29'

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatHistoryListAdapter.kt b/app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatHistoryListAdapter.kt
@@ -2,8 +2,10 @@ package org.ole.planet.myplanet.ui.chat
 
 import android.app.AlertDialog
 import android.content.Context
+import android.graphics.drawable.ColorDrawable
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.gson.Gson
@@ -158,6 +160,10 @@ class ChatHistoryListAdapter(var context: Context, private var chatHistory: List
                     dialog?.dismiss()
                 }
                 dialog = builder.create()
+
+                val backgroundColor = ContextCompat.getColor(context, R.color.daynight_grey)
+                dialog.window?.setBackgroundDrawable(ColorDrawable(backgroundColor))
+
                 dialog.show()
             }
         }

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/news/ExpandableListAdapter.kt b/app/src/main/java/org/ole/planet/myplanet/ui/news/ExpandableListAdapter.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseExpandableListAdapter
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import org.ole.planet.myplanet.R
 
 class ExpandableListAdapter(private val context: Context, private val expandableTitleList: List<String>, private val expandableDetailList: HashMap<String, List<String>>) : BaseExpandableListAdapter() {
@@ -27,6 +28,8 @@ class ExpandableListAdapter(private val context: Context, private val expandable
         }
         val expandedListTextView = reusedView?.findViewById<View>(R.id.expandedListItem) as TextView
         expandedListTextView.text = expandedListText
+        reusedView.setBackgroundColor(ContextCompat.getColor(parent?.context!!, R.color.multi_select_grey))
+        expandedListTextView.setTextColor(ContextCompat.getColor(parent.context, R.color.daynight_textColor))
         return reusedView
     }
 
@@ -56,6 +59,7 @@ class ExpandableListAdapter(private val context: Context, private val expandable
         val listTitleTextView = reusedView?.findViewById<View>(R.id.listTitle) as TextView
         listTitleTextView.setTypeface(null, Typeface.BOLD)
         listTitleTextView.text = listTitle
+        listTitleTextView.setTextColor(ContextCompat.getColor(parent.context, R.color.daynight_textColor))
         return reusedView
     }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/sync/LoginActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/sync/LoginActivity.kt
@@ -194,10 +194,6 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
                 false
             }
             setUpLanguageButton()
-            if (defaultPref.getBoolean("saveUsernameAndPassword", false)) {
-                activityLoginBinding.inputName.setText(settings.getString(getString(R.string.login_user), ""))
-                activityLoginBinding.inputPassword.setText(settings.getString(getString(R.string.login_password), ""))
-            }
             if (NetworkUtils.isNetworkConnected) {
                 service.syncPlanetServers(mRealm) { success: String? ->
                     toast(this, success)

diff --git a/app/src/main/res/layout/chat_share_dialog.xml b/app/src/main/res/layout/chat_share_dialog.xml
@@ -11,7 +11,7 @@
         android:layout_marginStart="10dp"
         android:text="@string/share_chat"
         android:layout_marginTop="10dp"
-        android:textColor="@color/md_black_1000"
+        android:textColor="@color/daynight_textColor"
         android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -164,7 +164,6 @@
     <string name="get_started">البدء</string>
     <string name="enter_password">أدخل كلمة المرور</string>
     <string name="managerial_login">تسجيل الدخول كمدير</string>
-    <string name="save_username_and_password">حفظ اسم المستخدم وكلمة المرور</string>
     <string name="year">السنة</string>
     <string name="publisher">الناشر</string>
     <string name="link_to_license">رابط الترخيص</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -163,8 +163,6 @@
     <string name="search_user">Buscar usuario</string>
     <string name="get_started">EMPEZAR</string>
     <string name="enter_password">Ingresar contraseña</string>
-    <string name="managerial_login">Inicio de sesión del administrador</string>
-    <string name="save_username_and_password">Guardar nombre de usuario y contraseña</string>
     <string name="year">Año</string>
     <string name="publisher">Editor</string>
     <string name="link_to_license">Enlace a la licencia</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -164,7 +164,6 @@
     <string name="get_started">COMMENCER</string>
     <string name="enter_password">Entrer le mot de passe</string>
     <string name="managerial_login">Connexion en tant que gestionnaire</string>
-    <string name="save_username_and_password">Enregistrer le nom d\'utilisateur et le mot de passe</string>
     <string name="year">Année</string>
     <string name="publisher">Éditeur</string>
     <string name="link_to_license">Lien vers la licence</string>

diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
@@ -164,7 +164,6 @@
     <string name="get_started">सुरु गर्नुहोस्</string>
     <string name="enter_password">पासवर्ड प्रविष्ट गर्नुहोस्</string>
     <string name="managerial_login">प्रबन्धक लगइन</string>
-    <string name="save_username_and_password">प्रयोगकर्तानाम र पासवर्ड सुरक्षित गर्नुहोस्</string>
     <string name="year">वर्ष</string>
     <string name="publisher">प्रकाशक</string>
     <string name="link_to_license">लाइसेन्समा लिङ्क</string>

diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
@@ -164,7 +164,6 @@
     <string name="get_started">BILAAB</string>
     <string name="enter_password">Geli Password</string>
     <string name="managerial_login">Maareeyaha Soo gal</string>
-    <string name= "save_username_and_password">Keydi magaca isticmaalaha iyo erayga sirta ah</string>
     <string name="year">Sannad</string>
     <string name="publisher">Daabace</string>
     <string name="link_to_license">Link to shatiga</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -164,7 +164,6 @@
     <string name="get_started">GET STARTED</string>
     <string name="enter_password">Enter Password</string>
     <string name="managerial_login">Manager Login</string>
-    <string name="save_username_and_password">save username and password</string>
     <string name="year">Year</string>
     <string name="publisher">Publisher</string>
     <string name="link_to_license">Link to license</string>

diff --git a/app/src/main/res/xml/pref.xml b/app/src/main/res/xml/pref.xml
@@ -3,10 +3,6 @@
     <Preference
         android:key="app_language"
         android:title="@string/language" />
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="saveUsernameAndPassword"
-        android:title="@string/save_username_and_password" />
     <Preference
         android:key="dark_mode"
         android:title="@string/dark_mode" />