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

Redesign login screen

Browse Source
This commit is contained in:
Torsten Grote
2024-05-09 15:19:50 -03:00
parent 8fa0866243
commit 04e14cfa29
4 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/AndroidManifest.xml
View File

@@ -109,7 +109,7 @@
<activity
android:name="org.briarproject.briar.android.login.StartupActivity"
android:exported="false"
android:label="@string/app_name" />
android:theme="@style/BriarTheme.NoActionBar" />
<activity
android:name="org.briarproject.briar.android.account.SetupActivity"

7
briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
View File

@@ -40,6 +40,7 @@ import static org.briarproject.bramble.api.crypto.DecryptionResult.SUCCESS;
import static org.briarproject.briar.android.login.LoginUtils.createKeyStrengthenerErrorDialog;
import static org.briarproject.briar.android.util.UiUtils.enterPressed;
import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
import static org.briarproject.briar.android.util.UiUtils.setError;
import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard;
@@ -100,6 +101,12 @@ public class PasswordFragment extends BaseFragment implements TextWatcher {
return v;
}
@Override
public void onStart() {
super.onStart();
hideViewOnSmallScreen(requireView().findViewById(R.id.logo));
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count,
int after) {

64
briar-android/src/main/res/layout/fragment_password.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
tools:context=".android.login.PasswordFragment">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -11,15 +12,43 @@
android:layout_height="wrap_content"
android:padding="@dimen/margin_activity_vertical">
<ImageView
android:id="@+id/logo"
android:layout_width="0dp"
android:layout_height="@dimen/hero_square"
android:layout_margin="16dp"
android:importantForAccessibility="no"
android:src="@drawable/splash_screen"
app:layout_constraintBottom_toTopOf="@+id/sign_in_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_default="percent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/sign_in_title"
style="@style/TextAppearance.AppCompat.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/sign_in_title"
app:layout_constraintBottom_toTopOf="@+id/password_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/logo" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:errorEnabled="true"
app:hintEnabled="false"
app:layout_constraintBottom_toTopOf="@+id/btn_forgotten"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sign_in_title"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
@@ -35,16 +64,30 @@
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/btn_forgotten"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:clickable="true"
android:focusable="true"
android:text="@string/forgotten_password"
android:textColor="?android:attr/textColorLink"
app:layout_constraintBottom_toTopOf="@+id/btn_sign_in"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/password_layout" />
<Button
android:id="@+id/btn_sign_in"
style="@style/BriarButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:text="@string/sign_in_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/password_layout" />
app:layout_constraintStart_toStartOf="parent" />
<ProgressBar
android:id="@+id/progress_wheel"
@@ -56,19 +99,6 @@
app:layout_constraintRight_toRightOf="parent"
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:text="@string/forgotten_password"
android:textColor="?android:attr/textColorLink"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_sign_in" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

3
briar-android/src/main/res/values/strings.xml
View File

@@ -41,8 +41,9 @@
<string name="try_again">Wrong password, try again</string>
<string name="dialog_title_cannot_check_password">Cannot Check Password</string>
<string name="dialog_message_cannot_check_password">Briar cannot check your password. Please try rebooting your device to solve this problem.</string>
<string name="sign_in_title">Sign into Briar</string>
<string name="sign_in_button">Sign In</string>
<string name="forgotten_password">I have forgotten my password</string>
<string name="forgotten_password">Forgot your password?</string>
<string name="dialog_title_lost_password">Lost Password</string>
<string name="dialog_message_lost_password">Your Briar account is stored encrypted on your device, not in the cloud, so we can\'t reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.</string>
<string name="startup_failed_activity_title">Briar Startup Failure</string>