From ea6c5b799c982619464102c4d152e9fdd3291ec3 Mon Sep 17 00:00:00 2001 From: Deep Vora <70479785+deeppp15@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:54:09 -0500 Subject: [PATCH 1/7] resources: smoother list details (fixes #4860) (#4867) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../org/ole/planet/myplanet/ui/resources/AdapterResource.kt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f54d2cf864..e5fb1900b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2135 - versionName "0.21.35" + versionCode 2136 + versionName "0.21.36 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 a259a71a4a..e38f8b7491 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 @@ -72,6 +72,10 @@ class AdapterResource(private val context: Context, private var libraryList: Lis holder.bind() holder.rowLibraryBinding.title.text = libraryList[position]?.title setMarkdownText(holder.rowLibraryBinding.description, libraryList[position]?.description!!) + holder.rowLibraryBinding.description.setOnClickListener { + val library = libraryList[position] + openLibrary(library) + } holder.rowLibraryBinding.timesRated.text = context.getString(R.string.num_total, libraryList[position]?.timesRated) holder.rowLibraryBinding.checkbox.isChecked = selectedItems.contains(libraryList[position]) holder.rowLibraryBinding.checkbox.contentDescription = "${context.getString(R.string.selected)} ${libraryList[position]?.title}" From 05df61471fb4c2d9d3592c80004577d12d814444 Mon Sep 17 00:00:00 2001 From: Avinash Sharma <133222313+Avinash-Codes@users.noreply.github.com> Date: Sat, 14 Dec 2024 01:29:01 +0530 Subject: [PATCH 2/7] all: smoother guests navigation (fixes #4863) (#4869) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../ole/planet/myplanet/ui/sync/DashboardElementActivity.kt | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e5fb1900b6..a6db796229 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2136 - versionName "0.21.36 + versionCode 2137 + versionName "0.21.37" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true 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 d6e2042da8..3198454964 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 @@ -64,11 +64,7 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack 4 -> openEnterpriseFragment() 3 -> openCallFragment(TeamFragment(), "survey") 5 -> { - if (profileDbHandler.userModel?.isGuest() == true) { - showGuestUserDialog() - } else { - openCallFragment(CommunityTabFragment(), "community") - } + openCallFragment(CommunityTabFragment(), "community") } } } From ec65ffbc69293a7c877e4baaeb2cdb0390a7b44b Mon Sep 17 00:00:00 2001 From: Avinash Sharma <133222313+Avinash-Codes@users.noreply.github.com> Date: Sat, 14 Dec 2024 01:45:20 +0530 Subject: [PATCH 3/7] login: smoother avatar check (fixes #4872) (#4876) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../org/ole/planet/myplanet/base/BaseContainerFragment.kt | 4 +--- .../ole/planet/myplanet/base/BaseContainerFragment.kt.lite | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a6db796229..6d45ec3f81 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2137 - versionName "0.21.37" + versionCode 2138 + versionName "0.21.38" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt b/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt index f9b8db427b..999d0b9662 100644 --- a/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt @@ -77,9 +77,7 @@ abstract class BaseContainerFragment : BaseResourceFragment() { val url = Utilities.getUrl(library) if (!FileUtils.checkFileExist(url) && !TextUtils.isEmpty(url)) urls.add(url) } - if (urls.isNotEmpty()) startDownload(urls) else Utilities.toast( - activity, getString(R.string.no_images_to_download) - ) + if (urls.isNotEmpty()) startDownload(urls) } fun initRatingView(type: String?, id: String?, title: String?, listener: OnRatingChangeListener?) { timesRated = requireView().findViewById(R.id.times_rated) diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt.lite b/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt.lite index 2b983ca27f..385b2c0c8a 100644 --- a/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt.lite +++ b/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt.lite @@ -77,9 +77,7 @@ abstract class BaseContainerFragment : BaseResourceFragment() { val url = Utilities.getUrl(library) if (!FileUtils.checkFileExist(url) && !TextUtils.isEmpty(url)) urls.add(url) } - if (urls.isNotEmpty()) startDownload(urls) else Utilities.toast( - activity, getString(R.string.no_images_to_download) - ) + if (urls.isNotEmpty()) startDownload(urls) } fun initRatingView(type: String?, id: String?, title: String?, listener: OnRatingChangeListener?) { timesRated = requireView().findViewById(R.id.times_rated) From 8cd3f2e5ea3f5617d33aa58488fd86ea09e9141b Mon Sep 17 00:00:00 2001 From: Avinash Sharma <133222313+Avinash-Codes@users.noreply.github.com> Date: Sat, 14 Dec 2024 01:52:49 +0530 Subject: [PATCH 4/7] login: smoother earth check (fixes #4875) (#4877) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../main/java/org/ole/planet/myplanet/datamanager/Service.kt | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6d45ec3f81..31e66973c2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2138 - versionName "0.21.38" + versionCode 2139 + versionName "0.21.39" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/org/ole/planet/myplanet/datamanager/Service.kt b/app/src/main/java/org/ole/planet/myplanet/datamanager/Service.kt index de64caf55d..18a2b916af 100644 --- a/app/src/main/java/org/ole/planet/myplanet/datamanager/Service.kt +++ b/app/src/main/java/org/ole/planet/myplanet/datamanager/Service.kt @@ -307,7 +307,6 @@ class Service(private val context: Context) { }) { error: Throwable -> realm.close() error.printStackTrace() - callback.onSuccess("Unable to connect to planet earth") } } } @@ -315,7 +314,6 @@ class Service(private val context: Context) { override fun onFailure(call: Call, t: Throwable) { realm.close() - callback.onSuccess("Unable to connect to planet earth") } }) } From f3c7b3093ed5b02642f26eb0342af92ac3a3d2e3 Mon Sep 17 00:00:00 2001 From: Avinash Sharma <133222313+Avinash-Codes@users.noreply.github.com> Date: Sat, 14 Dec 2024 02:05:59 +0530 Subject: [PATCH 5/7] login: smoother permissions check (fixes #4873) (#4878) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../java/org/ole/planet/myplanet/base/PermissionActivity.kt | 4 +--- .../org/ole/planet/myplanet/base/PermissionActivity.kt.lite | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 31e66973c2..f1fe17370b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2139 - versionName "0.21.39" + versionCode 2140 + versionName "0.21.40" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt b/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt index 5d516fd5b8..f623c37051 100644 --- a/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt +++ b/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt @@ -83,11 +83,9 @@ abstract class PermissionActivity : AppCompatActivity() { permissions.add(Manifest.permission.READ_EXTERNAL_STORAGE) } } - if (permissions.isNotEmpty()) { + if (permissions.isNotEmpty() && !checkPermission(Manifest.permission.RECORD_AUDIO) &&!checkPermission(Manifest.permission.CAMERA)) { val permissionsArray = permissions.toTypedArray() ActivityCompat.requestPermissions(this, permissionsArray, PERMISSION_REQUEST_CODE_FILE) - } else { - Toast.makeText(this, R.string.permissions_granted, Toast.LENGTH_SHORT).show() } } diff --git a/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt.lite index 4229f08651..97ccedad8d 100644 --- a/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt.lite +++ b/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt.lite @@ -83,11 +83,9 @@ abstract class PermissionActivity : AppCompatActivity() { permissions.add(Manifest.permission.READ_EXTERNAL_STORAGE) } } - if (permissions.isNotEmpty()) { + if (permissions.isNotEmpty() && !checkPermission(Manifest.permission.RECORD_AUDIO) &&!checkPermission(Manifest.permission.CAMERA)) { val permissionsArray = permissions.toTypedArray() ActivityCompat.requestPermissions(this, permissionsArray, PERMISSION_REQUEST_CODE_FILE) - } else { - Toast.makeText(this, R.string.permissions_granted, Toast.LENGTH_SHORT).show() } } From aab286bde1a5d5a7d0dab9bcd611f577b07a039d Mon Sep 17 00:00:00 2001 From: Avinash Sharma <133222313+Avinash-Codes@users.noreply.github.com> Date: Wed, 18 Dec 2024 00:34:37 +0530 Subject: [PATCH 6/7] login: smoother mode handling (fixes #4879) (#4882) Co-authored-by: dogi Co-authored-by: Gideon Okuro --- app/build.gradle | 4 +- .../ole/planet/myplanet/ui/SettingActivity.kt | 77 ++++++++++++------ .../planet/myplanet/ui/sync/LoginActivity.kt | 5 ++ app/src/main/res/drawable/moon_24dp.png | Bin 0 -> 286 bytes app/src/main/res/drawable/moon_35.png | Bin 0 -> 408 bytes app/src/main/res/drawable/sun_24dp.png | Bin 0 -> 341 bytes app/src/main/res/drawable/sun_35.png | Bin 0 -> 427 bytes app/src/main/res/drawable/white_moon_24dp.png | Bin 0 -> 309 bytes .../res/layout-large-land/activity_login.xml | 15 +++- .../main/res/layout-night/activity_login.xml | 18 +++- .../res/layout-normal-land/activity_login.xml | 15 +++- .../res/layout-xlarge-land/activity_login.xml | 13 +++ app/src/main/res/layout/activity_login.xml | 18 +++- .../main/res/layout/custom_dialog_layout.xml | 21 +++++ 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 + 19 files changed, 154 insertions(+), 37 deletions(-) create mode 100644 app/src/main/res/drawable/moon_24dp.png create mode 100644 app/src/main/res/drawable/moon_35.png create mode 100644 app/src/main/res/drawable/sun_24dp.png create mode 100644 app/src/main/res/drawable/sun_35.png create mode 100644 app/src/main/res/drawable/white_moon_24dp.png create mode 100644 app/src/main/res/layout/custom_dialog_layout.xml diff --git a/app/build.gradle b/app/build.gradle index f1fe17370b..692cb22441 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2140 - versionName "0.21.40" + versionCode 2141 + versionName "0.21.41" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/SettingActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/SettingActivity.kt index 5a7f192220..68e8ac05f1 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/SettingActivity.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/SettingActivity.kt @@ -10,8 +10,10 @@ import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter +import android.widget.ListView import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.app.AppCompatDelegate import androidx.core.content.ContextCompat import androidx.preference.Preference import androidx.preference.Preference.OnPreferenceChangeListener @@ -23,6 +25,7 @@ import io.realm.Realm import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import org.ole.planet.myplanet.MainApplication.Companion.context import org.ole.planet.myplanet.MainApplication.Companion.mRealm import org.ole.planet.myplanet.MainApplication.Companion.setThemeMode import org.ole.planet.myplanet.R @@ -107,7 +110,7 @@ class SettingActivity : AppCompatActivity() { val darkMode = findPreference("dark_mode") darkMode?.setOnPreferenceClickListener { - darkMode() + darkMode(requireActivity()) true } @@ -267,36 +270,56 @@ class SettingActivity : AppCompatActivity() { dialog.show() } - private fun darkMode() { - val options = arrayOf(getString(R.string.dark_mode_off), getString(R.string.dark_mode_on), getString(R.string.dark_mode_follow_system)) - val currentMode = getCurrentThemeMode() - val checkedItem = when (currentMode) { - ThemeMode.LIGHT -> 0 - ThemeMode.DARK -> 1 - else -> 2 - } + companion object { + fun darkMode(context: Context) { + val options = arrayOf(context.getString(R.string.dark_mode_off), context.getString(R.string.dark_mode_on),context.getString(R.string.dark_mode_follow_system)) + val currentMode = getCurrentThemeMode(context) + val checkedItem = when (currentMode) { + ThemeMode.LIGHT -> 0 + ThemeMode.DARK -> 1 + else -> 2 + } - val builder = AlertDialog.Builder(requireContext()) - .setTitle(getString(R.string.select_theme_mode)) - .setSingleChoiceItems(ArrayAdapter(requireContext(), R.layout.checked_list_item, options), checkedItem) { dialog, which -> - val selectedMode = when (which) { - 0 -> ThemeMode.LIGHT - 1 -> ThemeMode.DARK - 2 -> ThemeMode.FOLLOW_SYSTEM - else -> ThemeMode.FOLLOW_SYSTEM + val builder = AlertDialog.Builder(context, R.style.CustomAlertDialogStyle) + .setTitle(context.getString(R.string.select_theme_mode)) + .setSingleChoiceItems(ArrayAdapter(context, R.layout.checked_list_item, options), checkedItem) { dialog, which -> + val selectedMode = when (which) { + 0 -> ThemeMode.LIGHT + 1 -> ThemeMode.DARK + 2 -> ThemeMode.FOLLOW_SYSTEM + else -> ThemeMode.FOLLOW_SYSTEM + } + setThemeMode(context, selectedMode) + dialog.dismiss() } - setThemeMode(selectedMode) - dialog.dismiss() - } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.cancel, null) - val dialog = builder.create() - dialog.show() - } + val dialog = builder.create() + dialog.show() - private fun getCurrentThemeMode(): String { - val sharedPreferences = requireContext().getSharedPreferences(PREFS_NAME, MODE_PRIVATE) - return sharedPreferences.getString("theme_mode", ThemeMode.FOLLOW_SYSTEM) ?: ThemeMode.FOLLOW_SYSTEM + val window = dialog.window + window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + } + + private fun getCurrentThemeMode(context: Context): String { + val sharedPreferences = context.getSharedPreferences(PREFS_NAME, MODE_PRIVATE) + return sharedPreferences.getString("theme_mode", ThemeMode.FOLLOW_SYSTEM) ?: ThemeMode.FOLLOW_SYSTEM + } + + private fun setThemeMode(context: Context, themeMode: String) { + val sharedPreferences = context.getSharedPreferences(PREFS_NAME, MODE_PRIVATE) + with(sharedPreferences.edit()) { + putString("theme_mode", themeMode) + apply() + } + AppCompatDelegate.setDefaultNightMode( + when (themeMode) { + ThemeMode.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO + ThemeMode.DARK -> AppCompatDelegate.MODE_NIGHT_YES + else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM + } + ) + } } } 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 index 1432276248..d0eed59e4f 100644 --- 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 @@ -19,6 +19,7 @@ import org.ole.planet.myplanet.callback.SyncListener import org.ole.planet.myplanet.databinding.* import org.ole.planet.myplanet.datamanager.* import org.ole.planet.myplanet.model.* +import org.ole.planet.myplanet.ui.SettingActivity import org.ole.planet.myplanet.ui.community.HomeCommunityDialogFragment import org.ole.planet.myplanet.ui.feedback.FeedbackFragment import org.ole.planet.myplanet.ui.userprofile.* @@ -110,6 +111,10 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener { } } }) + val selectDarkModeButton = findViewById(R.id.themeToggleButton) + selectDarkModeButton?.setOnClickListener{ + SettingActivity.SettingFragment.darkMode(this) + } } private fun declareElements() { diff --git a/app/src/main/res/drawable/moon_24dp.png b/app/src/main/res/drawable/moon_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..26ac0d8fa28e1f80a4dd55febfc97b12fc7bfb04 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-#RX3n z$B>FSXQ#gAI;_Cc>Ti}F+57(gE@gps(XCm*84C3|A5T9$!oa_Up@H!YgAKzbwh3`M z6ISfI%UG3Z#wqmWjLad)miG-cMh>Tr?1@>};NkC+tIcrHiaVUK*huZ92og3nJHd%sI^wwrqlyaX{{-_zM3O!LwEf*Zr{cfBRu$;IyzOFZrxy zA6t;_SNhK6a@>`>%NK>8w|E%qI_-S^oG*$Cr*y0Mx!A37x@7e!;mT=k500009a7bBm000XU z000XU0RWnu7ytkPN=ZaPRCt{2);~xaQ5?YWSAumZD1}bCxO6bMxD|9O(xI+y+NFa9 z{~?&grJbZ(g>D@zf(~xRQMv(V2liVak;*QhVrN>RJi+ew800000Li z#v-0sVa*~a3o9p`Jr z%LMF4z-bD^ZUOl$-|0Dm{C)yQ2gnz|ZB<1+2Li`Z;OGF?Wu06>ep4bH1=2?g@&@Nk zmB`#3W!>D%KHpYm2q$LSRq6eCW-buV^jW+Y0n_@K7&N`T8#5o)JG_T2JRRF54~R6BM|N$+FV ny25O@EuBR~;dT&m`q{Vx?500009a7bBm000XU z000XU0RWnu7ytkPT}ebiRCt{2mqBjAFc3v2WnI>=-~fd+s~)D@gk!{!+8zM7K!F8Z zq2&ayWS>ohel>F4M9H91$B8YGkw%sRQC`M>{=`IGbkTBPP7g@vg;&2Ipa?O=Pz1#E z?hOb<5R*QDAc3?21Vt$nWu?4`AbDPddr}uLnfSmY0#e%GiUv2yAE17dPL z$VF}2Whk~Uzuh&B{FTRPULBjZN7+ZXYivMFa+lfokZ5RI%Plg=TWn*Dh-p^w2=)By2EwXEuns0z{15|^RqM+1 z0|>q((R~K{@TCaa$G~8es+c-h(x8>`2^vz*bQ5g#<@;9R#XOS1sMRVwGcCh4e?z2v?gSDaa zu5>=JnJF?Byfm2(mhuMf{LBj~c>*od(Z)5-uon`z5YB!`pc*KD$7<*^-3A0sgXDw2 z3SOs>KVU96& + + android:layout_height="match_parent"> + + + + android:layout_height="match_parent"> + + + + + + + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e6aaf8079f..ec55dc3ed6 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -30,6 +30,7 @@ تسجيل الخروج ملاحظات myPlanet + يختار مكتبتي دوراتي تجمعاتي diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4f01459850..f899b86d94 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -30,6 +30,7 @@ Cerrar sesión Retroalimentación myPlanet + Seleccionar miBiblioteca misCursos misEncuentros diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c5e32d4b9a..7e9dca5951 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -30,6 +30,7 @@ Déconnexion Retour d\'information myPlanet + Sélectionner maBibliothèque mesCours mesRencontres diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index ed4b98b562..20d2f9ff4f 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -30,6 +30,7 @@ लगआउट प्रतिक्रिया myPlanet + चयन गर्नुहोस् मेरो पुस्तकालय मेरो पाठ्यक्रमहरू मेरो मिठिङहरू diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index 109e3c18bb..4cc6778ff5 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -30,6 +30,7 @@ ka bax jawaab celin myPlanet + Dooro maktabadayda coursyadayda myMeetups From d23d288c07c424713834bf7158b6c9e058f51ef4 Mon Sep 17 00:00:00 2001 From: Gideon Okuro Date: Tue, 17 Dec 2024 22:12:30 +0300 Subject: [PATCH 7/7] teams: smoother list message (fixes #4887) (#4888) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt | 3 ++- .../main/java/org/ole/planet/myplanet/ui/team/TeamFragment.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 + 9 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 692cb22441..402b2213cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2141 - versionName "0.21.41" + versionCode 2142 + versionName "0.21.42" 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.kt b/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt index 35746787be..25da0f5919 100644 --- a/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt @@ -302,7 +302,8 @@ abstract class BaseRecyclerFragment
  • : BaseRecyclerParentFragment(), On "discussions" -> (v as TextView).setText(R.string.no_news) "survey" -> (v as TextView).setText(R.string.no_surveys) "submission" -> (v as TextView).setText(R.string.no_submissions) - "teams" -> (v as TextView).setText(R.string.no_teams) + "team" -> (v as TextView).setText(R.string.no_teams) + "enterprise" -> (v as TextView).setText(R.string.no_enterprise) "chatHistory" -> (v as TextView).setText(R.string.no_chats) "feedback" -> (v as TextView).setText(R.string.no_feedback) else -> (v as TextView).setText(R.string.no_data_available_please_check_and_try_again) diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/team/TeamFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/team/TeamFragment.kt index 62bb743394..5cae9b86f5 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/team/TeamFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/team/TeamFragment.kt @@ -242,7 +242,7 @@ class TeamFragment : Fragment(), AdapterTeamList.OnClickTeamItem { fragmentTeamBinding.rvTeamList.adapter = adapterTeamList listContentDescription(conditionApplied) val itemCount = adapterTeamList.itemCount - showNoData(fragmentTeamBinding.tvMessage, itemCount, "teams") + showNoData(fragmentTeamBinding.tvMessage, itemCount, "$type") if (itemCount == 0) { fragmentTeamBinding.etSearch.visibility = View.GONE fragmentTeamBinding.tableTitle.visibility = View.GONE diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ec55dc3ed6..405073d31a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1211,5 +1211,6 @@ مشاركة مع الفريق/المؤسسة فرق مجتمع + المؤسسات غير متوفرة diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f899b86d94..23c877cb17 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1211,5 +1211,6 @@ compartir con el equipo/empresa equipos comunidad + empresas no disponibles diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7e9dca5951..045d857083 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1211,5 +1211,6 @@ partager avec l\'équipe/l\'entreprise équipes communauté + entreprises non disponibles diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 20d2f9ff4f..d9920520c4 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -1211,5 +1211,6 @@ टोली/उद्यमसँग साझा गर्नुहोस् टोलीहरू समुदाय + उद्यमहरू उपलब्ध छैनन् diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index 4cc6778ff5..2f87ff661c 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -1211,5 +1211,6 @@ la wadaag kooxda/ganacsiga kooxo bulsho + ganacsiyo lama heli karo diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 29cb5e35ee..c23eed13c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1210,5 +1210,6 @@ share with team/enterprise teams community + enteprises not available