diff --git a/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index 651cb3322..000000000
Binary files a/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index 1a14d39de..000000000
Binary files a/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index f5f0f219d..000000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index 67676b203..000000000
Binary files a/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index b1a9cf4c6..000000000
Binary files a/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index ebaae6335..000000000
Binary files a/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index ff768e6a2..000000000
Binary files a/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/slidearrow.png b/res/drawable-xhdpi/slidearrow.png
new file mode 100755
index 000000000..2a025c81d
Binary files /dev/null and b/res/drawable-xhdpi/slidearrow.png differ
diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index eecee45e8..000000000
Binary files a/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
deleted file mode 100644
index 1d718b0eb..000000000
Binary files a/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index 6c990ed30..b7fe3cf10 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -131,7 +131,7 @@
android:layout_height="74dp"
android:src="@drawable/ic_mic_white_48dp"
android:background="@drawable/circle_tintable"
- android:backgroundTint="@color/core_red"
+ android:backgroundTint="@color/audio_icon"
android:visibility="gone"
android:scaleType="center"/>
@@ -155,11 +155,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="none"
- android:layout_marginLeft="20dp"
- android:layout_marginStart="20dp"
style="@style/Signal.Text.Body"
android:text="00:00"
- android:textColor="@color/core_light_60"
+ android:textColor="?conversation_item_outgoing_text_primary_color"
android:singleLine="true"
android:visibility="gone"
tools:visibility="visible"/>
@@ -174,14 +172,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|start|center_vertical"
- android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
- android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
- style="@style/Signal.Text.Caption"
+ android:drawableLeft="@drawable/slidearrow"
+ android:drawableStart="@drawable/slidearrow"
+ style="@style/Signal.Text.Preview"
+ android:singleLine="true"
android:text="@string/chat_record_slide_to_cancel"
- android:textAllCaps="true"
- android:textColor="@color/core_light_60"
+ android:textColor="@color/slidearrow_color"
android:ellipsize="none"
android:visibility="gone"
+ android:paddingLeft="10dp"
+ android:paddingStart="10dp"
android:paddingRight="50dp"
android:paddingEnd="50dp"
tools:visibility="visible"/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7a38fe7d3..5b10c234f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -48,5 +48,6 @@
#88000000
#808080
+ #999999
diff --git a/res/values/core_colors.xml b/res/values/core_colors.xml
index 6113a61c4..f81f55f4f 100644
--- a/res/values/core_colors.xml
+++ b/res/values/core_colors.xml
@@ -4,6 +4,9 @@
#f44336
#ef5350
+ #f68751
+ #ed824e
+
#ffffff
#F9FAFA
#EEEFEF
diff --git a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
index 4b1138c47..ede793654 100644
--- a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
+++ b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
@@ -111,7 +111,7 @@ public class MicrophoneRecorderView extends FrameLayout implements View.OnTouchL
public FloatingRecordButton(Context context, ImageView recordButtonFab) {
this.recordButtonFab = recordButtonFab;
this.recordButtonFab.getBackground().setColorFilter(context.getResources()
- .getColor(R.color.red_500),
+ .getColor(R.color.audio_icon),
PorterDuff.Mode.SRC_IN);
}
diff --git a/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java b/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
index 8b9430c0c..6840e5063 100644
--- a/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
+++ b/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
@@ -63,9 +63,11 @@ public class ChatBackgroundActivity extends BaseActionBarActivity {
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
+ actionBar.setTitle(R.string.pref_background);
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
}
+
}
@Override