Merge pull request #329 from metaphore/passphrase-theme-fix

Fix Lock Screen Properly

AndroidManifest.xml

@@ -342,7 +342,8 @@
         <activity
             android:name="org.thoughtcrime.securesms.PassphrasePromptActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Session.DayNight.NoActionBar"/>
         <activity
             android:name="org.thoughtcrime.securesms.NewConversationActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"

res/drawable/ic_baseline_add_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>

res/drawable/ic_baseline_arrow_forward_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>

res/drawable/ic_baseline_mic_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>

res/drawable/ic_baseline_visibility_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>

res/drawable/ic_baseline_visibility_off_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>

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"/>

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" />
 
     <androidx.recyclerview.widget.RecyclerView

res/layout/invite_activity.xml

@@ -13,8 +13,7 @@
                       android:layout_height="wrap_content"
                       android:layout_width="match_parent"
                       android:orientation="vertical"
-                      android:padding="10dp"
-                      android:background="?attr/invite_background">
+                      android:padding="10dp">
 
             <ImageView android:id="@+id/heart"
                        android:layout_width="wrap_content"

res/layout/media_keyboard.xml

@@ -17,7 +17,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:padding="6dp"
-            android:src="@drawable/ic_search_white_24dp"
+            android:src="@drawable/ic_baseline_search_24"
             android:tint="?media_keyboard_button_color"
             android:background="?selectableItemBackgroundBorderless"
             android:visibility="invisible"
@@ -98,7 +98,7 @@
             android:tint="?media_keyboard_button_color"
             android:visibility="gone"
             android:background="?selectableItemBackground"
-            app:srcCompat="@drawable/ic_plus_24"
+            app:srcCompat="@drawable/ic_baseline_add_24"
             app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
             app:layout_constraintTop_toTopOf="@id/media_keyboard_tabs"
             app:layout_constraintEnd_toStartOf="@id/media_keyboard_backspace_backup"

res/layout/prompt_passphrase_activity.xml

@@ -6,7 +6,8 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                tools:context="org.thoughtcrime.securesms.PassphrasePromptActivity">
 
     <View android:id="@+id/shim"
           android:layout_width="match_parent"
@@ -25,7 +26,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="20dp">
+            android:layout_alignParentTop="true">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -78,7 +79,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="60dp"
-                        tools:visibility="gone">
+                        tools:visibility="visible">
 
             <EditText android:id="@+id/passphrase_edit"
                       android:layout_width="match_parent"
@@ -88,55 +89,56 @@
                       android:layout_marginEnd="50dp"
                       android:singleLine="true"
                       android:paddingStart="10dp"
