Rearange layout

This commit is contained in:
pavelb 2024-02-09 01:27:26 +01:00
parent 22cb3206b8
commit a6e027a573
2 changed files with 55 additions and 48 deletions

View File

@ -11,8 +11,8 @@ android {
applicationId = "cz.bugsy.passwordzebra"
minSdk = 29
targetSdk = 34
versionCode = 1
versionName = "1.0"
versionCode = 2
versionName = "1.1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
@ -41,7 +41,6 @@ dependencies {
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("com.google.android.material:material:1.11.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

View File

@ -1,69 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".MainActivity">
<TextView
android:id="@+id/infoTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="16dp"
android:text="@string/info_text"
android:textSize="14sp"
android:textColor="@android:color/darker_gray"/>
android:layout_marginTop="32dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<TextView
android:id="@+id/passwordTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/infoTextView"
android:layout_centerHorizontal="true"
android:gravity="center"
android:layout_marginTop="16dp"
android:text=""
android:textSize="24sp"
android:textColor="@android:color/black"
android:background="@drawable/password_background"
android:padding="16dp"
android:clickable="true"
android:focusable="true"
android:textIsSelectable="true"/>
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/infoTextView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<TextView
android:id="@+id/passwordLengthLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Password Length"
android:layout_marginTop="32dp"
app:layout_constraintBottom_toTopOf="@id/switchWithoutSpaces"
app:layout_constraintStart_toStartOf="parent"/>
<NumberPicker
android:id="@+id/passwordLengthPicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toTopOf="@id/passwordLengthLabel"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchWithoutSpaces"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Copy Without Spaces"
android:layout_marginTop="16dp"
app:layout_constraintBottom_toTopOf="@id/switchSpecialChars"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchSpecialChars"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Add Special Characters"
android:layout_marginTop="16dp"
app:layout_constraintBottom_toTopOf="@id/generateButton"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<Button
android:id="@+id/generateButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/generate_button_text"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="16dp"/>
<NumberPicker
android:id="@+id/passwordLengthPicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="32dp"/>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchWithoutSpaces"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/numPasswordsPicker"
android:layout_centerHorizontal="true"
android:layout_marginTop="16dp"
android:text="Copy Without Spaces"/>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchSpecialChars"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/switchWithoutSpaces"
android:layout_centerHorizontal="true"
android:layout_marginTop="16dp"
android:text="Add Special Characters"/>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>