OffPass/offpass-android
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix password layout for smaller screens.

Browse Source
This commit is contained in:
Nicolas Klier
2020-07-15 15:26:36 +02:00
parent 83328f42ec
commit f8e143db12
2 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt
View File

@@ -139,7 +139,8 @@ class CreateActivity : AppCompatActivity() {
} }
fun passwordKnown(password: String): Boolean { fun passwordKnown(password: String): Boolean {
return this.known_passwords.contains(password) // TODO: Doesn't work on all devices somehow :shrug:
return this.known_passwords.contains(password.toLowerCase(Locale.ROOT))
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {

73
app/src/main/res/layout/activity_create.xml
View File

@@ -23,8 +23,8 @@
<ImageButton <ImageButton
android:id="@+id/print_button" android:id="@+id/print_button"
style="@style/Widget.AppCompat.Button.Colored" style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="86dp" android:layout_width="88dp"
android:layout_height="50dp" android:layout_height="55dp"
android:layout_margin="0dp" android:layout_margin="0dp"
android:layout_marginStart="64dp" android:layout_marginStart="64dp"
android:backgroundTint="#F8F8F8" android:backgroundTint="#F8F8F8"
@@ -82,8 +82,11 @@
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
<ScrollView <ScrollView
android:layout_width="416dp" android:id="@+id/scroll_view"
android:layout_height="566dp" android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="56dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar"> app:layout_constraintTop_toBottomOf="@+id/toolbar">
@@ -106,7 +109,7 @@
android:id="@+id/email_input" android:id="@+id/email_input"
style="@style/Widget.AppCompat.AutoCompleteTextView" style="@style/Widget.AppCompat.AutoCompleteTextView"
android:layout_width="354dp" android:layout_width="354dp"
android:layout_height="48dp" android:layout_height="97dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:ems="10" android:ems="10"
@@ -131,9 +134,10 @@
<EditText <EditText
android:id="@+id/password_input" android:id="@+id/password_input"
android:layout_width="263dp" android:layout_width="0dp"
android:layout_height="67dp" android:layout_height="81dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:ems="10" android:ems="10"
android:fontFamily="sans-serif-black" android:fontFamily="sans-serif-black"
@@ -142,7 +146,8 @@
android:singleLine="true" android:singleLine="true"
android:textSize="28sp" android:textSize="28sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/password_label" /> app:layout_constraintTop_toBottomOf="@+id/password_label"
app:layout_constraintWidth_percent="0.6" />
<EditText <EditText
android:id="@+id/username_input" android:id="@+id/username_input"
@@ -232,6 +237,8 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
app:layout_constraintBottom_toBottomOf="@+id/password_input" app:layout_constraintBottom_toBottomOf="@+id/password_input"
app:layout_constraintEnd_toStartOf="@+id/password_random"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/password_input" app:layout_constraintStart_toEndOf="@+id/password_input"
app:layout_constraintTop_toTopOf="@+id/password_input" app:layout_constraintTop_toTopOf="@+id/password_input"
app:layout_constraintVertical_bias="0.48000002" app:layout_constraintVertical_bias="0.48000002"
@@ -247,29 +254,32 @@
android:tint="#000000" android:tint="#000000"
app:layout_constraintBottom_toBottomOf="@+id/password_input" app:layout_constraintBottom_toBottomOf="@+id/password_input"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/password_hide" app:layout_constraintStart_toEndOf="@+id/password_hide"
app:layout_constraintTop_toTopOf="@+id/password_input" app:layout_constraintTop_toTopOf="@+id/password_input"
app:srcCompat="@drawable/ic_autorenew" /> app:srcCompat="@drawable/ic_autorenew" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<androidx.constraintlayout.widget.ConstraintLayout <ProgressBar
android:layout_width="match_parent" android:id="@+id/fa_progress"
android:layout_height="110dp" style="?android:attr/progressBarStyleHorizontal"
android:background="@color/colorPrimary" android:layout_width="379dp"
app:layout_constraintBottom_toBottomOf="parent" android:layout_height="15dp"
app:layout_constraintStart_toStartOf="parent"> android:layout_marginStart="16dp"
android:max="30"
android:visibility="invisible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fa_input" />
<TextView <TextView
android:id="@+id/fa_label" android:id="@+id/fa_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="20dp"
android:text="Two factor authentication" android:text="Two factor authentication"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/url_input" />
<EditText <EditText
android:id="@+id/fa_input" android:id="@+id/fa_input"
@@ -277,7 +287,7 @@
android:layout_width="354dp" android:layout_width="354dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:background="@color/colorPrimary" android:background="#00FFFFFF"
android:editable="false" android:editable="false"
android:ems="10" android:ems="10"
android:fontFamily="sans-serif-black" android:fontFamily="sans-serif-black"
@@ -288,18 +298,21 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fa_label" /> app:layout_constraintTop_toBottomOf="@+id/fa_label" />
<ProgressBar <Button
android:id="@+id/fa_progress" android:id="@+id/button"
style="?android:attr/progressBarStyleHorizontal" style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="379dp" android:layout_width="256dp"
android:layout_height="15dp" android:layout_height="42dp"
android:layout_marginStart="16dp" android:layout_marginTop="12dp"
android:layout_marginEnd="16dp" android:layout_marginBottom="12dp"
android:max="30" android:background="@color/colorPrimaryDark"
android:visibility="invisible" android:text="Add more"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fa_input" /> app:layout_constraintTop_toBottomOf="@+id/fa_progress" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>