-                      android:paddingEnd="40dp"/>
-
-<!--            <org.thoughtcrime.securesms.components.AnimatingToggle-->
-<!--                    android:id="@+id/button_toggle"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_alignRight="@+id/passphrase_edit"-->
-<!--                    android:layout_centerVertical="true"-->
-<!--                    android:layout_gravity="center"-->
-<!--                    android:gravity="center">-->
-
-<!--                <ImageButton android:id="@+id/passphrase_visibility"-->
-<!--                             android:src="?ic_visibility"-->
-<!--                             android:background="@drawable/touch_highlight_background"-->
-<!--                             android:layout_width="wrap_content"-->
-<!--                             android:layout_height="wrap_content"-->
-<!--                             android:paddingStart="8dp"-->
-<!--                             android:paddingEnd="8dp"-->
-<!--                             android:paddingTop="3dp"-->
-<!--                             android:paddingBottom="3dp"-->
-<!--                             android:layout_centerVertical="true" />-->
-
-<!--                <ImageButton android:id="@+id/passphrase_visibility_off"-->
-<!--                             android:src="?ic_visibility_off"-->
-<!--                             android:background="@drawable/touch_highlight_background"-->
-<!--                             android:layout_width="wrap_content"-->
-<!--                             android:layout_height="wrap_content"-->
-<!--                             android:paddingStart="8dp"-->
-<!--                             android:paddingEnd="8dp"-->
-<!--                             android:paddingTop="3dp"-->
-<!--                             android:paddingBottom="3dp"-->
-<!--                             android:layout_centerVertical="true" />-->
-
-<!--            </org.thoughtcrime.securesms.components.AnimatingToggle>-->
-
-<!--            <ImageButton android:id="@+id/ok_button"-->
-<!--                         android:src="?ic_arrow_forward"-->
-<!--                         android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"-->
-<!--                         android:background="@null"-->
-<!--                         android:text="@string/prompt_passphrase_activity__unlock"-->
-<!--                         android:layout_width="wrap_content"-->
-<!--                         android:layout_height="wrap_content"-->
-<!--                         android:layout_alignParentEnd="true"-->
-<!--                         android:layout_centerVertical="true"-->
-<!--                         android:textAppearance="?android:attr/textAppearanceMedium"-->
-<!--                         android:paddingStart="5dp"-->
-<!--                         android:paddingTop="5dp"-->
-<!--                         android:paddingEnd="10dp"-->
-<!--                         android:paddingBottom="5dp"/>-->
+                      android:paddingEnd="40dp"
+                      tools:text="password"/>
+
+            <org.thoughtcrime.securesms.components.AnimatingToggle
+                    android:id="@+id/button_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignRight="@+id/passphrase_edit"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:gravity="center">
+
+                <ImageButton android:id="@+id/passphrase_visibility"
+                             android:src="?ic_visibility_on"
+                             android:background="@drawable/touch_highlight_background"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:paddingStart="8dp"
+                             android:paddingEnd="8dp"
+                             android:paddingTop="3dp"
+                             android:paddingBottom="3dp"
+                             android:layout_centerVertical="true" />
+
+                <ImageButton android:id="@+id/passphrase_visibility_off"
+                             android:src="?ic_visibility_off"
+                             android:background="@drawable/touch_highlight_background"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:paddingStart="8dp"
+                             android:paddingEnd="8dp"
+                             android:paddingTop="3dp"
+                             android:paddingBottom="3dp"
+                             android:layout_centerVertical="true" />
+
+            </org.thoughtcrime.securesms.components.AnimatingToggle>
+
+            <ImageButton android:id="@+id/ok_button"
+                         android:src="?ic_arrow_forward"
+                         android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"
+                         android:background="@null"
+                         android:text="@string/prompt_passphrase_activity__unlock"
+                         android:layout_width="wrap_content"
+                         android:layout_height="wrap_content"
+                         android:layout_alignParentEnd="true"
+                         android:layout_centerVertical="true"
+                         android:textAppearance="?android:attr/textAppearanceMedium"
+                         android:paddingStart="5dp"
+                         android:paddingTop="5dp"
+                         android:paddingEnd="10dp"
+                         android:paddingBottom="5dp"/>
         </RelativeLayout>
 
     </LinearLayout>

res/values-notnight-v21/themes.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.Light" parent="Base.Theme.Session">
         <item name="android:navigationBarColor">?android:navigationBarColor</item>
@@ -23,6 +23,8 @@
         <item name="conversation_input_background">@drawable/compose_background_light</item>
 
         <item name="quick_camera_icon">@drawable/ic_outline_photo_camera_24</item>
+
+        <item name="media_keyboard_button_color">@color/core_grey_60</item>
     </style>
 
     <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
@@ -39,8 +41,6 @@
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
 
-        <item name="compose_icon_tint">@color/core_grey_60</item>
-
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
         <item name="conversation_list_item_contact_color">@color/core_grey_90</item>
         <item name="conversation_list_item_subject_color">@color/core_grey_60</item>
@@ -74,8 +74,6 @@
         <item name="conversation_sticker_footer_icon_color">@color/core_grey_60</item>
         <item name="conversation_sticker_author_color">@color/core_grey_95</item>
 
-        <item name="contact_list_divider">@drawable/contact_list_divider_light</item>
-
         <item name="verification_background">@color/core_grey_05</item>
 
         <item name="emoji_tab_strip_background">@color/cell_background</item>
