From 85eff702c3dddaf64b05297ff423614220c53aed Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Thu, 13 May 2021 14:24:30 +1000
Subject: [PATCH] clean

---
 .../loki/dialogs/UserDetailsBottomSheet.kt    |   4 -
 .../fragment_user_details_bottom_sheet.xml    |   8 +-
 libsession/src/main/res/values/styles.xml     | 441 ------------------
 libsession/src/main/res/values/themes.xml     | 294 ------------
 4 files changed, 5 insertions(+), 742 deletions(-)
 delete mode 100644 libsession/src/main/res/values/styles.xml
 delete mode 100644 libsession/src/main/res/values/themes.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
index 08c7183501..e060170d5c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
@@ -4,9 +4,7 @@ import android.annotation.SuppressLint
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
-import android.opengl.Visibility
 import android.os.Bundle
-import android.text.InputType
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
@@ -14,12 +12,10 @@ import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import kotlinx.android.synthetic.main.fragment_user_details_bottom_sheet.*
-import kotlinx.android.synthetic.main.view_conversation.view.*
 import network.loki.messenger.R
 import org.session.libsession.messaging.threads.Address
 import org.session.libsession.messaging.threads.recipients.Recipient
 import org.session.libsession.utilities.SSKEnvironment
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.mms.GlideApp
 
 public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
diff --git a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
index 48496a4982..f172a42f75 100644
--- a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
@@ -29,20 +29,22 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:visibility="invisible">
+            android:visibility="visible">
 
             <TextView
                 android:id="@+id/nameTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:textSize="@dimen/massive_font_size"
                 android:textStyle="bold"
                 android:textColor="@color/text"
+                android:textAlignment="center"
                 android:text="Spiderman"
                 android:paddingStart="24dp"
                 android:paddingEnd="0dp"
-                android:drawablePadding="@dimen/small_spacing"
-                app:drawableEndCompat="@drawable/ic_baseline_edit_24" />
+                android:drawableEnd="@drawable/ic_baseline_edit_24"
+                android:drawablePadding="@dimen/small_spacing" />
 
         </LinearLayout>
 
