Skip to content

Commit 6a2d508

Browse files
strawberrybreadOkuro3499dogi
authored
teams: smoother empty list (fixes #3727) (#3743)
Co-authored-by: Gideon Okuro <[email protected]> Co-authored-by: dogi <[email protected]>
1 parent bfc79e0 commit 6a2d508

File tree

10 files changed

+22
-3
lines changed

10 files changed

+22
-3
lines changed

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "org.ole.planet.myplanet"
1010
minSdkVersion 21
1111
targetSdkVersion 34
12-
versionCode 1646
13-
versionName "0.16.46"
12+
versionCode 1647
13+
versionName "0.16.47"
1414
ndkVersion '21.3.6528147'
1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
vectorDrawables.useSupportLibrary = true

app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ abstract class BaseRecyclerFragment<LI> : BaseRecyclerParentFragment<Any?>(), On
296296
"discussions" -> (v as TextView).setText(R.string.no_news)
297297
"survey" -> (v as TextView).setText(R.string.no_surveys)
298298
"submission" -> (v as TextView).setText(R.string.no_submissions)
299+
"teams" -> (v as TextView).setText(R.string.no_teams)
299300
"chatHistory" -> (v as TextView).setText(R.string.no_chats)
300301
else -> (v as TextView).setText(R.string.no_data_available_please_check_and_try_again)
301302
}

app/src/main/java/org/ole/planet/myplanet/ui/team/TeamFragment.kt

+7
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import android.view.ViewGroup
1111
import androidx.appcompat.app.AlertDialog
1212
import androidx.fragment.app.Fragment
1313
import androidx.recyclerview.widget.LinearLayoutManager
14+
import org.ole.planet.myplanet.base.BaseRecyclerFragment.Companion.showNoData
1415
import io.realm.Case
1516
import io.realm.Realm
1617
import io.realm.RealmQuery
@@ -242,6 +243,12 @@ class TeamFragment : Fragment(), AdapterTeamList.OnClickTeamItem {
242243
}
243244
fragmentTeamBinding.rvTeamList.adapter = adapterTeamList
244245
listContentDescription(conditionApplied)
246+
val itemCount = adapterTeamList?.itemCount
247+
showNoData(fragmentTeamBinding.tvMessage, itemCount, "teams")
248+
if (itemCount == 0) {
249+
fragmentTeamBinding.etSearch.visibility = View.GONE
250+
fragmentTeamBinding.tableTitle.visibility = View.GONE
251+
}
245252
}
246253

247254
override fun onEditTeam(team: RealmMyTeam?) {

app/src/main/res/layout/fragment_team.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,12 @@
9797
android:layout_weight="1" />
9898

9999
</LinearLayout>
100-
100+
<TextView
101+
android:visibility="gone"
102+
android:id="@+id/tvMessage"
103+
android:layout_width="wrap_content"
104+
android:layout_height="wrap_content"
105+
android:layout_gravity="center" />
101106
<com.google.android.material.floatingactionbutton.FloatingActionButton
102107
android:id="@+id/add_team"
103108
android:layout_width="wrap_content"

app/src/main/res/values-ar/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@
10461046
<string name="checking_server">جارٍ فحص الخادم</string>
10471047
<string name="below_min_apk">إصدار Apk أقل من المسموح. يرجى تحديث التطبيق إلى أحدث إصدار.</string>
10481048
<string name="add_note">إضافة ملاحظة (اختياري)</string>
1049+
<string name="no_teams">الفرق غير متوفرة</string>
10491050
<string name="planet_name">كوكب %s</string>
10501051
<string name="no_submissions">التقديمات غير متاحة</string>
10511052
<string name="no_chats">لا توجد محادثات سابقة</string>

app/src/main/res/values-es/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@
10461046
<string name="checking_server">verificando el servidor</string>
10471047
<string name="below_min_apk">la versión de la aplicación está por debajo de la permitida. Actualice la aplicación a la última versión.</string>
10481048
<string name="add_note">Agregar una nota (opcional)</string>
1049+
<string name="no_teams">equipos no disponibles</string>
10491050
<string name="planet_name">%s Planeta</string>
10501051
<string name="no_submissions">envíos no disponibles</string>
10511052
<string name="no_chats">no hay chats anteriores</string>

app/src/main/res/values-fr/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@
10461046
<string name="checking_server">vérification du serveur</string>
10471047
<string name="below_min_apk">la version de l\'app est inférieure à celle autorisée. veuillez mettre à jour l\'application vers la dernière version.</string>
10481048
<string name="add_note">Ajouter une note (optionnel)</string>
1049+
<string name="no_teams">équipes non disponibles</string>
10491050
<string name="planet_name">%s planète</string>
10501051
<string name="no_submissions">soumissions non disponibles</string>
10511052
<string name="no_chats">aucune discussion précédente</string>

app/src/main/res/values-ne/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@
10461046
<string name="checking_server">सर्भर जाँच गर्दै</string>
10471047
<string name="below_min_apk">एप संस्करण अनुमत संस्करणभन्दा कम छ। कृपया अनुप्रयोगलाई नवीनतम संस्करणमा अद्यावधिक गर्नुहोस्।</string>
10481048
<string name="add_note">नोट थप्नुहोस् (वैकल्पिक)</string>
1049+
<string name="no_teams">टोलीहरू उपलब्ध छैनन्</string>
10491050
<string name="planet_name">%s ग्रह</string>
10501051
<string name="no_submissions">पेशाहरू उपलब्ध छैनन्</string>
10511052
<string name="no_chats">अघिल्ला कुराकानीहरू छैनन्</string>

app/src/main/res/values-so/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@
10461046
<string name="checking_server">hubinta server-ka</string>
10471047
<string name="below_min_apk">nooca app-ga waa ka hooseeyaa kan la oggol yahay. fadlan cusbooneysii app-ka nooca ugu dambeeya.</string>
10481048
<string name="add_note">Ku dar falanqeey (ixtiyaacsi ah)</string>
1049+
<string name="no_teams">kooxaha aan la heli karin</string>
10491050
<string name="planet_name">%s Meerah</string>
10501051
<string name="no_submissions">soo gudbin lama heli karo</string>
10511052
<string name="no_chats">ma jiraan wada sheekaysi hore</string>

app/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@
10461046
<string name="checking_server">checking server</string>
10471047
<string name="below_min_apk">app is below allowed version. please update the app to the latest version.</string>
10481048
<string name="add_note">add a note (optional)</string>
1049+
<string name="no_teams">teams not available</string>
10491050
<string name="planet_name">%s\'s Planet</string>
10501051
<string name="no_submissions">submissions not available</string>
10511052
<string name="no_chats">no previous chats</string>

0 commit comments

Comments
 (0)