@@ -101,21 +99,13 @@
         <item name="conversation_item_sent_text_primary_color">@color/core_grey_90</item>
         <item name="conversation_item_sent_text_secondary_color">@color/transparent_black_90</item>
         <item name="conversation_item_sent_icon_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_grey_60</item>
         <item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
         <item name="conversation_item_received_text_primary_color">@color/text</item>
         <item name="conversation_item_received_text_secondary_color">@color/text</item>
-        <item name="conversation_item_update_text_color">@color/core_grey_60</item>
-        <item name="conversation_item_last_seen_text_color">@color/core_grey_90</item>
-        <item name="conversation_item_last_seen_line_color">@color/core_grey_60</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_25</item>
-        <item name="conversation_item_quote_text_color">@color/core_grey_90</item>
         <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_light</item>
         <item name="conversation_item_sticky_date_text_color">@color/core_grey_60</item>
         <item name="conversation_item_image_outline_color">@color/transparent_black_30</item>
 
-        <item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
-
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
@@ -124,34 +114,14 @@
 
         <item name="device_link_item_card_background">@color/device_link_item_background_light</item>
 
-        <item name="mediapicker_image_outline">@drawable/mediapicker_item_border_light</item>
-
-        <item name="import_export_item_background_color">@color/import_export_item_background_light</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_light</item>
-
         <item name="linkpreview_background_color">@color/core_white</item>
         <item name="linkpreview_primary_text_color">@color/core_black</item>
         <item name="linkpreview_secondary_text_color">@color/core_grey_60</item>
         <item name="linkpreview_divider_color">@color/core_grey_25</item>
 
-        <item name="media_keyboard_button_color">@color/core_grey_60</item>
-
-        <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
-        <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
-        <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
-        <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
-        <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
 
-        <item name="reminder_header_background">#ff1d85d7</item>
-
         <item name="sticker_management_icon">@drawable/sticker_button_light</item>
         <item name="sticker_management_divider_color">@color/core_grey_15</item>
         <item name="sticker_management_empty_background_color">@color/core_grey_05</item>
@@ -165,17 +135,9 @@
 
         <item name="pref_icon_tint">@color/textsecure_primary_dark</item>
 
-        <item name="pref_divider">@drawable/preference_divider_light</item>
-
-        <item name="quote_missing_icon_color">@color/core_grey_60</item>
-
         <item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
 
-        <item name="search_toolbar_background">@color/white</item>
-        <item name="search_background">@color/white</item>
-        <item name="invite_background">@color/signal_primary</item>
-
         <item name="shared_contact_details_header_background">@color/grey_100</item>
         <item name="shared_contact_details_titlebar">@color/grey_400</item>
         <item name="shared_contact_item_button_color">@color/core_grey_02</item>

res/values-notnight-v23/themes.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
         <item name="android:statusBarColor">@color/transparent</item>

res/values-v23/themes.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.ForceDark" parent="Base.Theme.Session.ForceDark">
         <item name="android:windowLightStatusBar">false</item>

res/values/attrs.xml

@@ -19,16 +19,13 @@
     <attr name="conversation_list_toolbar_background" format="reference"/>
     <attr name="conversation_list_typing_tint" format="color"/>
 
-    <attr name="conversation_sent_card_background" format="reference|color"/>
     <attr name="conversation_group_member_name" format="reference|color"/>
-    <attr name="conversation_received_card_background" format="reference|color"/>
 
     <attr name="fab_color" format="reference|color" />
     <attr name="lower_right_divet" format="reference" />
 
-    <attr name="centered_app_title_color" format="reference|color" />
     <attr name="ic_arrow_forward" format="reference" />
-    <attr name="ic_visibility" format="reference" />
+    <attr name="ic_visibility_on" format="reference" />
     <attr name="ic_visibility_off" format="reference" />
 
     <attr name="conversation_background" format="reference|color"/>
@@ -76,9 +73,6 @@
     <attr name="quick_camera_icon" format="reference"/>
     <attr name="quick_mic_icon" format="reference"/>
 
-    <attr name="compose_icon_tint" />
-
-    <attr name="conversation_item_background" format="reference"/>
     <attr name="conversation_item_bubble_background" format="reference|color"/>
     <attr name="conversation_item_sent_text_primary_color" format="reference|color"/>
     <attr name="conversation_item_sent_text_secondary_color" format="reference|color"/>
