forked from upstream-mirrors/quik
White background, update style for Compose bar
This commit is contained in:
@@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:shape="rectangle">
|
|
||||||
|
|
||||||
<corners android:radius="24dp" />
|
|
||||||
<solid android:color="@android:color/white" />
|
|
||||||
|
|
||||||
</shape>
|
|
||||||
@@ -3,7 +3,6 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/backgroundLight"
|
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<android.support.v7.widget.RecyclerView
|
<android.support.v7.widget.RecyclerView
|
||||||
@@ -17,21 +16,21 @@
|
|||||||
android:paddingTop="8dp"
|
android:paddingTop="8dp"
|
||||||
tools:listitem="@layout/message_list_item_out" />
|
tools:listitem="@layout/message_list_item_out" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:background="@color/list_separator" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_marginBottom="8dp"
|
|
||||||
android:layout_marginLeft="8dp"
|
|
||||||
android:layout_marginRight="8dp"
|
|
||||||
android:background="@drawable/bubble"
|
|
||||||
android:elevation="2dp">
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/attach"
|
android:id="@+id/attach"
|
||||||
android:layout_width="48dp"
|
android:layout_width="56dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="56dp"
|
||||||
android:background="?selectableItemBackgroundBorderless"
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
android:padding="12dp"
|
android:padding="16dp"
|
||||||
android:src="@drawable/ic_add_black_24dp"
|
android:src="@drawable/ic_add_black_24dp"
|
||||||
android:tint="@color/colorPrimary" />
|
android:tint="@color/colorPrimary" />
|
||||||
|
|
||||||
@@ -39,7 +38,7 @@
|
|||||||
android:id="@+id/message"
|
android:id="@+id/message"
|
||||||
style="@style/TextPrimary"
|
style="@style/TextPrimary"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="56dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@null"
|
android:background="@null"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
@@ -48,10 +47,10 @@
|
|||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/send"
|
android:id="@+id/send"
|
||||||
android:layout_width="48dp"
|
android:layout_width="56dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="56dp"
|
||||||
android:background="?selectableItemBackgroundBorderless"
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
android:padding="12dp"
|
android:padding="16dp"
|
||||||
android:src="@drawable/ic_send_black_24dp"
|
android:src="@drawable/ic_send_black_24dp"
|
||||||
android:tint="@color/textTertiary" />
|
android:tint="@color/textTertiary" />
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="start"
|
android:layout_gravity="start"
|
||||||
android:background="@drawable/message_only"
|
android:background="@drawable/message_only"
|
||||||
android:backgroundTint="@android:color/white"
|
android:backgroundTint="@color/bubbleLight"
|
||||||
android:gravity="start|center_vertical"
|
android:gravity="start|center_vertical"
|
||||||
android:minHeight="36dp"
|
android:minHeight="36dp"
|
||||||
android:paddingBottom="8dp"
|
android:paddingBottom="8dp"
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
<color name="colorPrimaryDark">#0AA596</color>
|
<color name="colorPrimaryDark">#0AA596</color>
|
||||||
<color name="colorAccent">#FF4081</color>
|
<color name="colorAccent">#FF4081</color>
|
||||||
|
|
||||||
|
<color name="white">#FFFFFF</color>
|
||||||
|
|
||||||
<color name="textPrimary">#49555F</color>
|
<color name="textPrimary">#49555F</color>
|
||||||
<color name="textSecondary">#70808D</color>
|
<color name="textSecondary">#70808D</color>
|
||||||
<color name="textTertiary">#B7B9C0</color>
|
<color name="textTertiary">#B7B9C0</color>
|
||||||
@@ -12,6 +14,8 @@
|
|||||||
<color name="textSecondaryLight">#ccffffff</color>
|
<color name="textSecondaryLight">#ccffffff</color>
|
||||||
<color name="textTertiaryLight">#80ffffff</color>
|
<color name="textTertiaryLight">#80ffffff</color>
|
||||||
|
|
||||||
|
<color name="bubbleLight">#F4F4F4</color>
|
||||||
|
|
||||||
<color name="backgroundLight">#f8f8f8</color>
|
<color name="backgroundLight">#f8f8f8</color>
|
||||||
|
|
||||||
<color name="list_separator">#F2F2F2</color>
|
<color name="list_separator">#F2F2F2</color>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
<item name="android:windowBackground">@color/white</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextPrimary">
|
<style name="TextPrimary">
|
||||||
|
|||||||
Reference in New Issue
Block a user