diff options
8 files changed, 40 insertions, 13 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt index aaf7ecb..c6d260b 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt @@ -84,6 +84,9 @@ class DetailsActivity : AppCompatActivity() { override fun onTabUnselected(tab: TabLayout.Tab?) {} override fun onTabReselected(tab: TabLayout.Tab?) {} }) + binding.closeButton.setOnClickListener { + finish() + } requestPermission {} } diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt index b56a403..822d351 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt @@ -75,7 +75,7 @@ class UnitCommandsFragment: Fragment() { setPositiveButton(R.string.shared_cancel) { dialogInterface, _ -> dialogInterface.dismiss() } - setNegativeButton(R.string.send_command) { dialogInterface, _ -> + setNegativeButton(R.string.shared_send) { dialogInterface, _ -> unitCommandsViewModel.sendCommand() dialogInterface.dismiss() } 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 b0a4482..13deed0 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 @@ -69,7 +69,7 @@ class UserInformationActivity : AppCompatActivity() { } private fun setupEvents() { - binding.backButton.setOnClickListener { onBackPressed() } + binding.closeButton.setOnClickListener { onBackPressed() } binding.signoutButton.setOnClickListener { userInformationViewModel.signOut(PreferenceManager .getDefaultSharedPreferences(this) diff --git a/androidApp/src/main/res/layout/details_activity.xml b/androidApp/src/main/res/layout/details_activity.xml index f79ea69..37d3b15 100644 --- a/androidApp/src/main/res/layout/details_activity.xml +++ b/androidApp/src/main/res/layout/details_activity.xml @@ -5,13 +5,28 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/closeButton" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:contentDescription="@string/shared_close" + android:src="@drawable/icon_close" + app:fabSize="mini" + app:backgroundTint="@android:color/white" + android:layout_margin="@dimen/fab_margin" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/detailsTabs"/> + <com.google.android.material.tabs.TabLayout android:id="@+id/detailsTabs" - android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_width="0dp" + android:layout_height="0dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toEndOf="@id/closeButton" + app:layout_constraintBottom_toTopOf="@id/detailsPager" + app:tabTextAppearance="@style/SmallTabText" /> <androidx.viewpager2.widget.ViewPager2 android:id="@+id/detailsPager" @@ -20,6 +35,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/detailsTabs" /> + android:layout_marginTop="@dimen/fab_margin" + app:layout_constraintTop_toBottomOf="@id/closeButton" /> </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 index c409e98..bc81b20 100644 --- a/androidApp/src/main/res/layout/user_information_activity.xml +++ b/androidApp/src/main/res/layout/user_information_activity.xml @@ -7,13 +7,13 @@ android:layout_height="match_parent"> <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/backButton" + android:id="@+id/closeButton" android:layout_width="wrap_content" android:layout_height="0dp" android:layout_margin="@dimen/fab_margin" android:backgroundTint="@android:color/white" - android:contentDescription="@string/open_profile" - android:src="@drawable/icon_back" + android:contentDescription="@string/shared_close" + android:src="@drawable/icon_close" app:borderWidth="0dp" app:elevation="@dimen/fab_elevation" app:fabSize="mini" @@ -24,7 +24,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="@dimen/fab_margin" - app:layout_constraintTop_toBottomOf="@id/backButton" + app:layout_constraintTop_toBottomOf="@id/closeButton" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"> diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml index d228c28..835f342 100644 --- a/androidApp/src/main/res/values-es-rMX/strings.xml +++ b/androidApp/src/main/res/values-es-rMX/strings.xml @@ -4,6 +4,7 @@ <string name="shared_ok">OK</string> <string name="shared_cancel">Cancelar</string> <string name="shared_close">Cerrar</string> + <string name="shared_send">Enviar</string> <!-- LoginActivity --> <string name="login_username">Nombre de usuario</string> @@ -76,7 +77,7 @@ <!-- Commands --> <string name="send_command">Enviar comando</string> <string name="send_command_confirmation_text"> - ¿Está seguro de que desea enviar el comando a la unidad %1$s? + El comando se enviará a la unidad %1$s. ¿Continuar? </string> <!-- Reports --> diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index d2c6148..62963fa 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ <string name="shared_ok">OK</string> <string name="shared_cancel">Cancel</string> <string name="shared_close">Close</string> + <string name="shared_send">Send</string> <!-- LoginActivity --> <string name="login_username">Username</string> @@ -89,7 +90,7 @@ <!-- Commands --> <string name="send_command">Send Command</string> <string name="send_command_confirmation_text"> - Are you sure you want to send the command to device %1$s? + Command will be sent to device %1$s. Continue? </string> <!-- Reports --> diff --git a/androidApp/src/main/res/values/styles.xml b/androidApp/src/main/res/values/styles.xml index 4a51239..dc40450 100644 --- a/androidApp/src/main/res/values/styles.xml +++ b/androidApp/src/main/res/values/styles.xml @@ -6,4 +6,10 @@ <item name="colorAccent">@color/colorAccent</item> </style> + <style name="SmallTabText" parent="Widget.MaterialComponents.TabLayout"> + <item name="textAllCaps">true</item> + <item name="android:textSize">11sp</item> + <item name="android:textStyle">bold</item> + </style> + </resources>
\ No newline at end of file |