@@ -87,12 +81,6 @@
     <attr name="conversation_item_sent_text_indicator_tab_color" format="reference|color"/>
     <attr name="conversation_item_sent_indicator_text_background" format="reference" />
     <attr name="conversation_item_sent_icon_color" format="color" />
-    <attr name="conversation_item_sent_download_icon_color" format="reference|color"/>
-    <attr name="conversation_item_update_text_color" format="reference"/>
-    <attr name="conversation_item_last_seen_text_color" format="reference"/>
-    <attr name="conversation_item_last_seen_line_color" format="reference"/>
-    <attr name="conversation_item_date_line_color" format="reference"/>
-    <attr name="conversation_item_quote_text_color" format="reference"/>
     <attr name="conversation_item_sticky_date_background" format="reference" />
     <attr name="conversation_item_sticky_date_text_color" format="color" />
     <attr name="conversation_item_image_outline_color" format="color" />
@@ -104,45 +92,21 @@
     <attr name="conversation_icon_attach_audio" format="reference"/>
     <attr name="conversation_icon_attach_video" format="reference" />
 
-    <attr name="contact_selection_push_user" format="reference|color" />
-    <attr name="contact_selection_lay_user" format="reference|color" />
-    <attr name="contact_selection_label_text" format="reference|color" />
-    <attr name="contact_selection_header_text" format="reference|color" />
-
     <attr name="device_link_item_card_background" format="reference|color" />
 
-    <attr name="mediapicker_image_outline" format="reference" />
-
-    <attr name="import_export_item_background_color" format="reference|color" />
-    <attr name="import_export_item_background_shadow_color" format="reference|color" />
-    <attr name="import_export_item_card_background" format="reference" />
-
-    <attr name="invite_background" format="color"/>
-
     <attr name="linkpreview_background_color" format="color" />
     <attr name="linkpreview_primary_text_color" format="color" />
     <attr name="linkpreview_secondary_text_color" format="color" />
     <attr name="linkpreview_divider_color" format="color" />
 
-    <attr name="reminder_header_background" format="color"/>
-
     <attr name="media_keyboard_button_color" format="color" />
 
-    <attr name="menu_new_conversation_icon" format="reference" />
-    <attr name="menu_search_icon" format="reference" />
-    <attr name="menu_call_icon" format="reference" />
     <attr name="menu_popup_expand" format="reference"/>
-    <attr name="menu_unlock_icon" format="reference" />
-    <attr name="menu_lock_icon" format="reference" />
-    <attr name="menu_lock_icon_small" format="reference" />
     <attr name="menu_trash_icon" format="reference" />
     <attr name="menu_selectall_icon" format="reference" />
-    <attr name="menu_group_icon" format="reference" />
     <attr name="menu_split_icon" format="reference" />
     <attr name="menu_accept_icon" format="reference" />
-    <attr name="menu_refresh_directory" format="reference" />
     <attr name="menu_copy_icon" format="reference" />
-    <attr name="menu_info_icon" format="reference" />
     <attr name="menu_forward_icon" format="reference" />
     <attr name="menu_save_icon" format="reference" />
     <attr name="menu_reply_icon" format="reference" />
@@ -152,40 +116,23 @@
 
     <attr name="pref_icon_tint" format="color"/>
 
-    <attr name="pref_divider" format="reference" />
-
-    <attr name="quote_missing_icon_color" format="color" />
-
     <attr name="home_gradient_start" format="color|reference" />
     <attr name="home_gradient_end" format="color|reference" />
 
     <attr name="message_received_background_color" format="color|reference" />
     <attr name="message_sent_background_color" format="color|reference" />
 
-    <declare-styleable name="CustomDefaultPreference">
-        <attr name="custom_pref_toggle" format="string"/>
-    </declare-styleable>
-
     <attr name="group_members_dialog_icon" format="reference"/>
