Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

teams: smoother list message (fixes #4887) #4888

Merged
merged 3 commits into from
Dec 17, 2024
Merged

teams: smoother list message (fixes #4887) #4888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a55f0bd
empty enterprise list placeholder
Okuro3499 Dec 17, 2024
291078d
Update build.gradle
dogi Dec 17, 2024
f3ad68f
Merge branch 'master' into 4887-misleading-teams-not-available-in-ent…
dogi Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,8 @@ abstract class BaseRecyclerFragment<LI> : BaseRecyclerParentFragment<Any?>(), 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)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/ole/planet/myplanet/ui/team/TeamFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,5 +1211,6 @@
<string name="share_with_team_enterprise">مشاركة مع الفريق/المؤسسة</string>
<string name="teams">فرق</string>
<string name="community">مجتمع</string>
<string name="no_enterprise">المؤسسات غير متوفرة</string>

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,5 +1211,6 @@
<string name="share_with_team_enterprise">compartir con el equipo/empresa</string>
<string name="teams">equipos</string>
<string name="community">comunidad</string>
<string name="no_enterprise">empresas no disponibles</string>

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,5 +1211,6 @@
<string name="share_with_team_enterprise">partager avec l\'équipe/l\'entreprise</string>
<string name="teams">équipes</string>
<string name="community">communauté</string>
<string name="no_enterprise">entreprises non disponibles</string>

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values-ne/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,5 +1211,6 @@
<string name="share_with_team_enterprise">टोली/उद्यमसँग साझा गर्नुहोस्</string>
<string name="teams">टोलीहरू</string>
<string name="community">समुदाय</string>
<string name="no_enterprise">उद्यमहरू उपलब्ध छैनन्</string>

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values-so/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,5 +1211,6 @@
<string name="share_with_team_enterprise">la wadaag kooxda/ganacsiga</string>
<string name="teams">kooxo</string>
<string name="community">bulsho</string>
<string name="no_enterprise">ganacsiyo lama heli karo</string>

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,5 +1210,6 @@
<string name="share_with_team_enterprise">share with team/enterprise</string>
<string name="teams">teams</string>
<string name="community">community</string>
<string name="no_enterprise">enteprises not available</string>

</resources>
Loading