Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

[android] Combine Password and OpenDatabase Activity into StartupActivity

Browse Source
This commit is contained in:
Torsten Grote
2019-04-29 16:15:35 -03:00
parent 451edba467
commit 5ece6505da
41 changed files with 696 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/res/layout/activity_unlock.xml
View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".android.login.UnlockActivity">
tools:context=".android.account.UnlockActivity">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/image"

0
briar-android/src/main/res/layout/activity_open_database.xml → briar-android/src/main/res/layout/fragment_open_database.xml
View File

9
briar-android/src/main/res/layout/activity_password.xml → briar-android/src/main/res/layout/fragment_password.xml
View File

@@ -2,8 +2,10 @@
<ScrollView
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"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
tools:context=".android.login.PasswordFragment">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
@@ -21,7 +23,7 @@
app:layout_constraintTop_toTopOf="parent"
app:passwordToggleEnabled="true">
<EditText
<android.support.design.widget.TextInputEditText
android:id="@+id/edit_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -37,7 +39,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:onClick="onSignInClick"
android:text="@string/sign_in_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -54,12 +55,12 @@
app:layout_constraintTop_toTopOf="@id/btn_sign_in"/>
<TextView
android:id="@+id/btn_forgotten"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_large"
android:clickable="true"
android:focusable="true"
android:onClick="onForgottenPasswordClick"
android:text="@string/forgotten_password"
android:textColor="?android:attr/textColorLink"
app:layout_constraintLeft_toLeftOf="parent"

4
briar-android/src/main/res/layout/fragment_setup_doze.xml
View File

@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:padding="@dimen/margin_activity_vertical">
<org.briarproject.briar.android.login.DozeView
<org.briarproject.briar.android.account.DozeView
android:id="@+id/dozeView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<org.briarproject.briar.android.login.HuaweiView
<org.briarproject.briar.android.account.HuaweiView
android:id="@+id/huaweiView"
android:layout_width="match_parent"
android:layout_height="wrap_content"