diff options
Diffstat (limited to 'androidApp/src/main/res')
| -rw-r--r-- | androidApp/src/main/res/layout/units_activity.xml | 135 | ||||
| -rw-r--r-- | androidApp/src/main/res/layout/user_information_activity.xml | 156 | ||||
| -rw-r--r-- | androidApp/src/main/res/menu/navigation_menu.xml | 26 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/dimen.xml | 3 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/strings.xml | 8 |
5 files changed, 228 insertions, 100 deletions
diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml index fb39ebe..bc8d94a 100644 --- a/androidApp/src/main/res/layout/units_activity.xml +++ b/androidApp/src/main/res/layout/units_activity.xml @@ -1,87 +1,74 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.drawerlayout.widget.DrawerLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawerLayout" android:layout_width="match_parent" - android:layout_height="match_parent" - tools:openDrawer="start"> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - <FrameLayout - android:id="@+id/displayContainer" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginTop="@dimen/fab_margin" - app:layout_constraintTop_toBottomOf="@id/displayModeToggle" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> + android:layout_height="match_parent"> - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/drawerButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintStart_toStartOf="parent" - android:backgroundTint="@android:color/white" - app:borderWidth="0dp" - app:fabSize="mini" - android:layout_marginStart="@dimen/fab_margin" - android:layout_marginTop="@dimen/fab_margin" - app:elevation="@dimen/fab_elevation" - android:src="@drawable/icon_menu" - android:contentDescription="@string/open_drawer"/> + <FrameLayout + android:id="@+id/displayContainer" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginTop="@dimen/fab_margin" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/displayModeToggle" /> - <com.google.android.material.card.MaterialCardView - android:layout_width="0dp" - android:layout_height="0dp" - app:layout_constraintTop_toTopOf="@id/displayModeToggle" - app:layout_constraintStart_toEndOf="@id/drawerButton" - app:layout_constraintEnd_toStartOf="@id/displayModeToggle" - app:layout_constraintBottom_toBottomOf="@id/displayModeToggle" - android:layout_marginVertical="@dimen/search_vertical_margin" - android:layout_marginHorizontal="@dimen/search_horizontal_margin" - app:cardCornerRadius="@dimen/card_border_radius" - app:cardElevation="@dimen/card_elevation"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/searchInput" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:hint="@string/units_search" - android:paddingHorizontal="16dp" - android:background="@null" - android:inputType="text" - android:lines="1" - android:imeOptions="actionSearch" /> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/userButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/fab_margin" + android:layout_marginTop="@dimen/fab_margin" + android:backgroundTint="@android:color/white" + android:contentDescription="@string/open_drawer" + android:src="@drawable/device_contact" + app:borderWidth="0dp" + app:elevation="@dimen/fab_elevation" + app:fabSize="mini" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - </com.google.android.material.card.MaterialCardView> + <com.google.android.material.card.MaterialCardView + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginHorizontal="@dimen/search_horizontal_margin" + android:layout_marginVertical="@dimen/search_vertical_margin" + app:cardCornerRadius="@dimen/card_border_radius" + app:cardElevation="@dimen/card_elevation" + app:layout_constraintBottom_toBottomOf="@id/displayModeToggle" + app:layout_constraintEnd_toStartOf="@id/displayModeToggle" + app:layout_constraintStart_toEndOf="@id/userButton" + app:layout_constraintTop_toTopOf="@id/displayModeToggle"> - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/displayModeToggle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintEnd_toEndOf="parent" - android:backgroundTint="@android:color/white" - app:borderWidth="0dp" - app:fabSize="mini" - android:layout_marginEnd="@dimen/fab_margin" - android:layout_marginTop="@dimen/fab_margin" - app:elevation="@dimen/fab_elevation" - tools:ignore="ContentDescription" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/searchInput" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@null" + android:hint="@string/units_search" + android:imeOptions="actionSearch" + android:inputType="text" + android:lines="1" + android:paddingHorizontal="16dp" /> - </androidx.constraintlayout.widget.ConstraintLayout> + </com.google.android.material.card.MaterialCardView> - <com.google.android.material.navigation.NavigationView - android:id="@+id/navigationView" + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/displayModeToggle" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="start" - app:menu="@menu/navigation_menu" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" + android:backgroundTint="@android:color/white" + app:borderWidth="0dp" + app:elevation="@dimen/fab_elevation" + app:fabSize="mini" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="ContentDescription" /> -</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml new file mode 100644 index 0000000..8bb994a --- /dev/null +++ b/androidApp/src/main/res/layout/user_information_activity.xml @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ProgressBar + android:id="@+id/infoLoading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + android:visibility="gone"/> + + <androidx.cardview.widget.CardView + android:id="@+id/userInfoCard" + android:layout_margin="@dimen/card_margin" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:contentPadding="@dimen/card_padding" + app:cardCornerRadius="@dimen/card_border_radius" + app:cardElevation="@dimen/card_elevation"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/usernameLabel" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="@string/username" + app:layout_constraintBottom_toTopOf="@id/usernameInfo" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="spread_inside" /> + + <TextView + android:id="@+id/usernameInfo" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintBottom_toTopOf="@id/emailLabel" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/usernameLabel" + tools:text="Username" /> + + <TextView + android:id="@+id/emailLabel" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fields_spacing" + android:text="@string/email" + app:layout_constraintBottom_toTopOf="@id/emailInfo" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/usernameInfo" /> + + <TextView + android:id="@+id/emailInfo" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintBottom_toTopOf="@id/idLabel" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/emailLabel" + tools:text="Email" /> + + <TextView + android:id="@+id/idLabel" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fields_spacing" + android:text="@string/unique_id" + app:layout_constraintBottom_toTopOf="@id/idInfo" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/emailInfo" /> + + <TextView + android:id="@+id/idInfo" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintBottom_toTopOf="@id/deviceLimitLabel" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/idLabel" + tools:text="Unique ID" /> + + <TextView + android:id="@+id/deviceLimitLabel" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fields_spacing" + android:text="@string/device_limit" + app:layout_constraintBottom_toTopOf="@id/deviceLimitInfo" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/idInfo" /> + + <TextView + android:id="@+id/deviceLimitInfo" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintBottom_toTopOf="@id/adminLabel" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/deviceLimitLabel" + tools:text="Device Limit" /> + + <TextView + android:id="@+id/adminLabel" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fields_spacing" + android:text="@string/admin" + app:layout_constraintBottom_toTopOf="@id/adminInfo" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/deviceLimitInfo" /> + + <TextView + android:id="@+id/adminInfo" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintBottom_toTopOf="@id/signoutButton" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/adminLabel" + tools:text="Admin" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/signoutButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fields_spacing" + android:text="@string/sign_out" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/adminInfo" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + </androidx.cardview.widget.CardView> + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/androidApp/src/main/res/menu/navigation_menu.xml b/androidApp/src/main/res/menu/navigation_menu.xml deleted file mode 100644 index 2713776..0000000 --- a/androidApp/src/main/res/menu/navigation_menu.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <group - android:id="@+id/group_1" - android:checkableBehavior="single"> - <item - android:id="@+id/nav_account" - android:icon="@drawable/device_contact" - android:title="@string/menu_account" /> - <item - android:id="@+id/nav_about" - android:icon="@drawable/icon_about" - android:title="@string/menu_about" /> - </group> - - <group - android:id="@+id/group_2" - android:checkableBehavior="single"> - <item - android:id="@+id/nav_logout" - android:icon="@drawable/icon_logout" - android:title="@string/menu_logout" /> - </group> - -</menu>
\ No newline at end of file diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml index 8acc9a3..25d0e98 100644 --- a/androidApp/src/main/res/values/dimen.xml +++ b/androidApp/src/main/res/values/dimen.xml @@ -20,4 +20,7 @@ <!-- Floating Button --> <dimen name="fab_margin">12dp</dimen> <dimen name="fab_elevation">8dp</dimen> + + <!-- User Information --> + <dimen name="fields_spacing">8dp</dimen> </resources>
\ No newline at end of file diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 13ac79d..6901a37 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -86,4 +86,12 @@ <string name="event_text_message">Text message received</string> <string name="event_driver_changed">Driver changed</string> <string name="event_unknown">Unknown event</string> + + <!-- User Information --> + <string name="username">Username</string> + <string name="email">Email</string> + <string name="unique_id">Unique ID</string> + <string name="device_limit">Device Limit</string> + <string name="admin">Administrator</string> + <string name="sign_out">Sign out</string> </resources> |