From e33a21893645fa295aeb4a53903e0efffc6592b8 Mon Sep 17 00:00:00 2001 From: Kuljeet Singh Bhengura <47841620+Kuljeet1998@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:19:10 -0400 Subject: [PATCH 1/4] all: smoother feedback messages (fixes #4630) (#4633) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../ole/planet/myplanet/ui/feedback/FeedbackDetailActivity.kt | 2 +- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-ne/strings.xml | 1 + app/src/main/res/values-so/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8c8ca7aff..06357c8e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2042 - versionName "0.20.42" + versionCode 2043 + versionName "0.20.43" 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 0f29f8d60..de398b80d 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 @@ -69,7 +69,7 @@ class FeedbackDetailActivity : AppCompatActivity() { } activityFeedbackDetailBinding.replyFeedback.setOnClickListener { if (TextUtils.isEmpty(activityFeedbackDetailBinding.feedbackReplyEditText.text.toString().trim { it <= ' ' })) { - activityFeedbackDetailBinding.feedbackReplyEditText.error = "Kindly enter reply message" + activityFeedbackDetailBinding.feedbackReplyEditText.error = getString(R.string.kindly_enter_reply_message) } else { val message = activityFeedbackDetailBinding.feedbackReplyEditText.text.toString().trim { it <= ' ' } val `object` = JsonObject() diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index a93a01ee0..2aeee64b7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1197,5 +1197,6 @@ أكثر مورد تم فتحه : عدد الموارد المفتوحة : عدد الزيارات + يرجى إدخال رسالة الرد diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5df18587b..73367f283 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1197,5 +1197,6 @@ Recurso Más Abierto : Número de Recursos Abiertos : Número de Visitas + Por favor, ingrese el mensaje de respuesta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9dcca108b..7e28ae6e1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1197,5 +1197,6 @@ Ressource La Plus Consultée : Nombre de Ressources Ouvertes : Nombre de Visites + Veuillez entrer le message de réponse diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 861913b4b..901c29849 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -1197,5 +1197,6 @@ सबैभन्दा धेरै खोलेको स्रोत : खोलिएका स्रोतहरूको संख्या : भ्रमणहरूको संख्या + कृपया प्रतिक्रिया सन्देश प्रवेश गर्नुहोस् diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index c8d0cf280..c4d1c7fc3 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -1197,5 +1197,6 @@ Kheyraadka Ugu Badan ee La Furay : Tirada Kheyraadka La Furay : Tirada Booqashooyinka + Fadlan geli farriinta jawaabta diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5082e3ade..3bfaf58b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1197,5 +1197,6 @@ Most Opened Resource : Number of Resources Opened : Number of Visits + Kindly enter reply message From 85f69b92cb8a1f8d36cb640dbc82a89389fd2644 Mon Sep 17 00:00:00 2001 From: Kuljeet Singh Bhengura <47841620+Kuljeet1998@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:27:02 -0400 Subject: [PATCH 2/4] resources: smoother upload (fixes #4651) (#4667) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../myplanet/ui/resources/AddResourceActivity.kt | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 06357c8e3..51ff961df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2043 - versionName "0.20.43" + versionCode 2044 + versionName "0.20.44" 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/AddResourceActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/resources/AddResourceActivity.kt index 6c521c820..164226e6a 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/resources/AddResourceActivity.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/resources/AddResourceActivity.kt @@ -15,10 +15,12 @@ import org.ole.planet.myplanet.R import org.ole.planet.myplanet.databinding.ActivityAddResourceBinding import org.ole.planet.myplanet.datamanager.DatabaseService import org.ole.planet.myplanet.model.RealmMyLibrary +import org.ole.planet.myplanet.model.RealmMyLibrary.Companion.createFromResource +import org.ole.planet.myplanet.model.RealmRemovedLog.Companion.onAdd import org.ole.planet.myplanet.model.RealmUserModel import org.ole.planet.myplanet.service.UserProfileDbHandler import org.ole.planet.myplanet.utilities.CheckboxListView -import org.ole.planet.myplanet.utilities.Utilities +import org.ole.planet.myplanet.utilities.Utilities.toast import java.util.Calendar import java.util.UUID @@ -71,13 +73,17 @@ class AddResourceActivity : AppCompatActivity() { private fun saveResource() { val title = activityAddResourceBinding.etTitle.text.toString().trim { it <= ' ' } if (!validate(title)) return + val id = UUID.randomUUID().toString() mRealm.executeTransactionAsync(Realm.Transaction { realm: Realm -> - val id = UUID.randomUUID().toString() val resource = realm.createObject(RealmMyLibrary::class.java, id) resource.title = title createResource(resource, id) }, Realm.Transaction.OnSuccess { - Utilities.toast(this@AddResourceActivity, getString(R.string.resource_saved_successfully)) + val myObject = mRealm.where(RealmMyLibrary::class.java) + .equalTo("resourceId", id).findFirst() + createFromResource(myObject, mRealm, userModel?.id) + onAdd(mRealm, "resources", userModel?.id, id) + toast(this@AddResourceActivity, getString(R.string.added_to_my_library)) finish() }) } @@ -110,11 +116,11 @@ class AddResourceActivity : AppCompatActivity() { return false } if (levels?.isEmpty() == true) { - Utilities.toast(this, getString(R.string.level_is_required)) + toast(this, getString(R.string.level_is_required)) return false } if (subjects?.isEmpty() == true) { - Utilities.toast(this, getString(R.string.subject_is_required)) + toast(this, getString(R.string.subject_is_required)) return false } return true From af8a6f691554ce93fb290b0ab1f83482dead5908 Mon Sep 17 00:00:00 2001 From: Deep Vora <70479785+deeppp15@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:20:36 -0400 Subject: [PATCH 3/4] teams: smoother team edit dark mode (fixes #4665) (#4669) Co-authored-by: dogi --- app/build.gradle | 4 ++-- app/src/main/res/layout/alert_create_team.xml | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 51ff961df..bb8e8892b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2044 - versionName "0.20.44" + versionCode 2045 + versionName "0.20.45" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/res/layout/alert_create_team.xml b/app/src/main/res/layout/alert_create_team.xml index a7817fac7..dad417670 100644 --- a/app/src/main/res/layout/alert_create_team.xml +++ b/app/src/main/res/layout/alert_create_team.xml @@ -16,7 +16,8 @@ android:layout_height="match_parent" android:padding="@dimen/padding_normal" android:textColorHint="@color/hint_color" - android:textColor="@color/daynight_textColor" /> + android:textColor="@color/daynight_textColor" + android:backgroundTint="@color/hint_color" /> + android:textColor="@color/daynight_textColor" + android:backgroundTint="@color/hint_color" /> Date: Fri, 18 Oct 2024 15:25:17 -0400 Subject: [PATCH 4/4] courses: smoother mycourses joining translations (fixes #4661) (#4670) Co-authored-by: Gideon Okuro Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../org/ole/planet/myplanet/ui/courses/CoursesFragment.kt | 2 +- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-ne/strings.xml | 1 + app/src/main/res/values-so/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bb8e8892b..effbb2d3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2045 - versionName "0.20.45" + versionCode 2046 + versionName "0.20.46" 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/CoursesFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/courses/CoursesFragment.kt index ff9e821d0..337c7ffbe 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/courses/CoursesFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/courses/CoursesFragment.kt @@ -296,7 +296,7 @@ class CoursesFragment : BaseRecyclerFragment(), OnCourseItemSele msg += getString(R.string.return_to_the_home_tab_to_access_mycourses) builder.setMessage(msg) builder.setCancelable(true) - .setPositiveButton("Go to myCourses") { dialog: DialogInterface, _: Int -> + .setPositiveButton(R.string.go_to_mycourses) { dialog: DialogInterface, _: Int -> if (userModel?.id?.startsWith("guest") == true) { DialogUtils.guestDialog(requireContext()) } else { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 2aeee64b7..9bc90cf84 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -644,6 +644,7 @@ هل أنت متأكد أنك تريد مغادرة هذه الدورة؟ تمت الإضافة بنجاح! لقد أضفت الدورات التالية:\n\n \n\nعودة إلى علامة التبويب الرئيسية للوصول إلى "دوراتي".\n + اذهب إلى دوراتي "و " " دورة (دورات) أخرى…\n" إعادة الاختبار [%d] diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 73367f283..d26301b30 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -644,6 +644,7 @@ ¿Estás seguro de que quieres abandonar este curso? ¡Éxito! Has añadido los siguientes cursos:\n\n \n\nVuelve a la pestaña de inicio para acceder a misCursos.\n + Ir a misCursos "Y " " más curso(s)…\n" Volver a tomar el test [%d] diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7e28ae6e1..b9ebb99f8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -644,6 +644,7 @@ Êtes-vous sûr de vouloir quitter ce cours ? Succès ! Vous avez ajouté les cours suivants:\n\n \n\n Retournez à l\'onglet Accueil pour accéder à Mes cours.\n + Aller à mesCours Et autre(s) cours…\n Repasser le test [%d] diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 901c29849..9b21823f2 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -644,6 +644,7 @@ के तपाई यो कोर्स छोड्न चाहनुहुन्छ भनेर पक्का हुनुहुन्छ? सफलता! तपाइँले निम्नलिखित पाठ्यक्रमहरू थपेका छौं:\n\n \n\n वापतै गृह ट्याबमा जानुहोस् तपाइँको पाठ्यक्रमहरू पहुँच गर्नको लागि।\n + मेरो कोर्सहरूमा जानुहोस् "र " " थप पाठ्यक्रमहरू…\n" पुन: टेस्ट दिनुहोस् [%d] diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index c4d1c7fc3..4e9249584 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -644,6 +644,7 @@ Ma hubtaa inaad rabto inaad ka baxdo koorsadan? Guul! Waxaad ku daraysay kursiyadaan soo socota:\n\n \n\n Ku noqo tabka Home si aad uga heli karto myCourseska.\n + U tag koorsooyinkayga "Iyo " " kursi dheer…\n" Dib u habayn Imtixaanka [%d] diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3bfaf58b4..da05efbb1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -644,6 +644,7 @@ Are you sure you want to leave this course? Success! You have added the following courses:\n\n \n\n Return to the Home tab to access myCourses.\n + Go To MyCourses "And " " more course(s)...\n" Retake Test [%d]