chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

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

Browse source
This commit is contained in:
Vavassor 2017-08-03 19:13:26 -04:00
parent cb1e8eaea7
commit df07ab2600
3 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/res/layout/item_status.xml
View file

@ -8,14 +8,16 @@
android:paddingRight="16dp" android:paddingRight="16dp"
android:id="@+id/status_container"> android:id="@+id/status_container">
<RelativeLayout <LinearLayout
android:id="@+id/status_reblogged_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/status_reblogged_bar"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="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 <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -26,8 +28,6 @@
android:paddingLeft="24dp" android:paddingLeft="24dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:tint="?android:textColorTertiary" android:tint="?android:textColorTertiary"
android:contentDescription="@null" /> android:contentDescription="@null" />
@ -35,12 +35,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/status_reblogged" android:id="@+id/status_reblogged"
android:textColor="?android:textColorTertiary" android:textColor="?android:textColorTertiary" />
android:layout_centerVertical="true"
android:layout_toEndOf="@id/status_reblogged_icon"
android:layout_toRightOf="@id/status_reblogged_icon" />
</RelativeLayout> </LinearLayout>
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@ -84,7 +81,6 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:text="20m"
android:textColor="?android:textColorSecondary" /> android:textColor="?android:textColorSecondary" />
<LinearLayout <LinearLayout
@ -105,7 +101,6 @@
android:textStyle="normal|bold" android:textStyle="normal|bold"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="Name"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingEnd="@dimen/status_display_name_right_padding" android:paddingEnd="@dimen/status_display_name_right_padding"
@ -117,8 +112,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end" />
android:text="Username is the slongest thing ever i am totally going" />
</LinearLayout> </LinearLayout>
@ -140,7 +134,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/status_content_warning_description" android:id="@+id/status_content_warning_description"
android:text="Hello world"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary" />
<ToggleButton <ToggleButton

18
app/src/main/res/layout/item_status_detailed.xml
View file

@ -6,7 +6,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/status_container" android:id="@+id/status_container"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp"> android:paddingRight="16dp"
android:background="?attr/colorPrimaryDark">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@ -37,8 +38,7 @@
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textStyle="normal|bold" android:textStyle="normal|bold"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1" />
android:text="Name" />
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
@ -51,8 +51,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end" />
android:text="Username is the slongest thing ever i am totally going" />
</LinearLayout> </LinearLayout>
@ -72,7 +71,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/status_content_warning_description" android:id="@+id/status_content_warning_description"
android:text="Hello world"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" /> android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
@ -94,7 +92,6 @@
android:id="@+id/status_content" android:id="@+id/status_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:textColor="?android:textColorPrimary"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
@ -253,6 +250,7 @@
android:id="@+id/status_application" android:id="@+id/status_application"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp" /> android:layout_marginLeft="16dp" />
</LinearLayout> </LinearLayout>
@ -299,8 +297,7 @@
<TextView <TextView
android:id="@+id/status_reblogs" android:id="@+id/status_reblogs"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:text="19" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@ -323,8 +320,7 @@
<TextView <TextView
android:id="@+id/status_favourites" android:id="@+id/status_favourites"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:text="20" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"

12
app/src/main/res/values/colors.xml
View file

@ -6,7 +6,7 @@
<color name="semi_transparent">#33000000</color> <color name="semi_transparent">#33000000</color>
<!--Dark Theme Colors--> <!--Dark Theme Colors-->
<color name="color_primary_dark">#4c5368</color> <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="color_accent_dark">#2b90d9</color>
<color name="button_dark">#2b90d9</color> <color name="button_dark">#2b90d9</color>
<color name="color_background_dark">#1a1c23</color> <color name="color_background_dark">#1a1c23</color>
@ -20,11 +20,11 @@
<color name="text_color_tertiary_inverse_dark">#000000</color> <color name="text_color_tertiary_inverse_dark">#000000</color>
<color name="toolbar_background_dark">#4c5368</color> <color name="toolbar_background_dark">#4c5368</color>
<color name="toolbar_icon_dark">#d9e1e8</color> <color name="toolbar_icon_dark">#d9e1e8</color>
<color name="image_button_dark">#68738f</color> <color name="image_button_dark">#606984</color>
<color name="status_reblog_button_dark">#68738f</color> <color name="status_reblog_button_dark">#606984</color>
<color name="status_reblog_button_marked_dark">#2b90d9</color> <color name="status_reblog_button_marked_dark">#2b90d9</color>
<color name="status_reblog_button_disabled_dark">#363c4b</color> <color name="status_reblog_button_disabled_dark">#444b5d</color>
<color name="status_favourite_button_dark">#68738f</color> <color name="status_favourite_button_dark">#606984</color>
<color name="status_favourite_button_marked_dark">#ca8f04</color> <color name="status_favourite_button_marked_dark">#ca8f04</color>
<color name="sensitive_media_warning_background_dark">#303030</color> <color name="sensitive_media_warning_background_dark">#303030</color>
<color name="media_preview_unloaded_background_dark">#2F2F2F</color> <color name="media_preview_unloaded_background_dark">#2F2F2F</color>
@ -37,7 +37,7 @@
<color name="compose_mention_dark">#AFBFCF</color> <color name="compose_mention_dark">#AFBFCF</color>
<color name="report_status_background_dark">#000000</color> <color name="report_status_background_dark">#000000</color>
<color name="report_status_divider_dark">#2F2F2F</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--> <!--Light Theme Colors-->
<color name="color_primary_light">#dfdfdf</color> <color name="color_primary_light">#dfdfdf</color>
<color name="color_primary_dark_light">#8f8f8f</color> <color name="color_primary_dark_light">#8f8f8f</color>