diff --git a/app/build.gradle b/app/build.gradle index 390e4a286..d97964468 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 21 targetSdkVersion 34 - versionCode 1200 - versionName "0.12.00" + versionCode 1201 + versionName "0.12.1" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.java b/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.java index 91e25908e..a24291f95 100644 --- a/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.java @@ -59,6 +59,12 @@ public static void showNoData(View v, int count) { ((TextView) v).setText(R.string.no_data_available_please_check_and_try_again); } + public static void showNoFilter(View v, int count) { + if (v == null) return; + v.setVisibility(count == 0 ? View.VISIBLE : View.GONE); + ((TextView) v).setText(R.string.no_course_matched_filter); + } + public abstract int getLayout(); public abstract RecyclerView.Adapter getAdapter(); diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseFragment.java index c3e0cc957..f289fe1a6 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseFragment.java @@ -180,6 +180,7 @@ public void onItemSelected(AdapterView adapterView, View view, int i, long l) gradeLevel = spnGrade.getSelectedItem().toString().equals("All") ? "" : spnGrade.getSelectedItem().toString(); subjectLevel = spnSubject.getSelectedItem().toString().equals("All") ? "" : spnSubject.getSelectedItem().toString(); adapterCourses.setCourseList(filterCourseByTag(etSearch.getText().toString(), searchTags)); + showNoFilter(tvMessage, adapterCourses.getItemCount()); } @Override diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ab32adfaa..9ff61e262 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -956,5 +956,6 @@ عرض الويب تكوينات الخادم غير صالحة إعادة ضبط التاريخ - + لا توجد دورات تطابق الفلتر + \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b2964bcf7..14516dd9e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -961,5 +961,6 @@ vista web Configuraciones de servidor no válidas Restablecer fecha + Ningún curso coincide con el filtro diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index bef449f1e..71308ec62 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -961,5 +961,6 @@ vue web Configurations de serveur invalides Réinitialisation des dates + Aucun cours ne correspond au filtre diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index fe42b04ce..a142ea8a1 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -961,5 +961,6 @@ वेब दृश्य अमान्य सर्भर विन्यास मिति रिसेट + कुनै पनि पाठ्यक्रम मेल खाँदैन \ No newline at end of file diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index b96917d9b..8b57930a4 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -950,5 +950,6 @@ barashada webka Dhamaan Suurtagal ah oo Serveryaasha ah Dib u habeynta taariikhda + Ma jiro koorsooyin u dhigma filtarrada \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aff175618..aae2644b8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -685,6 +685,7 @@ "Select resource to open : " Shared to community No data available, please check and try again. + No courses matched filter Added to my library Added to my courses Do you want to stay online?