Pārlūkot izejas kodu

More fixes to the dark theme

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 5 gadi atpakaļ
vecāks
revīzija
7485766812

+ 1 - 3
app/src/main/res/layout/controller_conversation_info.xml

@@ -23,7 +23,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_controller_conv_info"
     android:orientation="vertical">
 
     <ProgressBar
@@ -64,8 +63,7 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/avatar_image"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/margin_between_elements"
-                        android:textColor="@color/fg_default" />
+                        android:layout_marginTop="@dimen/margin_between_elements" />
 
                     <com.facebook.drawee.view.SimpleDraweeView
                         android:id="@+id/avatar_image"

+ 2 - 2
app/src/main/res/layout/controller_settings.xml

@@ -53,7 +53,7 @@
                 android:layout_below="@id/avatar_image"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="@dimen/margin_between_elements"
-                android:textColor="@color/fg_default" />
+                android:textColor="@color/nc_incoming_text_default" />
 
             <TextView
                 android:id="@+id/base_url_text"
@@ -62,7 +62,7 @@
                 android:layout_below="@id/display_name_text"
                 android:layout_centerHorizontal="true"
                 android:layout_margin="4dp"
-                android:textColor="@color/fg_default" />
+                android:textColor="@color/nc_incoming_text_default" />
 
             <com.facebook.drawee.view.SimpleDraweeView
                 android:id="@+id/avatar_image"

+ 1 - 1
app/src/main/res/layout/rv_item_contact.xml

@@ -46,7 +46,7 @@
         android:layout_toStartOf="@id/checkedImageView"
         android:layout_toEndOf="@id/simple_drawee_view"
         android:ellipsize="end"
-        android:textAppearance="?android:attr/textAppearanceListItem"
+        android:textAppearance="@style/ListItem"
         tools:text="Contact item text" />
 
     <com.facebook.drawee.view.SimpleDraweeView

+ 0 - 3
app/src/main/res/values/colors.xml

@@ -73,7 +73,4 @@
 
     <color name="nc_author_text">@color/colorPrimary</color>
     <color name="bg_bottom_sheet">#46ffffff</color>
-
-    <!-- "Conversation Info" window -->
-    <color name="bg_controller_conv_info">@color/bg_default</color>
 </resources>

+ 5 - 1
app/src/main/res/values/styles.xml

@@ -28,7 +28,7 @@
         <item name="colorAccent">@color/colorPrimary</item>
         <item name="android:panelFullBackground">@color/colorPrimary</item>
         <item name="android:itemBackground">@color/nc_outcoming_text_default</item>
-        <item name="android:textColor">@color/fg_default</item>
+        <item name="android:textColor">@color/nc_incoming_text_default</item>
         <item name="android:popupMenuStyle">@style/appActionBarPopupMenu</item>
         <item name="actionOverflowMenuStyle">@style/appActionBarPopupMenu</item>
         <item name="actionBarStyle">@style/appActionBarStyle</item>
@@ -39,6 +39,10 @@
         <item name="android:textSize">12sp</item>
     </style>
 
+    <style name="ListItem" parent="BottomSheet.ListItem.TextAppearance">
+        <item name="android:textColor">@color/nc_incoming_text_default</item>
+    </style>
+
     <style name="ChipIncomingTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
         <item name="android:textColor">@color/nc_incoming_text_default</item>
     </style>