Merge branch 'master' into 4663-illegalstateexception

open-learning-exchange · Oct 18, 2024 · af66c1b · af66c1b
2 parents 98abee4 + 21ca774
commit af66c1b
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 9 deletions.
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
@@ -296,7 +296,7 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), 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/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/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

diff --git 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" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
@@ -30,7 +31,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" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -644,6 +644,7 @@
     <string name="are_you_sure_you_want_to_leave_this_course">هل أنت متأكد أنك تريد مغادرة هذه الدورة؟</string>
     <string name="success_you_have_added_the_following_courses">تمت الإضافة بنجاح! لقد أضفت الدورات التالية:\n\n</string>
     <string name="return_to_the_home_tab_to_access_mycourses">\n\nعودة إلى علامة التبويب الرئيسية للوصول إلى "دوراتي".\n</string>
+    <string name="go_to_mycourses">اذهب إلى دوراتي</string>
     <string name="and">"و "</string>
     <string name="more_course_s">" دورة (دورات) أخرى…\n"</string>
     <string name="retake_test">إعادة الاختبار [%d]</string>
@@ -1197,5 +1198,6 @@
     <string name="most_opened_resource">أكثر مورد تم فتحه : </string>
     <string name="number_of_resources_opened">عدد الموارد المفتوحة : </string>
     <string name="number_of_visits">عدد الزيارات</string>
+    <string name="kindly_enter_reply_message">يرجى إدخال رسالة الرد</string>
 
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -644,6 +644,7 @@
     <string name="are_you_sure_you_want_to_leave_this_course">¿Estás seguro de que quieres abandonar este curso?</string>
     <string name="success_you_have_added_the_following_courses">¡Éxito! Has añadido los siguientes cursos:\n\n</string>
     <string name="return_to_the_home_tab_to_access_mycourses">\n\nVuelve a la pestaña de inicio para acceder a misCursos.\n</string>
+    <string name="go_to_mycourses"> Ir a misCursos</string>
     <string name="and">"Y "</string>
     <string name="more_course_s">" más curso(s)…\n"</string>
     <string name="retake_test">Volver a tomar el test [%d]</string>
@@ -1197,5 +1198,6 @@
     <string name="most_opened_resource">Recurso Más Abierto : </string>
     <string name="number_of_resources_opened">Número de Recursos Abiertos : </string>
     <string name="number_of_visits">Número de Visitas</string>
+    <string name="kindly_enter_reply_message">Por favor, ingrese el mensaje de respuesta</string>
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -644,6 +644,7 @@
     <string name="are_you_sure_you_want_to_leave_this_course">Êtes-vous sûr de vouloir quitter ce cours ?</string>
     <string name="success_you_have_added_the_following_courses">Succès ! Vous avez ajouté les cours suivants:\n\n</string>
     <string name="return_to_the_home_tab_to_access_mycourses">\n\n Retournez à l\'onglet Accueil pour accéder à Mes cours.\n</string>
+    <string name="go_to_mycourses">Aller à mesCours</string>
     <string name="and">Et </string>
     <string name="more_course_s">autre(s) cours…\n</string>
     <string name="retake_test">Repasser le test [%d]</string>
@@ -1197,5 +1198,6 @@
     <string name="most_opened_resource">Ressource La Plus Consultée : </string>
     <string name="number_of_resources_opened">Nombre de Ressources Ouvertes : </string>
     <string name="number_of_visits">Nombre de Visites</string>
+    <string name="kindly_enter_reply_message">Veuillez entrer le message de réponse</string>
 
 </resources>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
@@ -644,6 +644,7 @@
     <string name="are_you_sure_you_want_to_leave_this_course">के तपाई यो कोर्स छोड्न चाहनुहुन्छ भनेर पक्का हुनुहुन्छ?</string>
     <string name="success_you_have_added_the_following_courses">सफलता! तपाइँले निम्नलिखित पाठ्यक्रमहरू थपेका छौं:\n\n</string>
     <string name="return_to_the_home_tab_to_access_mycourses">\n\n वापतै गृह ट्याबमा जानुहोस् तपाइँको पाठ्यक्रमहरू पहुँच गर्नको लागि।\n</string>
+    <string name="go_to_mycourses">मेरो कोर्सहरूमा जानुहोस्</string>
     <string name="and">"र "</string>
     <string name="more_course_s">" थप पाठ्यक्रमहरू…\n"</string>
     <string name="retake_test">पुन: टेस्ट दिनुहोस् [%d]</string>
@@ -1197,5 +1198,6 @@
     <string name="most_opened_resource">सबैभन्दा धेरै खोलेको स्रोत : </string>
     <string name="number_of_resources_opened">खोलिएका स्रोतहरूको संख्या : </string>
     <string name="number_of_visits">भ्रमणहरूको संख्या</string>
+    <string name="kindly_enter_reply_message">कृपया प्रतिक्रिया सन्देश प्रवेश गर्नुहोस्</string>
 
 </resources>
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
@@ -644,6 +644,7 @@
     <string name="are_you_sure_you_want_to_leave_this_course">Ma hubtaa inaad rabto inaad ka baxdo koorsadan?</string>
     <string name="success_you_have_added_the_following_courses">Guul! Waxaad ku daraysay kursiyadaan soo socota:\n\n</string>
     <string name="return_to_the_home_tab_to_access_mycourses">\n\n Ku noqo tabka Home si aad uga heli karto myCourseska.\n</string>
+    <string name="go_to_mycourses">U tag koorsooyinkayga</string>
     <string name="and">"Iyo "</string>
     <string name="more_course_s">" kursi dheer…\n"</string>
     <string name="retake_test">Dib u habayn Imtixaanka [%d]</string>
@@ -1197,5 +1198,6 @@
     <string name="most_opened_resource">Kheyraadka Ugu Badan ee La Furay : </string>
     <string name="number_of_resources_opened">Tirada Kheyraadka La Furay : </string>
     <string name="number_of_visits">Tirada Booqashooyinka</string>
+    <string name="kindly_enter_reply_message">Fadlan geli farriinta jawaabta</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -644,6 +644,7 @@
     <string name="are_you_sure_you_want_to_leave_this_course">Are you sure you want to leave this course?</string>
     <string name="success_you_have_added_the_following_courses">Success! You have added the following courses:\n\n</string>
     <string name="return_to_the_home_tab_to_access_mycourses">\n\n Return to the Home tab to access myCourses.\n</string>
+    <string name="go_to_mycourses">Go To MyCourses</string>
     <string name="and">"And "</string>
     <string name="more_course_s">" more course(s)...\n"</string>
     <string name="retake_test">Retake Test [%d]</string>
@@ -1197,5 +1198,6 @@
     <string name="most_opened_resource">Most Opened Resource : </string>
     <string name="number_of_resources_opened">Number of Resources Opened : </string>
     <string name="number_of_visits">Number of Visits</string>
+    <string name="kindly_enter_reply_message">Kindly enter reply message</string>
 
 </resources>