diff options
author | Christian Schneppe <kriztan@users.noreply.github.com> | 2018-11-08 19:20:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-08 19:20:14 +0100 |
commit | dccfc8c5cb926f4f5564a3239accdd7900df4f26 (patch) | |
tree | b55ff8a44ac8e31e997bd2ee1e7896c99ba95a9f /src/main/res/drawable | |
parent | dbec38d3b2aece30f29bdb7e6526ca6bc288777e (diff) | |
parent | 2919429c99ca0795988bec9c66a81f246192b17a (diff) |
Merge pull request #262 from genofire/mini-redesign
design message border
Diffstat (limited to 'src/main/res/drawable')
-rw-r--r-- | src/main/res/drawable/date_bubble.xml | 11 | ||||
-rw-r--r-- | src/main/res/drawable/date_bubble_dark.xml | 11 | ||||
-rw-r--r-- | src/main/res/drawable/infocard_border.xml | 4 | ||||
-rw-r--r-- | src/main/res/drawable/message_bubble_received_light.xml | 11 | ||||
-rw-r--r-- | src/main/res/drawable/message_bubble_received_light_dark.xml | 11 | ||||
-rw-r--r-- | src/main/res/drawable/message_bubble_received_warning.xml | 11 | ||||
-rw-r--r-- | src/main/res/drawable/message_bubble_received_warning_dark.xml | 11 | ||||
-rw-r--r-- | src/main/res/drawable/message_bubble_sent.xml (renamed from src/main/res/drawable/message_bubble_sent_blue_dark.xml) | 11 | ||||
-rw-r--r-- | src/main/res/drawable/message_bubble_sent_dark.xml (renamed from src/main/res/drawable/message_bubble_sent_blue.xml) | 11 |
9 files changed, 16 insertions, 76 deletions
diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml index 3edf349e9..6d9e2462e 100644 --- a/src/main/res/drawable/date_bubble.xml +++ b/src/main/res/drawable/date_bubble.xml @@ -4,18 +4,11 @@ android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp"> - </corners> + android:bottomLeftRadius="5dp" /> <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" /> - <stroke - android:width="1dp" - android:color="@color/grey500"> - </stroke> - <solid - android:color="@color/lightgreen"> - </solid> + <solid android:color="@color/lightgreen" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/date_bubble_dark.xml b/src/main/res/drawable/date_bubble_dark.xml index 345c315c1..3859b4d83 100644 --- a/src/main/res/drawable/date_bubble_dark.xml +++ b/src/main/res/drawable/date_bubble_dark.xml @@ -4,18 +4,11 @@ android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp"> - </corners> + android:bottomLeftRadius="5dp" /> <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" /> - <stroke - android:width="1dp" - android:color="@color/grey800"> - </stroke> - <solid - android:color="@color/darkgreen"> - </solid> + <solid android:color="@color/darkgreen" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml index ff3ec366a..61ddb5fc1 100644 --- a/src/main/res/drawable/infocard_border.xml +++ b/src/main/res/drawable/infocard_border.xml @@ -5,10 +5,6 @@ <corners android:radius="5dp" /> - <stroke - android:width="0.5dp" - android:color="@color/black12"></stroke> - <padding android:bottom="0dp" android:left="0dp" diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml index 32e146460..c1a8b456b 100644 --- a/src/main/res/drawable/message_bubble_received_light.xml +++ b/src/main/res/drawable/message_bubble_received_light.xml @@ -4,18 +4,11 @@ android:topLeftRadius="0dp" android:topRightRadius="5dp" android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp"> - </corners> + android:bottomLeftRadius="5dp" /> <padding android:bottom="2dp" android:left="6dp" android:right="6dp" android:top="2dp" /> - <stroke - android:width="1dp" - android:color="@color/grey500"> - </stroke> - <solid - android:color="@color/lightwhite"> - </solid> + <solid android:color="@color/lightwhite" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light_dark.xml b/src/main/res/drawable/message_bubble_received_light_dark.xml index 8f9132566..301f634bc 100644 --- a/src/main/res/drawable/message_bubble_received_light_dark.xml +++ b/src/main/res/drawable/message_bubble_received_light_dark.xml @@ -4,18 +4,11 @@ android:topLeftRadius="0dp" android:topRightRadius="5dp" android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp"> - </corners> + android:bottomLeftRadius="5dp" /> <padding android:bottom="2dp" android:left="6dp" android:right="6dp" android:top="2dp" /> - <stroke - android:width="1dp" - android:color="@color/grey700"> - </stroke> - <solid - android:color="@color/darkwhite"> - </solid> + <solid android:color="@color/darkwhite" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml index b3bf6d451..cd47cf948 100644 --- a/src/main/res/drawable/message_bubble_received_warning.xml +++ b/src/main/res/drawable/message_bubble_received_warning.xml @@ -4,18 +4,11 @@ android:topLeftRadius="0dp" android:topRightRadius="5dp" android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp"> - </corners> + android:bottomLeftRadius="5dp" /> <padding android:bottom="4dp" android:left="6dp" android:right="6dp" android:top="4dp" /> - <stroke - android:width="1dp" - android:color="@color/grey500"> - </stroke> - <solid - android:color="@color/lightred"> - </solid> + <solid android:color="@color/lightred" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning_dark.xml b/src/main/res/drawable/message_bubble_received_warning_dark.xml index 5867f67ce..e25ef23a2 100644 --- a/src/main/res/drawable/message_bubble_received_warning_dark.xml +++ b/src/main/res/drawable/message_bubble_received_warning_dark.xml @@ -4,18 +4,11 @@ android:topLeftRadius="0dp" android:topRightRadius="5dp" android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp"> - </corners> + android:bottomLeftRadius="5dp" /> <padding android:bottom="4dp" android:left="6dp" android:right="6dp" android:top="4dp" /> - <stroke - android:width="1dp" - android:color="@color/grey700"> - </stroke> - <solid - android:color="@color/darkred"> - </solid> + <solid android:color="@color/darkred" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_blue_dark.xml b/src/main/res/drawable/message_bubble_sent.xml index d9853bf74..677c1fe43 100644 --- a/src/main/res/drawable/message_bubble_sent_blue_dark.xml +++ b/src/main/res/drawable/message_bubble_sent.xml @@ -4,18 +4,11 @@ android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp"> - </corners> + android:bottomLeftRadius="5dp" /> <padding android:bottom="4dp" android:left="6dp" android:right="6dp" android:top="4dp" /> - <stroke - android:width="1dp" - android:color="@color/grey700"> - </stroke> - <solid - android:color="@color/darkblue"> - </solid> + <solid android:color="@color/lightblue" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_blue.xml b/src/main/res/drawable/message_bubble_sent_dark.xml index 1ee3ad0c8..3cbe163ec 100644 --- a/src/main/res/drawable/message_bubble_sent_blue.xml +++ b/src/main/res/drawable/message_bubble_sent_dark.xml @@ -4,18 +4,11 @@ android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp"> - </corners> + android:bottomLeftRadius="5dp" /> <padding android:bottom="4dp" android:left="6dp" android:right="6dp" android:top="4dp" /> - <stroke - android:width="1dp" - android:color="@color/grey500"> - </stroke> - <solid - android:color="@color/lightblue"> - </solid> + <solid android:color="@color/darkblue" /> </shape>
\ No newline at end of file |