TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 17:27:45 +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
Show Stats 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:id="@+id/prompt_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/loki_darkest_gray"
android:orientation="vertical"> android:orientation="vertical">
<View android:id="@+id/shim" <View android:id="@+id/shim"
@ -17,7 +18,6 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?login_top_background"
android:layout_above="@id/shim"> android:layout_above="@id/shim">
</FrameLayout> </FrameLayout>
@ -29,10 +29,10 @@
android:layout_marginTop="20dp"> android:layout_marginTop="20dp">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="128dp" android:layout_height="64dp"
android:src="@drawable/ic_launcher_foreground" android:src="@drawable/ic_launcher_foreground"
android:layout_gravity="center"/> android:layout_gravity="center" />
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>
@ -48,35 +48,42 @@
android:padding="20dp" android:padding="20dp"
android:elevation="10dp"> android:elevation="10dp">
<TextView android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/Signal.Text.Body"
android:layout_marginBottom="40dp" android:layout_width="match_parent"
android:text="@string/prompt_passphrase_activity__signal_is_locked" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:text="@string/prompt_passphrase_activity__signal_is_locked"
android:textSize="25sp"/> android:textStyle="bold"
android:textAlignment="center"
android:textColor="@color/white"
android:layout_marginBottom="32dp" />
<ImageView android:id="@+id/fingerprint_auth_container" <ImageView
android:src="@drawable/ic_fingerprint_white_48dp" android:id="@+id/fingerprint_auth_container"
android:background="@drawable/circle_tintable" android:src="@drawable/ic_fingerprint_white_48dp"
android:backgroundTint="@color/signal_primary" android:background="@drawable/circle_tintable"
android:padding="20dp" android:backgroundTint="@color/signal_primary"
android:layout_width="wrap_content" android:padding="20dp"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal" android:layout_height="wrap_content"
android:layout_marginBottom="60dp" android:layout_gravity="center_horizontal"
tools:visibility="visible"/> android:layout_marginBottom="32dp"
tools:visibility="visible"/>
<TextView android:id="@+id/lock_screen_auth_container" <com.dd.CircularProgressButton
android:layout_width="match_parent" android:id="@+id/lock_screen_auth_container"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:background="@drawable/rounded_rectangle_dark" android:layout_height="50dp"
android:backgroundTint="@color/signal_primary" android:layout_gravity="center_horizontal"
android:textColor="@color/white" android:background="@color/signal_primary"
android:gravity="center_horizontal" android:textColor="@color/white"
android:elevation="3dp" app:cpb_colorIndicator="@color/white"
android:padding="10dp" app:cpb_colorProgress="@color/textsecure_primary"
android:text="@string/prompt_passphrase_activity__tap_to_unlock" app:cpb_cornerRadius="4dp"
tools:visibility="gone"/> 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" <RelativeLayout android:id="@+id/password_auth_container"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/values/strings.xml
View File

@ -1536,7 +1536,7 @@
<string name="RegistrationLockDialog_disable_registration_lock_pin">Disable Registration Lock PIN?</string> <string name="RegistrationLockDialog_disable_registration_lock_pin">Disable Registration Lock PIN?</string>
<string name="RegistrationLockDialog_disable">Disable</string> <string name="RegistrationLockDialog_disable">Disable</string>
<string name="preferences_chats__backups">Backups</string> <string name="preferences_chats__backups">Backups</string>
<string name="prompt_passphrase_activity__signal_is_locked">Loki Messenger is locked</string> <string name="prompt_passphrase_activity__signal_is_locked">Loki Messenger is Locked</string>
<string name="prompt_passphrase_activity__tap_to_unlock">TAP TO UNLOCK</string> <string name="prompt_passphrase_activity__tap_to_unlock">TAP TO UNLOCK</string>
<string name="RegistrationLockDialog_reminder">Reminder:</string> <string name="RegistrationLockDialog_reminder">Reminder:</string>
<string name="recipient_preferences__about">About</string> <string name="recipient_preferences__about">About</string>

2
res/values/themes.xml
View File

@ -75,7 +75,7 @@
<item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item> <item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
<item name="login_top_background">@color/signal_primary</item> <item name="login_top_background">@color/signal_primary</item>
<item name="login_floating_background">@drawable/rounded_rectangle_white</item> <item name="login_floating_background">@drawable/rounded_rectangle_dark</item>
</style> </style>

12
src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
View File

@ -48,6 +48,8 @@ import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.dd.CircularProgressButton;
import org.thoughtcrime.securesms.animation.AnimationCompleteListener; import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
import org.thoughtcrime.securesms.components.AnimatingToggle; import org.thoughtcrime.securesms.components.AnimatingToggle;
import org.thoughtcrime.securesms.crypto.InvalidPassphraseException; import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@ -72,9 +74,9 @@ public class PassphrasePromptActivity extends PassphraseActivity {
private DynamicIntroTheme dynamicTheme = new DynamicIntroTheme(); private DynamicIntroTheme dynamicTheme = new DynamicIntroTheme();
private DynamicLanguage dynamicLanguage = new DynamicLanguage(); private DynamicLanguage dynamicLanguage = new DynamicLanguage();
private View passphraseAuthContainer; private View passphraseAuthContainer;
private ImageView fingerprintPrompt; private ImageView fingerprintPrompt;
private TextView lockScreenButton; private CircularProgressButton lockScreenButton;
private EditText passphraseText; private EditText passphraseText;
private ImageButton showButton; private ImageButton showButton;
@ -136,7 +138,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
MenuInflater inflater = this.getMenuInflater(); MenuInflater inflater = this.getMenuInflater();
menu.clear(); menu.clear();
inflater.inflate(R.menu.log_submit, menu); // inflater.inflate(R.menu.log_submit, menu);
super.onPrepareOptionsMenu(menu); super.onPrepareOptionsMenu(menu);
return true; return true;
} }
@ -276,7 +278,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null); fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null);
} else if (Build.VERSION.SDK_INT >= 21){ } else if (Build.VERSION.SDK_INT >= 21){
Log.i(TAG, "firing intent..."); Log.i(TAG, "firing intent...");
Intent intent = keyguardManager.createConfirmDeviceCredentialIntent("Unlock Signal", ""); Intent intent = keyguardManager.createConfirmDeviceCredentialIntent("Unlock Loki Messenger", "");
startActivityForResult(intent, 1); startActivityForResult(intent, 1);
} else { } else {
Log.w(TAG, "Not compatible..."); Log.w(TAG, "Not compatible...");