Adjusts background colours and button colours on the dark theme. Also, adds a background to the main status in a thread.

7 years ago · 681e68b487
parent 3981116a1a
commit 681e68b487
3 changed files with 21 additions and 32 deletions
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@ -8,14 +8,16 @@
                android:paddingRight="16dp"
                android:id="@+id/status_container">

-    <RelativeLayout
+    <LinearLayout
+        android:id="@+id/status_reblogged_bar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:id="@+id/status_reblogged_bar"
        android:layout_alignParentTop="true"
        android:layout_alignParentStart="true"
        android:layout_alignParentLeft="true"
-        android:layout_marginTop="@dimen/status_reblogged_bar_top_padding">
+        android:layout_marginTop="@dimen/status_reblogged_bar_top_padding"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">

        <ImageView
            android:layout_width="wrap_content"
@ -26,8 +28,6 @@
            android:paddingLeft="24dp"
            android:paddingEnd="10dp"
            android:paddingRight="10dp"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
            android:tint="?android:textColorTertiary"
            android:contentDescription="@null" />

@ -35,12 +35,9 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/status_reblogged"
-            android:textColor="?android:textColorTertiary"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/status_reblogged_icon"
-            android:layout_toRightOf="@id/status_reblogged_icon" />
+            android:textColor="?android:textColorTertiary" />

-    </RelativeLayout>
+    </LinearLayout>

    <ImageView
        android:layout_width="48dp"
@ -84,7 +81,6 @@
            android:layout_alignParentRight="true"
            android:layout_marginStart="4dp"
            android:layout_marginLeft="4dp"
-            android:text="20m"
            android:textColor="?android:textColorSecondary" />

        <LinearLayout
@ -105,7 +101,6 @@
                android:textStyle="normal|bold"
                android:ellipsize="end"
                android:maxLines="1"
-                android:text="Name"
                android:paddingStart="0dp"
                android:paddingLeft="0dp"
                android:paddingEnd="@dimen/status_display_name_right_padding"
@ -117,8 +112,7 @@
                android:layout_height="wrap_content"
                android:textColor="?android:textColorSecondary"
                android:maxLines="1"
-                android:ellipsize="end"
-                android:text="Username is the slongest thing ever i am totally going" />
+                android:ellipsize="end" />

        </LinearLayout>

@ -140,7 +134,6 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/status_content_warning_description"
-            android:text="Hello world"
            android:textColor="?android:textColorPrimary" />

        <ToggleButton
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@ -6,7 +6,8 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/status_container"
    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
+    android:paddingRight="16dp"
+    android:background="?attr/colorPrimaryDark">

    <ImageView
        android:layout_width="48dp"
@ -37,8 +38,7 @@
            android:textColor="?android:textColorPrimary"
            android:textStyle="normal|bold"
            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="Name" />
+            android:maxLines="1" />

        <Space
            android:layout_width="match_parent"
@ -51,8 +51,7 @@
            android:layout_height="wrap_content"
            android:textColor="?android:textColorSecondary"
            android:maxLines="1"
-            android:ellipsize="end"
-            android:text="Username is the slongest thing ever i am totally going" />
+            android:ellipsize="end" />

    </LinearLayout>

@ -72,7 +71,6 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/status_content_warning_description"
-            android:text="Hello world"
            android:textColor="?android:textColorPrimary"
            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />

@ -94,7 +92,6 @@
        android:id="@+id/status_content"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:text="Streaming from the shop, while I work on upcoming videos about electronics and reverse engineering."
        android:textColor="?android:textColorPrimary"
        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
        android:layout_marginBottom="4dp"
@ -253,6 +250,7 @@
            android:id="@+id/status_application"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
            android:layout_marginLeft="16dp" />

    </LinearLayout>
@ -299,8 +297,7 @@
        <TextView
            android:id="@+id/status_reblogs"
            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="19" />
+            android:layout_height="wrap_content" />

        <Space
            android:layout_width="0dp"
@ -323,8 +320,7 @@
        <TextView
            android:id="@+id/status_favourites"
            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="20" />
+            android:layout_height="wrap_content" />

        <Space
            android:layout_width="0dp"
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -6,7 +6,7 @@
    <color name="semi_transparent">#33000000</color>
    <!--Dark Theme Colors-->
    <color name="color_primary_dark">#4c5368</color>
-    <color name="color_primary_dark_dark">#363c4b</color> <!--Dark Dark-->
+    <color name="color_primary_dark_dark">#313543</color> <!--Dark Dark-->
    <color name="color_accent_dark">#2b90d9</color>
    <color name="button_dark">#2b90d9</color>
    <color name="color_background_dark">#1a1c23</color>
@ -20,11 +20,11 @@
    <color name="text_color_tertiary_inverse_dark">#000000</color>
    <color name="toolbar_background_dark">#4c5368</color>
    <color name="toolbar_icon_dark">#d9e1e8</color>
-    <color name="image_button_dark">#68738f</color>
-    <color name="status_reblog_button_dark">#68738f</color>
+    <color name="image_button_dark">#606984</color>
+    <color name="status_reblog_button_dark">#606984</color>
    <color name="status_reblog_button_marked_dark">#2b90d9</color>
-    <color name="status_reblog_button_disabled_dark">#363c4b</color>
-    <color name="status_favourite_button_dark">#68738f</color>
+    <color name="status_reblog_button_disabled_dark">#444b5d</color>
+    <color name="status_favourite_button_dark">#606984</color>
    <color name="status_favourite_button_marked_dark">#ca8f04</color>
    <color name="sensitive_media_warning_background_dark">#303030</color>
    <color name="media_preview_unloaded_background_dark">#2F2F2F</color>
@ -37,7 +37,7 @@
    <color name="compose_mention_dark">#AFBFCF</color>
    <color name="report_status_background_dark">#000000</color>
    <color name="report_status_divider_dark">#2F2F2F</color>
-    <color name="custom_tab_toolbar_dark">#363c4b</color>
+    <color name="custom_tab_toolbar_dark">#313543</color>
    <!--Light Theme Colors-->
    <color name="color_primary_light">#dfdfdf</color>
    <color name="color_primary_dark_light">#8f8f8f</color>