aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-16 19:19:08 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-16 19:19:08 -0600
commit33e051ae011471e3472a69d405f805319d25bd70 (patch)
tree16facd10f595d6a5c77a82322bc3fbbc8089c16e
parenta822ae0996b13576be9dc7a9fc3b9c5acb0d90d3 (diff)
downloadetbsa-trackermap-mobile-33e051ae011471e3472a69d405f805319d25bd70.tar.gz
etbsa-trackermap-mobile-33e051ae011471e3472a69d405f805319d25bd70.tar.bz2
etbsa-trackermap-mobile-33e051ae011471e3472a69d405f805319d25bd70.zip
Hide device limit when <= 0, and show device unique ID on details view
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt6
-rw-r--r--androidApp/src/main/res/layout/user_information_activity.xml7
2 files changed, 12 insertions, 1 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 13deed0..a3c6fd6 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
@@ -64,6 +64,12 @@ class UserInformationActivity : AppCompatActivity() {
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
+ }
+ }
}
}
}
diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml
index bc81b20..252505f 100644
--- a/androidApp/src/main/res/layout/user_information_activity.xml
+++ b/androidApp/src/main/res/layout/user_information_activity.xml
@@ -60,6 +60,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Headline"/>
<TextView
+ android:id="@+id/usernameInfoLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/username"
@@ -73,6 +74,7 @@
tools:text="Username" />
<TextView
+ android:id="@+id/emailInfoLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/email"
@@ -86,6 +88,7 @@
tools:text="Email" />
<TextView
+ android:id="@+id/idInfoLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/unique_id"
@@ -99,6 +102,7 @@
tools:text="Unique ID" />
<TextView
+ android:id="@+id/deviceLimitInfoLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/device_limit"
@@ -112,6 +116,7 @@
tools:text="Device Limit" />
<TextView
+ android:id="@+id/adminInfoLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/admin"
@@ -207,7 +212,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
layout="@layout/loading_indicator"
- android:visibility="visible"/>
+ android:visibility="invisible"/>
</FrameLayout>