TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 08:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up lock screen UI

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-30 10:24:39 +10:00
parent 1b92419ac9
commit c5428d7267
4 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
res/layout/prompt_passphrase_activity.xml
View File

@@ -6,6 +6,7 @@
android:id="@+id/prompt_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/loki_darkest_gray"
android:orientation="vertical">
<View android:id="@+id/shim"
@@ -17,7 +18,6 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?login_top_background"
android:layout_above="@id/shim">
</FrameLayout>
@@ -29,10 +29,10 @@
android:layout_marginTop="20dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="128dp"
android:src="@drawable/ic_launcher_foreground"
android:layout_gravity="center"/>
android:layout_width="wrap_content"
android:layout_height="64dp"
android:src="@drawable/ic_launcher_foreground"
android:layout_gravity="center" />
</android.support.v7.widget.Toolbar>
@@ -48,35 +48,42 @@
android:padding="20dp"
android:elevation="10dp">
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="40dp"
android:text="@string/prompt_passphrase_activity__signal_is_locked"
android:gravity="center_horizontal"
android:textSize="25sp"/>
<TextView
style="@style/Signal.Text.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/prompt_passphrase_activity__signal_is_locked"
android:textStyle="bold"
android:textAlignment="center"
android:textColor="@color/white"
android:layout_marginBottom="32dp" />
<ImageView android:id="@+id/fingerprint_auth_container"
android:src="@drawable/ic_fingerprint_white_48dp"
android:background="@drawable/circle_tintable"
android:backgroundTint="@color/signal_primary"
android:padding="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="60dp"
tools:visibility="visible"/>
<ImageView
android:id="@+id/fingerprint_auth_container"
android:src="@drawable/ic_fingerprint_white_48dp"
android:background="@drawable/circle_tintable"
android:backgroundTint="@color/signal_primary"
android:padding="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="32dp"
tools:visibility="visible"/>
<TextView android:id="@+id/lock_screen_auth_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/rounded_rectangle_dark"
android:backgroundTint="@color/signal_primary"
android:textColor="@color/white"
android:gravity="center_horizontal"
android:elevation="3dp"
android:padding="10dp"
android:text="@string/prompt_passphrase_activity__tap_to_unlock"
tools:visibility="gone"/>
<com.dd.CircularProgressButton
android:id="@+id/lock_screen_auth_container"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:background="@color/signal_primary"
android:textColor="@color/white"
app:cpb_colorIndicator="@color/white"
app:cpb_colorProgress="@color/textsecure_primary"
app:cpb_cornerRadius="4dp"
app:cpb_selectorIdle="@drawable/progress_button_state"
app:cpb_textIdle="@string/prompt_passphrase_activity__tap_to_unlock"
android:elevation="0dp"
android:stateListAnimator="@null" />
<RelativeLayout android:id="@+id/password_auth_container"
android:layout_width="match_parent"