diff --git a/libsession/src/main/res/values/styles.xml b/libsession/src/main/res/values/styles.xml
deleted file mode 100644
index db1af0eab2..0000000000
--- a/libsession/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <!-- Session -->
-    <style name="Widget.Session.ActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid">
-        <item name="android:background">?colorPrimary</item>
-        <item name="elevation">1dp</item>
-        <item name="titleTextStyle">@style/TextAppearance.Session.DarkActionBar.TitleTextStyle</item>
-    </style>
-
-    <style name="Widget.Session.ActionBar.Flat">
-        <item name="android:elevation">0dp</item>
-        <item name="elevation">0dp</item>
-    </style>
-
-    <style name="TextAppearance.Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:textSize">@dimen/very_large_font_size</item>
-    </style>
-
-    <style name="Widget.Session.SearchView" parent="@style/Widget.AppCompat.SearchView">
-        <item name="closeIcon">@drawable/ic_clear</item>
-    </style>
-
-    <style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
-        <item name="buttonBarNegativeButtonStyle">@style/Widget.Session.AlertDialog.NegativeButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.Session.AlertDialog.PositiveButtonStyle</item>
-    </style>
-
-    <style name="Widget.Session.BottomSheetDialog" parent="Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@drawable/default_bottom_sheet_background</item>
-    </style>
-
-    <style name="Widget.Session.AlertDialog.NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-        <item name="android:textColor">@color/accent</item>
-    </style>
-
-    <style name="Widget.Session.AlertDialog.PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-        <item name="android:textColor">@color/accent</item>
-    </style>
-
-    <style name="Widget.Session.AppBarLayout" parent="@style/Widget.Design.AppBarLayout">
-
-    </style>
-
-    <style name="Widget.Session.TabBar" parent="Widget.AppCompat.ActionBar.TabBar">
-        <item name="elevation">1dp</item>
-    </style>
-
-    <style name="Widget.Session.TabLayout" parent="Widget.Design.TabLayout">
-        <item name="elevation">1dp</item>
-        <item name="tabIndicatorColor">?colorAccent</item>
-        <item name="tabSelectedTextColor">?colorAccent</item>>
-        <item name="tabIndicatorHeight">@dimen/accent_line_thickness</item>
-        <item name="tabRippleColor">@color/cell_selected</item>
-        <item name="tabTextAppearance">@style/TextAppearance.Session.Tab</item>
-    </style>
-
-    <style name="TextAppearance.Session.Tab" parent="TextAppearance.Design.Tab">
-        <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="textAllCaps">false</item>
-    </style>
-
-    <!--  TODO These button styles require proper background selectors for up/down visual state.  -->
-    <style name="Widget.Session.Button.Common" parent="">
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <!-- Helps to get rid of nasty elevation. We want a flat style here. -->
-        <!-- https://stackoverflow.com/a/31003693/3802890 -->
-        <item name ="android:stateListAnimator">@null</item>
-    </style>
-
-    <style name="Widget.Session.Button.Common.ProminentFilled">
-        <item name="android:background">@drawable/prominent_filled_button_medium_background</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:drawableTint" tools:ignore="NewApi">?android:textColorPrimary</item>
-    </style>
-
-    <style name="Widget.Session.Button.Common.ProminentOutline">
-        <item name="android:background">@drawable/prominent_outline_button_medium_background</item>
-        <item name="android:textColor">@color/accent</item>
-        <item name="android:drawableTint" tools:ignore="NewApi">@color/accent</item>
-    </style>
-
-    <style name="Widget.Session.Button.Common.UnimportantFilled">
-        <item name="android:background">@drawable/unimportant_filled_button_medium_background</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:drawableTint" tools:ignore="NewApi">?android:textColorPrimary</item>
-    </style>
-
-    <style name="Widget.Session.Button.Common.UnimportantOutline">
-        <item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:drawableTint" tools:ignore="NewApi">?android:textColorPrimary</item>
-    </style>
-
-    <style name="Widget.Session.Button.Dialog" parent="">
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-    </style>
-
-    <style name="Widget.Session.Button.Dialog.Unimportant">
-        <item name="android:background">@drawable/unimportant_dialog_button_background</item>
-    </style>
-
-    <style name="Widget.Session.Button.Dialog.Prominent">
-        <item name="android:background">@drawable/prominent_dialog_button_background</item>
-        <item name="android:textColor">#222</item>
-    </style>
-
-    <style name="Widget.Session.Button.Dialog.Destructive">
-        <item name="android:background">@drawable/destructive_dialog_button_background</item>
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
-    <style name="Widget.Session.EditText.Compose" parent="@style/Signal.Text.Body">
-        <item name="android:padding">2dp</item>
-        <item name="android:background">@null</item>
-        <item name="android:maxLines">4</item>
-        <item name="android:maxLength">65536</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:capitalize">sentences</item>
-        <item name="android:autoText">true</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:imeOptions">flagNoEnterAction</item>
-        <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
-        <item name="android:contentDescription">@string/conversation_activity__compose_description</item>
-        <item name="android:textColorHint">?android:textColorHint</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
-        <item name="android:textAlignment">viewStart</item>
-    </style>
-
-    <style name="ThemeOverlay.Session.Settings" parent="PreferenceThemeOverlay.v14.Material" >
-        <item name="android:textColor">@color/text</item>
-        <item name="android:textColorSecondary">#99FFFFFF</item>
-        <item name="android:textSize">@dimen/medium_font_size</item>
-    </style>
-
-    <style name="SessionIDTextView">
-        <item name="android:background">@drawable/session_id_text_view_background</item>
-        <item name="android:padding">@dimen/medium_spacing</item>
-        <item name="android:textSize">@dimen/large_font_size</item>
-        <item name="android:textColor">@color/text</item>
-        <item name="android:fontFamily">@font/space_mono_regular</item>
-        <item name="android:textAlignment">viewStart</item>
-    </style>
-
-    <style name="SessionEditText">
-        <item name="android:background">@drawable/session_id_text_view_background</item>
-        <item name="android:paddingLeft">@dimen/medium_spacing</item>
-        <item name="android:paddingTop">30dp</item>
-        <item name="android:paddingRight">@dimen/medium_spacing</item>
-        <item name="android:paddingBottom">30dp</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:textColor">@color/text</item>
-        <item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:maxLines">1</item>
-    </style>
-
-    <style name="SmallSessionEditText">
-        <item name="android:background">@drawable/session_id_text_view_background</item>
-        <item name="android:paddingLeft">@dimen/medium_spacing</item>
-        <item name="android:paddingTop">@dimen/medium_spacing</item>
-        <item name="android:paddingRight">@dimen/medium_spacing</item>
-        <item name="android:paddingBottom">@dimen/medium_spacing</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:textColor">@color/text</item>
-        <item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:maxLines">1</item>
-    </style>
-
-    <style name="FakeChatViewMessageBubble">
-        <item name="android:paddingLeft">@dimen/medium_spacing</item>
-        <item name="android:paddingTop">12dp</item>
-        <item name="android:paddingRight">@dimen/medium_spacing</item>
-        <item name="android:paddingBottom">12dp</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:elevation">0dp</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-    </style>
-
-    <style name="FakeChatViewMessageBubble.Incoming">
-        <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
-        <item name="android:elevation">10dp</item>
-    </style>
-
-    <style name="FakeChatViewMessageBubble.Outgoing">
-        <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
-        <item name="android:elevation">10dp</item>
-    </style>
-    <!-- Session -->
-
-    <style name="NoAnimation.Theme.BlackScreen" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowBackground">@android:color/black</item>
-    </style>
-
-    <style name="NoAnimation.Theme.AppCompat.Light.DarkActionBar" parent="@style/Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:windowAnimationStyle">@null</item>
-    </style>
-
-    <style name="TextSecure.DialogActivity" parent="Theme.AppCompat.Light">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
-    <style name="AppCompatAlertDialogStyleLight" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/signal_primary_dark</item>
-    </style>
-
-    <style name="AppCompatAlertDialogStyleDark" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="colorAccent">@color/signal_primary</item>
-        <item name="android:textColor">@null</item>
-    </style>
-
-    <style name="AppCompatDialogStyleLight" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/signal_primary_dark</item>
-        <item name="android:windowBackground">@drawable/dialog_background</item>
-    </style>
-
-    <style name="AppCompatDialogStyleDark" parent="Theme.AppCompat.Dialog">
-        <item name="colorAccent">@color/signal_primary</item>
-        <item name="android:windowBackground">@drawable/dialog_background</item>
-        <item name="android:textColor">@null</item>
-    </style>
-
-    <!-- ActionBar styles -->
-    <style name="TextSecure.DarkActionBar"
-           parent="@style/Widget.AppCompat.ActionBar">
-        <item name="background">@color/core_grey_90</item>
-        <item name="android:popupTheme" tools:ignore="NewApi">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="elevation">1dp</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
-        <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
-        <item name="android:textColorSecondary">@color/white</item>
-    </style>
-
-    <style name="TextSecure.LightActionBar"
-           parent="@style/Widget.AppCompat.ActionBar">
-        <item name="background">@color/textsecure_primary</item>
-        <item name="elevation">1dp</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
-        <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-    </style>
-
-    <style name="TextSecure.LightActionBar.DarkText"
-           parent="TextSecure.LightActionBar">
-        <item name="android:textColorPrimary">@color/black</item>
-        <item name="android:textColorSecondary">@color/black</item>
-    </style>
-
-    <style name="TextSecure.FlatLightActionBar"
-           parent="@style/TextSecure.LightActionBar">
-        <item name="elevation">0dp</item>
-    </style>
-
-    <style name="TextSecure.DarkActionBar.TabBar"
-        parent="@style/Widget.AppCompat.ActionBar.TabBar">
-        <item name="background">@color/gray95</item>
-        <item name="android:background">@color/gray95</item>
-        <item name="elevation">4dp</item>
-    </style>
-
-    <style name="TextSecure.LightActionBar.TabBar"
-        parent="@style/Widget.AppCompat.ActionBar.TabBar">
-        <item name="android:background">@color/textsecure_primary</item>
-        <item name="background">@color/textsecure_primary</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">#BFffffff</item>
-        <item name="elevation">4dp</item>
-    </style>
-
-    <style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textColorHint">#BFffffff</item>
-    </style>
-
-    <style name="TextSecure.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
-        <item name="android:textColor">#BFffffff</item>
-    </style>
-
-    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="Registration.Description" parent="@android:style/TextAppearance">
-        <item name="android:textSize">16.0sp</item>
-        <item name="android:typeface">sans</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:gravity">left</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:shadowColor">#ffffff</item>
-        <item name="android:shadowDx">1.0</item>
-        <item name="android:shadowDy">1.0</item>
-        <item name="android:shadowRadius">0.0</item>
-        <item name="android:lineSpacingMultiplier">1.25</item>
-    </style>
-    
-    <style name="Registration.Label" parent="@android:style/TextAppearance">
-        <item name="android:textSize">12.0sp</item>
-        <item name="android:typeface">sans</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">#ff808080</item>
-        <item name="android:gravity">left</item>
-        <item name="android:layout_gravity">left</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:shadowColor">#ffffff</item>
-        <item name="android:shadowDx">1.0</item>
-        <item name="android:shadowDy">1.0</item>
-        <item name="android:shadowRadius">0.0</item>
-        <item name="android:lineSpacingMultiplier">1.25</item>
-    </style>
-    
-    <style name="Registration.BigLabel" parent="@style/Registration.Label">
-        <item name="android:textSize">20sp</item>
-    </style>
-    
-    <style name="Registration.Constant" parent="@android:style/TextAppearance">
-        <item name="android:typeface">sans</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">#ff808080</item>
-        <item name="android:shadowColor">#ffffff</item>
-        <item name="android:shadowDx">1.0</item>
-        <item name="android:shadowDy">1.0</item>
-        <item name="android:shadowRadius">0.0</item>
-        <item name="android:lineSpacingMultiplier">1.25</item>        
-    </style>
-
-    <!-- For Holo Light Dialog Activity Styling Emulation -->
-
-    <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
-    </style>
-
-    <style name="MaterialButton">
-        <item name="android:elevation" tools:ignore="NewApi">1dp</item>
-        <item name="android:translationZ" tools:ignore="NewApi">1dp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="InfoButton" parent="@style/MaterialButton">
-        <item name="android:background">@drawable/info_round</item>
-    </style>
-
-    <style name="ErrorButton" parent="@style/MaterialButton">
-        <item name="android:background">@drawable/error_round</item>
-    </style>
-
-    <style name="AttachmentTypeLabel">
-        <item name="android:textColor">?android:textColorTertiary</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-    </style>
-
-    <style name="Button.Primary" parent="Base.Widget.AppCompat.Button.Colored">
-        <item name="colorAccent">@color/signal_primary</item>
-        <item name="android:textColor">@color/white</item>
-    </style>
-
-    <style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
-        <item name="android:textColor">@color/signal_primary</item>
-    </style>
-
-    <style name="Button.Borderless.Registration" parent="Base.Widget.AppCompat.Button.Borderless">
-        <item name="android:textColor">@color/core_grey_60</item>
-    </style>
-
-    <!-- RedPhone -->
-
-    <!-- Buttons in the main "button row" of the in-call onscreen touch UI. -->
-
-    <!-- "Compound button" variation of InCallButton.
-           These buttons have the concept of two states: checked and unchecked.
-           (This style is just like "InCallButton" except that we also
-           clear out android:textOn and android:textOff, to avoid the default
-           text label behavior of the ToggleButton class.) -->
-
-    <style name="WebRtcCallCompoundButton">
-        <item name="android:layout_height">31dp</item>
-        <item name="android:layout_width">31dp</item>
-        <item name="android:textOn">@null</item>
-        <item name="android:textOff">@null</item>
-    </style>
-
-    <style name="IdentityKey">
-        <item name="android:fontFamily">monospace</item>
-        <item name="android:typeface">monospace</item>
-        <item name="android:textSize">17sp</item>
-        <item name="android:clickable">false</item>
-        <item name="android:focusable">false</item>
-    </style>
-
-    <style name="BackupPassphrase">
-        <item name="android:fontFamily">monospace</item>
-        <item name="android:typeface">monospace</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:clickable">false</item>
-        <item name="android:focusable">false</item>
-    </style>
-
-    <style name="PreferenceThemeOverlay.Fix" parent="PreferenceThemeOverlay.v14.Material">
-    </style>
-
-    <style name="Color1SwitchStyle">
-        <item name="colorControlActivated">@color/white</item>
-    </style>
-
-    <style name="BottomSheetActionItem">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/action_item_height</item>
-        <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:drawablePadding">@dimen/drawable_padding</item>
-        <item name="android:padding">@dimen/normal_padding</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:selectable">true</item>
-        <item name="android:foreground">?attr/selectableItemBackground</item>
-    </style>
-
-    <style name="StickerPopupAnimation" parent="@android:style/Animation">
-        <item name="android:windowEnterAnimation">@anim/fade_in</item>
-        <item name="android:windowExitAnimation">@anim/fade_out</item>
-    </style>
-
-</resources>
diff --git a/libsession/src/main/res/values/themes.xml b/libsession/src/main/res/values/themes.xml
deleted file mode 100644
index 4239aebee4..0000000000
--- a/libsession/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Session -->
-
-    <!-- Due to historical reasons the base theme is dark and the light one
-    is implemented using "notnight" type of resources. -->
-    <style name="Base.Theme.Session" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
-        <item name="colorPrimary">@color/action_bar_background</item>
-        <item name="colorPrimaryDark">@color/action_bar_background</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="colorControlNormal">?android:textColorPrimary</item>
-        <item name="colorControlActivated">?colorAccent</item>
-        <item name="colorControlHighlight">?colorAccent</item>
-        <item name="android:textColorPrimary">@color/text</item>
-        <item name="android:textColorSecondary">?android:textColorPrimary</item>
-        <item name="android:textColorTertiary">@color/unimportant</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:textColorHint">@color/gray27</item>
-        <item name="android:windowBackground">@drawable/default_session_background</item>
-        <item name="android:colorBackground">@color/default_background_start</item>
-        <item name="android:navigationBarColor">@color/compose_view_background</item>
-
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="actionBarWidgetTheme">@null</item>
-        <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
-        <item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
-
-        <item name="alertDialogTheme">@style/ThemeOverlay.Session.AlertDialog</item>
-        <item name="bottomSheetDialogTheme">@style/Theme.Session.BottomSheet</item>
-        <item name="preferenceTheme">@style/ThemeOverlay.Session.Settings</item>
-        <item name="appBarLayoutStyle">@style/Widget.Session.AppBarLayout</item>
-        <item name="actionBarTabBarStyle">@style/Widget.Session.TabBar</item>
-
-        <item name="statusBarBackground">@color/accent</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_baseline_clear_24</item>
-        <item name="actionModeBackground">@color/compose_view_background</item>
-
-        <item name="dividerVertical">@color/separator</item>
-        <item name="dividerHorizontal">?dividerVertical</item>
-
-        <item name="searchViewStyle">@style/Widget.Session.SearchView</item>
-
-        <!-- App specific attributes -->
-        <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_header_foreground">@color/text</item>
-        <item name="media_keyboard_button_color">@color/core_grey_25</item>\
-
-        <item name="attachment_type_selector_background">?android:windowBackground</item>
-        <item name="attachment_type_selector_hide_button_background">@color/gray50</item>
-        <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="attachment_document_extension_text_color">#222</item>
-
-        <item name="home_gradient_start">#00000000</item>
-        <item name="home_gradient_end">#FF000000</item>
-
-        <item name="message_received_background_color">#222325</item>
-        <item name="message_sent_background_color">#3F4146</item>
-
-        <item name="menu_accept_icon">@drawable/ic_baseline_done_24</item>
-        <item name="menu_trash_icon">@drawable/ic_baseline_delete_24</item>
-        <item name="menu_block_icon">@drawable/ic_baseline_block_24</item>
-        <item name="menu_forward_icon">@drawable/ic_baseline_forward_24</item>
-        <item name="menu_save_icon">@drawable/ic_baseline_save_24</item>
-        <item name="menu_photo_library_icon">@drawable/ic_baseline_photo_library_24</item>
-        <item name="menu_delete_icon">@drawable/ic_baseline_delete_24</item>
-        <item name="menu_copy_icon">@drawable/ic_baseline_file_copy_24</item>
-        <item name="menu_reply_icon">@drawable/ic_baseline_reply_24</item>
-        <item name="menu_selectall_icon">@drawable/ic_baseline_select_all_24</item>
-        <item name="menu_split_icon">@drawable/ic_baseline_call_split_24</item>
-        <item name="menu_popup_expand">@drawable/ic_baseline_launch_24</item>
-        <item name="menu_info_icon">@drawable/ic_baseline_info_24</item>
-
-        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_24</item>
-        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_24</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_baseline_keyboard_24</item>
-        <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>
-
-        <item name="conversation_item_audio_seek_bar_color_incoming">@color/accent</item>
-        <item name="conversation_item_audio_seek_bar_color_outgoing">@color/accent</item>
-        <item name="conversation_item_audio_seek_bar_background_color">@color/text</item>
-    </style>
-
-    <!-- This should be the default theme for the application. -->
-    <style name="Theme.Session.DayNight" parent="Base.Theme.Session">
-        <!-- leave empty to allow overriding -->
-    </style>
-
-    <style name="Theme.Session.DayNight.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-    </style>
-
-    <style name="Theme.Session.DayNight.FlatActionBar">
-        <item name="actionBarStyle">@style/Widget.Session.ActionBar.Flat</item>
-    </style>
-
-    <!--
-    This is a temporary theme that is used by any activity
-    which doesn't have support for light theme
-    (like some old Signal screens or third-party libs with white only icons)
-    -->
-    <!-- TODO Refactor this to use color resources -->
-    <style name="Base.Theme.Session.ForceDark" parent="Theme.Session.DayNight">
-        <item name="colorPrimary">#171717</item>
-        <item name="android:textColorPrimary">#FFFFFF</item>
-        <item name="android:textColorSecondary">#DFFFFFFF</item>
-        <item name="android:textColorTertiary">#90FFFFFF</item>
-        <item name="colorControlNormal">?android:textColorPrimary</item>
-        <item name="android:colorBackground">#121212</item>
-        <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
-        <item name="android:statusBarColor">@color/transparent</item>
-
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="actionBarWidgetTheme">@null</item>
-        <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
-        <item name="actionBarStyle">@style/Widget.AppCompat.ActionBar</item>
-
-        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_24</item>
-        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_24</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_baseline_keyboard_24</item>
-        <item name="conversation_input_background">@drawable/compose_background_dark</item>
-    </style>
-    <style name="Theme.Session.ForceDark" parent="Base.Theme.Session.ForceDark">
-        <!-- leave empty to allow overriding -->
-    </style>
-    <style name="Theme.Session.ForceDark.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-    </style>
-
-    <style name="Theme.Session.BottomSheet" parent="@style/Theme.AppCompat.DayNight.Dialog">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowAnimationStyle">@style/Animation.MaterialComponents.BottomSheetDialog</item>
-        <item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item>
-    </style>
-
-    <!-- Session -->
-
-
-
-    <!--  Original Signal dark theme  -->
-    <style name="Base.Theme.TextSecure" parent="@style/Theme.Session.DayNight">
-
-        <item name="windowActionModeOverlay">true</item>
-
-        <item name="colorPrimary">@color/action_bar_background</item>
-        <item name="colorPrimaryDark">@color/action_bar_background</item>
-
-        <item name="media_overview_toolbar_background">@color/transparent</item>
-        <item name="media_overview_header_foreground">@color/text</item>
-
-        <item name="theme_type">dark</item>
-        <item name="android:navigationBarColor">@color/compose_view_background</item>
-
-        <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="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>
-        <item name="conversation_list_item_delivery_icon_color">@color/core_grey_25</item>
-        <item name="conversation_list_item_date_color">#ffdddddd</item>
-        <item name="conversation_list_item_unread_color">@color/core_white</item>
-        <item name="conversation_list_item_unread_background">@drawable/unread_count_background_dark</item>
-        <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
-        <item name="conversation_list_toolbar_background">@color/action_bar_background</item>
-        <item name="conversation_list_typing_tint">@color/core_white</item>
-
-        <item name="conversation_group_member_name">#99ffffff</item>
-
-        <item name="conversation_item_bubble_background">?message_sent_background_color</item>
-        <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_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_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="verification_background">@color/core_grey_95</item>
-
-        <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
-        <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
-
-        <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
-
-        <item name="fab_color">@color/textsecure_primary_dark</item>
-        <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
-
-        <item name="conversation_background">@color/loki_darkest_gray</item>
-        <item name="conversation_editor_background">#22ffffff</item>
-        <item name="conversation_editor_text_color">#ffeeeeee</item>
-        <item name="conversation_input_inline_attach_icon_tint">@color/core_grey_05</item>
-        <item name="conversation_transport_sms_indicator">@drawable/ic_arrow_up_circle_24</item>
-        <item name="conversation_transport_push_indicator">@drawable/ic_arrow_up_circle_24</item>
-        <item name="conversation_transport_popup_background">@color/black</item>
-        <item name="conversation_attach_camera">@drawable/ic_photo_camera_dark</item>
-        <item name="conversation_attach_image">@drawable/ic_image_dark</item>
-        <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
-        <item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
-        <item name="conversation_attach_contact_info">@drawable/ic_account_box_dark</item>
-        <item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
-        <item name="conversation_number_picker_text_color_normal">@color/gray13</item>
-        <item name="conversation_number_picker_text_color_selected">@color/white</item>
-        <item name="conversation_sticker_footer_text_color">@color/core_grey_25</item>
-        <item name="conversation_sticker_footer_icon_color">@color/core_grey_25</item>
-        <item name="conversation_sticker_author_color">@color/core_grey_05</item>
-
-        <item name="emoji_tab_strip_background">@color/compose_view_background</item>
-        <item name="emoji_tab_indicator">@color/accent</item>
-        <item name="emoji_tab_underline">@color/gray78</item>
-        <item name="emoji_tab_seperator">@color/gray70</item>
-        <item name="emoji_drawer_background">@color/compose_text_view_background</item>
-        <item name="emoji_text_color">@color/white</item>
-
-        <item name="emoji_category_recent">@drawable/ic_recent_dark_20</item>
-        <item name="emoji_category_people">@drawable/ic_emoji_people_dark_20</item>
-        <item name="emoji_category_nature">@drawable/ic_emoji_animal_dark_20</item>
-        <item name="emoji_category_foods">@drawable/ic_emoji_food_dark_20</item>
-        <item name="emoji_category_activity">@drawable/ic_emoji_activity_dark_20</item>
-        <item name="emoji_category_places">@drawable/ic_emoji_travel_dark_20</item>
-        <item name="emoji_category_objects">@drawable/ic_emoji_object_dark_20</item>
-        <item name="emoji_category_symbol">@drawable/ic_emoji_symbol_dark_20</item>
-        <item name="emoji_category_flags">@drawable/ic_emoji_flag_dark_20</item>
-        <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_dark_20</item>
-        <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_dark</item>
-
-        <item name="linkpreview_background_color">@color/black</item>
-        <item name="linkpreview_primary_text_color">@color/text</item>
-        <item name="linkpreview_secondary_text_color">@color/text</item>
-        <item name="linkpreview_divider_color">@color/transparent</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="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>
-        <item name="sticker_management_action_button_color">@color/core_grey_25</item>
-        <item name="sticker_popup_background">@color/transparent_black_90</item>
-        <item name="sticker_preview_toolbar_background">@color/core_grey_95</item>
-        <item name="sticker_preview_status_bar_color">@color/core_grey_85</item>
-        <item name="sticker_view_missing_background">@drawable/sticker_missing_background_dark</item>
-
-        <item name="tooltip_default_color">@color/core_grey_75</item>
-
-        <item name="pref_icon_tint">#FFFFFF</item>
-
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
-
-        <item name="shared_contact_details_header_background">@color/grey_800</item>
-        <item name="shared_contact_details_titlebar">@color/grey_900</item>
-        <item name="shared_contact_item_button_color">@color/core_grey_85</item>
-    </style>
-
-    <style name="Theme.TextSecure.DayNight" parent="Base.Theme.TextSecure">
-        <!-- leave empty to allow overriding -->
-    </style>
-
-    <style name="Theme.TextSecure.DayNight.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-    </style>
-    
-    <style name="Theme.TextSecure.Dialog.Rationale" parent="Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="android:windowBackground">@drawable/default_dialog_background</item>
-    </style>
-
-    <style name="Theme.TextSecure.Dialog.MediaSendProgress" parent="@android:style/Theme.Dialog">
-        <item name="android:background">@drawable/default_dialog_background</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-</resources>