diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a65c1bdfb0..166b896dc6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -342,7 +342,8 @@
+ android:launchMode="singleTask"
+ android:theme="@style/Theme.Session.DayNight.NoActionBar"/>
+
+
diff --git a/res/drawable/ic_baseline_arrow_forward_24.xml b/res/drawable/ic_baseline_arrow_forward_24.xml
new file mode 100644
index 0000000000..702e70c537
--- /dev/null
+++ b/res/drawable/ic_baseline_arrow_forward_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/res/drawable/ic_baseline_mic_24.xml b/res/drawable/ic_baseline_mic_24.xml
new file mode 100644
index 0000000000..791b475704
--- /dev/null
+++ b/res/drawable/ic_baseline_mic_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/res/drawable/ic_baseline_visibility_24.xml b/res/drawable/ic_baseline_visibility_24.xml
new file mode 100644
index 0000000000..a3e222a2d1
--- /dev/null
+++ b/res/drawable/ic_baseline_visibility_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/res/drawable/ic_baseline_visibility_off_24.xml b/res/drawable/ic_baseline_visibility_off_24.xml
new file mode 100644
index 0000000000..92c48569fd
--- /dev/null
+++ b/res/drawable/ic_baseline_visibility_off_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/res/layout/conversation_item_sent_document.xml b/res/layout/conversation_item_sent_document.xml
index ce627e27a6..2145cfdbf2 100644
--- a/res/layout/conversation_item_sent_document.xml
+++ b/res/layout/conversation_item_sent_document.xml
@@ -9,5 +9,5 @@
android:visibility="gone"
app:doc_titleColor="?conversation_item_sent_text_primary_color"
app:doc_captionColor="?conversation_item_sent_text_secondary_color"
- app:doc_downloadButtonTint="?conversation_item_sent_download_icon_color"
+ app:doc_downloadButtonTint="?android:colorControlNormal"
tools:visibility="visible"/>
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
index ae8401c6e8..18766af64e 100644
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:background="?attr/search_background"
+ android:background="?android:windowBackground"
android:visibility="gone" />
+ android:padding="10dp">
+ android:orientation="vertical"
+ tools:context="org.thoughtcrime.securesms.PassphrasePromptActivity">
+ android:layout_alignParentTop="true">
+ tools:visibility="visible">
+ android:paddingEnd="40dp"
+ tools:text="password"/>
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/res/values-notnight-v21/themes.xml b/res/values-notnight-v21/themes.xml
index 5b2bb7ee65..3743b4fc5a 100644
--- a/res/values-notnight-v21/themes.xml
+++ b/res/values-notnight-v21/themes.xml
@@ -1,5 +1,5 @@
-
+
@@ -158,14 +156,7 @@
- @color/action_bar_background
- @color/action_bar_background
- - #d00000
- - #66eeeeee
- - #ffeeeeee
- - #afeeeeee
- - #66eeeeee
-
- @color/transparent
- - @color/white
- @color/text
- dark
@@ -175,8 +166,6 @@
- @drawable/ic_document_small_dark
- @drawable/ic_document_large_dark
- - @color/core_grey_25
-
- @drawable/conversation_list_item_background_dark
- #ffdddddd
- #ffdddddd
@@ -194,22 +183,14 @@
- @color/core_grey_05
- @color/core_grey_25
- @color/core_grey_25
- - @color/core_white
- #99ffffff
- @color/text
- @color/text
- @drawable/conversation_item_sent_indicator_text_shape_dark
- - @color/core_grey_45
- - @color/core_grey_25
- - @color/core_grey_25
- - @color/core_grey_45
- - @color/core_grey_05
- @drawable/sticky_date_header_background_dark
- @color/core_grey_45
- @color/transparent_white_30
- - @drawable/contact_list_divider_dark
-
- @color/core_grey_95
- @drawable/ic_info_outline_dark
@@ -217,12 +198,6 @@
- @color/device_link_item_background_dark
- - @drawable/mediapicker_item_border_dark
-
- - @color/import_export_item_background_dark
- - @color/import_export_item_background_shadow_dark
- - @drawable/clickable_card_dark
-
- @color/textsecure_primary_dark
- @drawable/divet_lower_right_light
@@ -269,27 +244,9 @@
- @color/text
- @color/transparent
-
- - @drawable/ic_mic_white_24dp
-
- - @color/core_grey_25
-
- - @drawable/ic_add_white_24dp
- - @drawable/ic_group_white_24dp
- - @drawable/ic_search_white_24dp
- - @drawable/ic_call_white_24dp
- - @drawable/ic_unlocked_white_24dp
- - @drawable/ic_lock_white_24dp
- - @drawable/ic_lock_white_18dp
- - @drawable/ic_check_white_24dp
- - @drawable/ic_refresh_white_24dp
- - @drawable/ic_info_outline_white_24dp
-
- @drawable/ic_audio_dark
- @drawable/ic_video_dark
- - @color/textsecure_primary_dark
-
- @drawable/sticker_button_dark
- @color/core_grey_75
- @color/core_grey_85
@@ -303,15 +260,8 @@
- #FFFFFF
- - @drawable/preference_divider_dark
-
- - @color/core_grey_05
-
- @drawable/ic_group_white_24dp
- @style/PreferenceThemeOverlay.Fix
- - @color/black
- - @color/black
- - @color/black
- @color/grey_800
- @color/grey_900
diff --git a/res/xml/recipient_preferences.xml b/res/xml/recipient_preferences.xml
index 0b90fb0901..0dbeaf492f 100644
--- a/res/xml/recipient_preferences.xml
+++ b/res/xml/recipient_preferences.xml
@@ -44,7 +44,7 @@
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:persistent="false"
- app:numColumns="5" />
+ app:columns="5" />
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index fedb1649c0..475c097647 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -23,9 +23,6 @@ import android.content.Intent;
import android.graphics.PorterDuff;
import android.os.Build;
import android.os.Bundle;
-import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
-import androidx.core.os.CancellationSignal;
-import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.InputType;
import android.text.SpannableString;
@@ -49,6 +46,9 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
+import androidx.core.os.CancellationSignal;
+
import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
import org.thoughtcrime.securesms.components.AnimatingToggle;
import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@@ -76,8 +76,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
private Button lockScreenButton;
private EditText passphraseText;
-// private ImageButton showButton;
-// private ImageButton hideButton;
+ private ImageButton showButton;
+ private ImageButton hideButton;
private AnimatingToggle visibilityToggle;
private FingerprintManagerCompat fingerprintManager;
@@ -91,8 +91,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
public void onCreate(Bundle savedInstanceState) {
Log.i(TAG, "onCreate()");
dynamicLanguage.onCreate(this);
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
super.onCreate(savedInstanceState);
setContentView(R.layout.prompt_passphrase_activity);
@@ -203,11 +201,10 @@ public class PassphrasePromptActivity extends PassphraseActivity {
private void initializeResources() {
-// ImageButton okButton = findViewById(R.id.ok_button);
- Toolbar toolbar = findViewById(R.id.toolbar);
+ ImageButton okButton = findViewById(R.id.ok_button);
-// showButton = findViewById(R.id.passphrase_visibility);
-// hideButton = findViewById(R.id.passphrase_visibility_off);
+ showButton = findViewById(R.id.passphrase_visibility);
+ hideButton = findViewById(R.id.passphrase_visibility_off);
visibilityToggle = findViewById(R.id.button_toggle);
passphraseText = findViewById(R.id.passphrase_edit);
passphraseAuthContainer = findViewById(R.id.password_auth_container);
@@ -217,20 +214,16 @@ public class PassphrasePromptActivity extends PassphraseActivity {
fingerprintCancellationSignal = new CancellationSignal();
fingerprintListener = new FingerprintListener();
-// setSupportActionBar(toolbar);
-// getSupportActionBar().setTitle("");
-
SpannableString hint = new SpannableString(" " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
passphraseText.setHint(hint);
-// okButton.setOnClickListener(new OkButtonClickListener());
-// showButton.setOnClickListener(new ShowButtonOnClickListener());
-// hideButton.setOnClickListener(new HideButtonOnClickListener());
+ okButton.setOnClickListener(new OkButtonClickListener());
+ showButton.setOnClickListener(new ShowButtonOnClickListener());
+ hideButton.setOnClickListener(new HideButtonOnClickListener());
passphraseText.setOnEditorActionListener(new PassphraseActionListener());
- passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock),
- EditorInfo.IME_ACTION_DONE);
+ passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock), EditorInfo.IME_ACTION_DONE);
fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
@@ -316,7 +309,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
private class ShowButtonOnClickListener implements OnClickListener {
@Override
public void onClick(View v) {
-// visibilityToggle.display(hideButton);
+ visibilityToggle.display(hideButton);
setPassphraseVisibility(true);
}
}
@@ -324,7 +317,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
private class HideButtonOnClickListener implements OnClickListener {
@Override
public void onClick(View v) {
-// visibilityToggle.display(showButton);
+ visibilityToggle.display(showButton);
setPassphraseVisibility(false);
}
}