UI improvements
This commit is contained in:
parent
ba1a78ba69
commit
df93f65476
@ -12,7 +12,7 @@ android {
|
|||||||
minSdk = 29
|
minSdk = 29
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 2
|
versionCode = 2
|
||||||
versionName = "1.1.0"
|
versionName = "1.2.0"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import android.content.ClipboardManager
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.widget.Button
|
import android.widget.Button
|
||||||
|
import android.widget.ImageView
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import kotlin.random.Random
|
import kotlin.random.Random
|
||||||
@ -13,7 +14,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
private lateinit var generateButton: Button
|
private lateinit var generateButton: Button
|
||||||
private lateinit var passwordTextView: TextView
|
private lateinit var passwordTextView: TextView
|
||||||
private lateinit var infoTextView: TextView
|
private lateinit var iconImageView: ImageView
|
||||||
private lateinit var switchWithoutSpaces: com.google.android.material.switchmaterial.SwitchMaterial
|
private lateinit var switchWithoutSpaces: com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
private lateinit var switchSpecialChars: com.google.android.material.switchmaterial.SwitchMaterial
|
private lateinit var switchSpecialChars: com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
private lateinit var passwordLengthPicker: android.widget.NumberPicker
|
private lateinit var passwordLengthPicker: android.widget.NumberPicker
|
||||||
@ -24,7 +25,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
generateButton = findViewById(R.id.generateButton)
|
generateButton = findViewById(R.id.generateButton)
|
||||||
passwordTextView = findViewById(R.id.passwordTextView)
|
passwordTextView = findViewById(R.id.passwordTextView)
|
||||||
infoTextView = findViewById(R.id.infoTextView)
|
iconImageView = findViewById(R.id.iconImageView)
|
||||||
generateButton = findViewById(R.id.generateButton)
|
generateButton = findViewById(R.id.generateButton)
|
||||||
switchWithoutSpaces = findViewById(R.id.switchWithoutSpaces)
|
switchWithoutSpaces = findViewById(R.id.switchWithoutSpaces)
|
||||||
switchSpecialChars = findViewById(R.id.switchSpecialChars)
|
switchSpecialChars = findViewById(R.id.switchSpecialChars)
|
||||||
|
|||||||
BIN
app/src/main/res/drawable/icon_stift.png
Normal file
BIN
app/src/main/res/drawable/icon_stift.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
@ -1,77 +1,100 @@
|
|||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<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"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
tools:context=".MainActivity">
|
tools:context=".MainActivity">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/infoTextView"
|
android:id="@+id/titleTextView"
|
||||||
|
android:layout_width="409dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginTop="32dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/app_name"
|
||||||
|
android:textSize="24sp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/iconImageView"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/info_text"
|
|
||||||
android:layout_marginTop="32dp"
|
android:layout_marginTop="32dp"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
android:contentDescription="@string/info_text"
|
||||||
|
android:src="@drawable/icon_stift"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"/>
|
app:layout_constraintTop_toBottomOf="@id/titleTextView"
|
||||||
|
app:tint="@color/design_default_color_primary" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/passwordTextView"
|
android:id="@+id/passwordTextView"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:background="@drawable/password_background"
|
||||||
|
android:gravity="center"
|
||||||
|
android:padding="16dp"
|
||||||
android:text=""
|
android:text=""
|
||||||
android:textSize="24sp"
|
android:textSize="24sp"
|
||||||
android:layout_marginTop="8dp"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/infoTextView"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"/>
|
app:layout_constraintTop_toBottomOf="@id/iconImageView" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/passwordLengthLabel"
|
android:id="@+id/passwordLengthLabel"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="80dp"
|
||||||
|
android:layout_marginBottom="104dp"
|
||||||
android:text="@string/textview_password_length"
|
android:text="@string/textview_password_length"
|
||||||
android:layout_marginTop="32dp"
|
|
||||||
app:layout_constraintBottom_toTopOf="@id/switchWithoutSpaces"
|
app:layout_constraintBottom_toTopOf="@id/switchWithoutSpaces"
|
||||||
app:layout_constraintStart_toStartOf="parent"/>
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
<NumberPicker
|
<NumberPicker
|
||||||
android:id="@+id/passwordLengthPicker"
|
android:id="@+id/passwordLengthPicker"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="69dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="178dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginEnd="72dp"
|
||||||
app:layout_constraintBottom_toTopOf="@id/passwordLengthLabel"
|
app:layout_constraintBottom_toTopOf="@+id/switchWithoutSpaces"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"/>
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintVertical_bias="0.953" />
|
||||||
|
|
||||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
android:id="@+id/switchWithoutSpaces"
|
android:id="@+id/switchWithoutSpaces"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="267dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="48dp"
|
||||||
android:text="@string/switch_without_spaces"
|
android:text="@string/switch_without_spaces"
|
||||||
android:layout_marginTop="16dp"
|
|
||||||
app:layout_constraintBottom_toTopOf="@id/switchSpecialChars"
|
app:layout_constraintBottom_toTopOf="@id/switchSpecialChars"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"/>
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
android:id="@+id/switchSpecialChars"
|
android:id="@+id/switchSpecialChars"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="267dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="48dp"
|
||||||
android:text="@string/switch_special_characters"
|
android:text="@string/switch_special_characters"
|
||||||
android:layout_marginTop="16dp"
|
|
||||||
app:layout_constraintBottom_toTopOf="@id/generateButton"
|
app:layout_constraintBottom_toTopOf="@id/generateButton"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"/>
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/generateButton"
|
android:id="@+id/generateButton"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="64dp"
|
||||||
|
android:backgroundTint="@color/design_default_color_secondary"
|
||||||
android:text="@string/generate_button_text"
|
android:text="@string/generate_button_text"
|
||||||
android:layout_marginTop="16dp"
|
android:textColor="@android:color/white"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"/>
|
app:layout_constraintHorizontal_bias="0.498"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user