-    <attr name="lockscreen_watermark" format="reference" />
-
-    <attr name="recipient_preference_blocked" format="color"/>
 
     <attr name="verification_background" format="color"/>
 
     <attr name="media_overview_toolbar_background" format="color"/>
-    <attr name="media_overview_toolbar_foreground" format="color"/>
     <attr name="media_overview_header_foreground" format="color"/>
-    <attr name="media_overview_document_primary" format="color"/>
-    <attr name="media_overview_document_secondary" format="color"/>
 
     <attr name="shared_contact_details_header_background" format="color"/>
     <attr name="shared_contact_details_titlebar" format="color"/>
     <attr name="shared_contact_item_button_color" format="color"/>
 
-    <attr name="search_toolbar_background" format="color"/>
-    <attr name="search_background" format="color"/>
-
     <attr name="sticker_management_icon" format="reference" />
     <attr name="sticker_management_divider_color" format="color" />
     <attr name="sticker_management_empty_background_color" format="color" />
@@ -197,15 +144,8 @@
 
     <attr name="tooltip_default_color" format="reference|color" />
 
-    <attr name="contact_list_divider" format="reference"/>
-
-    <attr name="login_top_background" format="color"/>
-    <attr name="login_floating_background" format="reference"/>
-
-    <declare-styleable name="ColorPreference">
-        <attr name="itemLayout" format="reference" />
-        <attr name="choices" format="reference" />
-        <attr name="numColumns" format="integer" />
+    <declare-styleable name="CustomDefaultPreference">
+        <attr name="custom_pref_toggle" format="string"/>
     </declare-styleable>
 
     <declare-styleable name="AvatarImageView">
@@ -270,22 +210,12 @@
         <attr name="emoji_maxLength" format="integer" />
     </declare-styleable>
 
-    <declare-styleable name="RingtonePreference">
-        <attr name="showAdd" format="boolean" />
-        <attr name="summaryHasRingtone" format="string|reference" />
-    </declare-styleable>
-
     <declare-styleable name="ColorPickerPreference">
         <attr name="currentColor" format="reference" />
-
         <attr name="colors" format="reference" />
-
         <attr name="sortColors" format="boolean|reference" />
-
         <attr name="colorDescriptions" format="reference" />
-
         <attr name="columns" format="integer|reference" />
-
         <attr name="colorSize" format="enum|reference">
             <enum name="large" value="1" />
             <enum name="small" value="2" />

res/values/styles.xml

@@ -6,7 +6,6 @@
         <item name="android:background">?colorPrimary</item>
         <item name="elevation">1dp</item>
         <item name="titleTextStyle">@style/TextAppearance.Session.DarkActionBar.TitleTextStyle</item>
-        <item name="popupTheme">@style/Widget.Session.ActionBar</item>
     </style>
 
     <style name="Widget.Session.ActionBar.Flat">

res/values/themes.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
 
     <!-- Session -->
@@ -43,16 +42,14 @@
         <item name="dividerHorizontal">?dividerVertical</item>
 
         <!-- App specific attributes -->
-        <item name="search_toolbar_background">@color/black</item>
-        <item name="search_background">@color/black</item>
+        <item name="ic_visibility_on">@drawable/ic_baseline_visibility_24</item>
+        <item name="ic_visibility_off">@drawable/ic_baseline_visibility_off_24</item>
+        <item name="ic_arrow_forward">@drawable/ic_baseline_arrow_forward_24</item>
 
         <item name="dialog_background_color">@color/dialog_background</item>
 
         <item name="media_overview_toolbar_background">@color/transparent</item>
-        <item name="media_overview_toolbar_foreground">@color/white</item>
         <item name="media_overview_header_foreground">@color/text</item>
-        <item name="media_overview_document_primary">@color/core_grey_05</item>
-        <item name="media_overview_document_secondary">#99FFFFFF</item>
         <item name="media_keyboard_button_color">@color/core_grey_25</item>
         <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
 
@@ -87,6 +84,7 @@
         <item name="conversation_input_background">@drawable/compose_background_dark</item>
 
         <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>
+        <item name="quick_mic_icon">@drawable/ic_baseline_mic_24</item>
     </style>
 
     <!-- This should be the default theme for the application. -->
