From 6fb4eb97510b6e980c95daa35664c46c45f5234d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 9 Mar 2018 20:27:18 +0100
Subject: started work on migrating to appcompat

---
 src/main/res/values-v21/themes.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/main/res/values-v21')

diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 0c0b3cefb..8d0de873f 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorPrimaryDark">@color/primary_dark</item>
-        <item name="android:colorAccent">@color/accent</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
+    <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
 
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/accent</item>
@@ -16,9 +16,18 @@
         <item name="TextSizeHeadline">18sp</item>
         <item name="TextSeparation">5sp</item>
 
+        <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
+        <item name="divider">@color/black12</item>
+
         <item name="color_text_primary">@color/black87</item>
         <item name="color_text_secondary">@color/black54</item>
 
+        <!--<item name="color_background_primary">@color/grey50</item>-->
+        <!--<item name="color_background_secondary">@color/grey200</item>-->
+
+        <!--<item name="unread_count">@color/unreadcountlight</item>-->
+        <!--<item name="conversations_overview_background">@color/primary700</item>-->
+
         <item name="dialog_horizontal_padding">24dp</item>
         <item name="dialog_vertical_padding">16dp</item>
 
@@ -53,5 +62,4 @@
         <item name="ic_attach_record">@drawable/ic_attach_record</item>
 
     </style>
-
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 43fbf3c5b517c749c821a8a1e501a55d40519984 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 9 Mar 2018 21:55:37 +0100
Subject: remove pre api 21 theme

---
 src/main/res/values-v21/themes.xml | 65 --------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 src/main/res/values-v21/themes.xml

(limited to 'src/main/res/values-v21')

diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
deleted file mode 100644
index 8d0de873f..000000000
--- a/src/main/res/values-v21/themes.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
-
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:actionModeBackground">@color/accent</item>
-
-        <item name="TextSizeInfo">12sp</item>
-        <item name="TextSizeBody">14sp</item>
-        <item name="IconSize">16sp</item>
-        <item name="TextSizeHeadline">18sp</item>
-        <item name="TextSeparation">5sp</item>
-
-        <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
-        <item name="divider">@color/black12</item>
-
-        <item name="color_text_primary">@color/black87</item>
-        <item name="color_text_secondary">@color/black54</item>
-
-        <!--<item name="color_background_primary">@color/grey50</item>-->
-        <!--<item name="color_background_secondary">@color/grey200</item>-->
-
-        <!--<item name="unread_count">@color/unreadcountlight</item>-->
-        <!--<item name="conversations_overview_background">@color/primary700</item>-->
-
-        <item name="dialog_horizontal_padding">24dp</item>
-        <item name="dialog_vertical_padding">16dp</item>
-
-        <item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
-        <item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
-        <item name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
-        <item name="icon_discard">@drawable/ic_delete_white_24dp</item>
-        <item name="icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item name="icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item name="icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
-        <item name="icon_done">@drawable/ic_done_black_24dp</item>
-        <item name="icon_quote">@drawable/ic_reply_white_24dp</item>
-        <item name="icon_group">@drawable/ic_group_white_24dp</item>
-        <item name="icon_new">@drawable/ic_contacts_white_24dp</item>
-        <item name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
-        <item name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
-        <item name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
-        <item name="icon_search">@drawable/ic_search_white_24dp</item>
-        <item name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
-        <item name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
-        <item name="icon_share">@drawable/ic_share_white_24dp</item>
-        <item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
-
-        <item name="ic_attach_camera">@drawable/ic_attach_camera</item>
-        <item name="ic_attach_document">@drawable/ic_attach_document</item>
-        <item name="ic_attach_location">@drawable/ic_attach_location</item>
-        <item name="ic_attach_photo">@drawable/ic_attach_photo</item>
-        <item name="ic_attach_video">@drawable/ic_attach_video</item>
-        <item name="ic_attach_record">@drawable/ic_attach_record</item>
-
-    </style>
-</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From ffdf8bd198cfb9a6db1d03b202f0aa3f6b527eb8 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 14 Mar 2018 20:43:02 +0100
Subject: code cleanup

---
 src/main/res/values-v21/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/values-v21')

diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
index 4a3d93d1b..37ee278ce 100644
--- a/src/main/res/values-v21/dimens.xml
+++ b/src/main/res/values-v21/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp -->
+    <!-- 48dp + 15dp -->
     <dimen name="image_button_padding">12dp</dimen>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From a0bbd48dcf7904ee481fcff773b9275962c93f3c Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 16 Mar 2018 22:38:58 +0100
Subject: change image button background

---
 src/main/res/values-v21/dimens.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/main/res/values-v21')

diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
index 37ee278ce..a82d69bef 100644
--- a/src/main/res/values-v21/dimens.xml
+++ b/src/main/res/values-v21/dimens.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- 48dp + 15dp -->
-    <dimen name="image_button_padding">12dp</dimen>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3