diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-16 19:22:59 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-16 19:22:59 -0600 |
| commit | 70af8a0fffe32033230d8f7a4d23f098d4b742bb (patch) | |
| tree | 5780c53f2389d80ae6983cf08654b90cd14c6876 | |
| parent | 6537ff8aeddb4dd3026806aa1667527226ec902d (diff) | |
| parent | f88add3dbf4cafb39b8720efdecb53087e2bc285 (diff) | |
| download | etbsa-trackermap-mobile-70af8a0fffe32033230d8f7a4d23f098d4b742bb.tar.gz etbsa-trackermap-mobile-70af8a0fffe32033230d8f7a4d23f098d4b742bb.tar.bz2 etbsa-trackermap-mobile-70af8a0fffe32033230d8f7a4d23f098d4b742bb.zip | |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
| -rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt | 8 | ||||
| -rw-r--r-- | androidApp/src/main/res/layout/user_information_activity.xml | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt index a3c6fd6..dababb5 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt @@ -62,12 +62,12 @@ class UserInformationActivity : AppCompatActivity() { usernameInfo.text = user.name ?: "" emailInfo.text = user.email ?: "" idInfo.text = "${user.id ?: "--"}" - deviceLimitInfo.text = "${user.deviceLimit ?: "--"}" adminInfo.text = "${user.administrator}" user.deviceLimit?.let { - if (it <= 0) { - adminInfoLabel.visibility = View.GONE - adminInfo.visibility = View.GONE + deviceLimitInfo.text = "${user.deviceLimit ?: "--"}" + if (it > 0) { + deviceLimitInfo.visibility = View.VISIBLE + deviceLimitInfo.visibility = View.VISIBLE } } } diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml index b0cc463..2f0486c 100644 --- a/androidApp/src/main/res/layout/user_information_activity.xml +++ b/androidApp/src/main/res/layout/user_information_activity.xml @@ -105,6 +105,7 @@ android:id="@+id/deviceLimitInfoLabel" android:layout_width="match_parent" android:layout_height="wrap_content" + android:visibility="gone" android:text="@string/device_limit" android:textAppearance="@style/TextAppearance.AppCompat.Body2"/> @@ -113,6 +114,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/fields_spacing" + android:visibility="gone" tools:text="Device Limit" /> <TextView |