diff options
Diffstat (limited to 'androidApp')
| -rw-r--r-- | androidApp/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | androidApp/src/main/res/layout/login.xml | 14 | ||||
| -rw-r--r-- | androidApp/src/main/res/layout/login_activity.xml | 7 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/dimen.xml | 9 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/strings.xml | 9 |
5 files changed, 29 insertions, 12 deletions
diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml index 142700c..718fc5d 100644 --- a/androidApp/src/main/AndroidManifest.xml +++ b/androidApp/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ package="mx.trackermap.TrackerMap.android"> <uses-permission android:name="android.permission.INTERNET" /> <application - android:label="TrackerMap" + android:label="@string/app_name" android:allowBackup="false" android:supportsRtl="true" android:theme="@style/AppTheme" diff --git a/androidApp/src/main/res/layout/login.xml b/androidApp/src/main/res/layout/login.xml index 0a5f07a..21c63b0 100644 --- a/androidApp/src/main/res/layout/login.xml +++ b/androidApp/src/main/res/layout/login.xml @@ -5,22 +5,22 @@ android:name="mx.trackermap.TrackerMap.android.session.LoginFragment" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardCornerRadius="20dp" - app:cardElevation="5dp" + app:cardCornerRadius="@dimen/cardview_border_radius" + app:cardElevation="@dimen/cardview_elevation" app:cardUseCompatPadding="true"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="32dp" - android:paddingHorizontal="16dp"> + android:paddingVertical="@dimen/cardview_padding_vertical" + android:paddingHorizontal="@dimen/cardview_padding_horizontal"> <com.google.android.material.textfield.TextInputLayout android:id="@+id/usernameInputLayout" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="Username" + android:hint="@string/login_username" app:layout_constraintBottom_toTopOf="@+id/passwordInputLayout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -40,7 +40,7 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="Password" + android:hint="@string/login_password" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -67,7 +67,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.5" android:layout_marginTop="40dp" - android:text="Log in"/> + android:text="@string/login_login"/> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/androidApp/src/main/res/layout/login_activity.xml b/androidApp/src/main/res/layout/login_activity.xml index f1df817..8021963 100644 --- a/androidApp/src/main/res/layout/login_activity.xml +++ b/androidApp/src/main/res/layout/login_activity.xml @@ -9,14 +9,14 @@ android:id="@+id/bannerImage" android:layout_width="0dp" android:layout_height="0dp" - app:layout_constraintWidth_percent="0.7" + app:layout_constraintWidth_percent="0.5" app:layout_constraintDimensionRatio="1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:srcCompat="@drawable/ic_launcher_foreground" /> - <fragment + <androidx.fragment.app.FragmentContainerView android:id="@+id/loginFragment" android:layout_width="0dp" android:layout_height="wrap_content" @@ -24,8 +24,7 @@ app:layout_constraintTop_toBottomOf="@id/bannerImage" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" + android:layout_marginHorizontal="@dimen/cardview_margin_horizontal" android:layout_marginBottom="16dp"/> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml new file mode 100644 index 0000000..6b5e340 --- /dev/null +++ b/androidApp/src/main/res/values/dimen.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <!-- CardView --> + <dimen name="cardview_border_radius">20dp</dimen> + <dimen name="cardview_elevation">5dp</dimen> + <dimen name="cardview_padding_vertical">32dp</dimen> + <dimen name="cardview_padding_horizontal">16dp</dimen> + <dimen name="cardview_margin_horizontal">7dp</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 new file mode 100644 index 0000000..db272e5 --- /dev/null +++ b/androidApp/src/main/res/values/strings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">TrackerMap</string> + + <!-- LoginActivity --> + <string name="login_username">Username</string> + <string name="login_password">Password</string> + <string name="login_login">Login</string> +</resources>
\ No newline at end of file |