@@ -158,14 +156,7 @@
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
 
-        <item name="recipient_preference_blocked">#d00000</item>
-        <item name="contact_selection_label_text">#66eeeeee</item>
-        <item name="contact_selection_push_user">#ffeeeeee</item>
-        <item name="contact_selection_lay_user">#afeeeeee</item>
-        <item name="contact_selection_header_text">#66eeeeee</item>
-
         <item name="media_overview_toolbar_background">@color/transparent</item>
-        <item name="media_overview_toolbar_foreground">@color/white</item>
         <item name="media_overview_header_foreground">@color/text</item>
 
         <item name="theme_type">dark</item>
@@ -175,8 +166,6 @@
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
 
-        <item name="compose_icon_tint">@color/core_grey_25</item>
-
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
         <item name="conversation_list_item_contact_color">#ffdddddd</item>
         <item name="conversation_list_item_subject_color">#ffdddddd</item>
@@ -194,22 +183,14 @@
         <item name="conversation_item_sent_text_primary_color">@color/core_grey_05</item>
         <item name="conversation_item_sent_text_secondary_color">@color/core_grey_25</item>
         <item name="conversation_item_sent_icon_color">@color/core_grey_25</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_white</item>
         <item name="conversation_item_sent_text_indicator_tab_color">#99ffffff</item>
         <item name="conversation_item_received_text_primary_color">@color/text</item>
         <item name="conversation_item_received_text_secondary_color">@color/text</item>
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
-        <item name="conversation_item_update_text_color">@color/core_grey_45</item>
-        <item name="conversation_item_last_seen_text_color">@color/core_grey_25</item>
-        <item name="conversation_item_last_seen_line_color">@color/core_grey_25</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_45</item>
-        <item name="conversation_item_quote_text_color">@color/core_grey_05</item>
         <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_dark</item>
         <item name="conversation_item_sticky_date_text_color">@color/core_grey_45</item>
         <item name="conversation_item_image_outline_color">@color/transparent_white_30</item>
 
-        <item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
-
         <item name="verification_background">@color/core_grey_95</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
@@ -217,12 +198,6 @@
 
         <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
 
-        <item name="mediapicker_image_outline">@drawable/mediapicker_item_border_dark</item>
-
-        <item name="import_export_item_background_color">@color/import_export_item_background_dark</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_dark</item>
-
         <item name="fab_color">@color/textsecure_primary_dark</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
@@ -269,27 +244,9 @@
         <item name="linkpreview_secondary_text_color">@color/text</item>
         <item name="linkpreview_divider_color">@color/transparent</item>
 
-<!--        <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>-->
-        <item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
-
-        <item name="media_keyboard_button_color">@color/core_grey_25</item>
-
-        <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
-        <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
-        <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
-        <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
-        <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>
 
-        <item name="reminder_header_background">@color/textsecure_primary_dark</item>
-
         <item name="sticker_management_icon">@drawable/sticker_button_dark</item>
         <item name="sticker_management_divider_color">@color/core_grey_75</item>
         <item name="sticker_management_empty_background_color">@color/core_grey_85</item>
@@ -303,15 +260,8 @@
 
         <item name="pref_icon_tint">#FFFFFF</item>
 
-        <item name="pref_divider">@drawable/preference_divider_dark</item>
-
-        <item name="quote_missing_icon_color">@color/core_grey_05</item>
-
         <item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
-        <item name="search_toolbar_background">@color/black</item>
-        <item name="search_background">@color/black</item>
-        <item name="invite_background">@color/black</item>
 
         <item name="shared_contact_details_header_background">@color/grey_800</item>
         <item name="shared_contact_details_titlebar">@color/grey_900</item>

res/xml/recipient_preferences.xml

@@ -44,7 +44,7 @@
                 android:negativeButtonText="@null"
                 android:positiveButtonText="@null"
                 android:persistent="false"
-                app:numColumns="5" />
+                app:columns="5" />
     </PreferenceCategory>
 
     <PreferenceCategory android:layout="@layout/preference_divider"/>

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);
     }
   }