diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt index 9514552d28..b6f9e148b5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt @@ -235,7 +235,7 @@ fun CellButtons( } LargeItemButton( R.string.delete, - R.drawable.ic_message_details__trash, + R.drawable.ic_delete, colors = dangerButtonColors(), onClick = onDelete ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt index a85ea525ae..f34974667e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt @@ -108,9 +108,9 @@ class KeyboardPageSearchView @JvmOverloads constructor( fun showRequested(): Boolean = state == State.SHOW_REQUESTED fun enableBackNavigation(enable: Boolean = true) { - navButton.setImageResource(if (enable) R.drawable.ic_arrow_left_24 else R.drawable.ic_search_24) + navButton.setImageResource(if (enable) R.drawable.ic_arrow_left else R.drawable.ic_search_24) if (enable) { - navButton.setImageResource(R.drawable.ic_arrow_left_24) + navButton.setImageResource(R.drawable.ic_arrow_left) navButton.setOnClickListener { callbacks?.onNavigationClicked() } } else { navButton.setImageResource(R.drawable.ic_search_24) diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt index ace449822c..e8b804f036 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt @@ -520,7 +520,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() { } LargeItemButton(R.string.activity_settings_help_button, R.drawable.ic_help, Modifier.contentDescription(R.string.AccessibilityId_help)) { show() } Divider() - LargeItemButton(R.string.activity_settings_clear_all_data_button_title, R.drawable.ic_message_details__trash, Modifier.contentDescription(R.string.AccessibilityId_clear_data), dangerButtonColors()) { ClearAllDataDialog().show(supportFragmentManager, "Clear All Data Dialog") } + LargeItemButton(R.string.activity_settings_clear_all_data_button_title, R.drawable.ic_delete, Modifier.contentDescription(R.string.AccessibilityId_clear_data), dangerButtonColors()) { ClearAllDataDialog().show(supportFragmentManager, "Clear All Data Dialog") } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/AppBar.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/AppBar.kt index ff9369e8a2..b039b5134f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/AppBar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/AppBar.kt @@ -165,7 +165,7 @@ fun AppBarText(title: String) { fun AppBarBackIcon(onBack: () -> Unit) { IconButton(onClick = onBack) { Icon( - painter = painterResource(id = R.drawable.ic_baseline_arrow_back_24), + painter = painterResource(id = R.drawable.ic_arrow_left), contentDescription = stringResource(R.string.back) ) } diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_right.png b/app/src/main/res/drawable-hdpi/ic_arrow_right.png deleted file mode 100644 index bbc68bf0f6..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index 651cb3322e..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_select_off.png b/app/src/main/res/drawable-hdpi/ic_select_off.png deleted file mode 100644 index 644c55711f..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_select_off.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_select_on.png b/app/src/main/res/drawable-hdpi/ic_select_on.png deleted file mode 100644 index a1357ccc9c..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_select_on.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index 1a14d39de9..0000000000 Binary files a/app/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index f5f0f219d7..0000000000 Binary files a/app/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index 67676b203e..0000000000 Binary files a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index b1a9cf4c6b..0000000000 Binary files a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_right.png b/app/src/main/res/drawable-mdpi/ic_arrow_right.png deleted file mode 100644 index 0e3af28d8e..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index ebaae63359..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_select_off.png b/app/src/main/res/drawable-mdpi/ic_select_off.png deleted file mode 100644 index fcb3c6a4ed..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_select_off.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_select_on.png b/app/src/main/res/drawable-mdpi/ic_select_on.png deleted file mode 100644 index b46179a7ee..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_select_on.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_right.png b/app/src/main/res/drawable-xhdpi/ic_arrow_right.png deleted file mode 100644 index 510690366d..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index ff768e6a20..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_select_off.png b/app/src/main/res/drawable-xhdpi/ic_select_off.png deleted file mode 100644 index 2368c9e3d6..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_select_off.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_select_on.png b/app/src/main/res/drawable-xhdpi/ic_select_on.png deleted file mode 100644 index cb9c641416..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_select_on.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png deleted file mode 100644 index daa544853a..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index eecee45e87..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_select_off.png b/app/src/main/res/drawable-xxhdpi/ic_select_off.png deleted file mode 100644 index a4bf4e53d9..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_select_off.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_select_on.png b/app/src/main/res/drawable-xxhdpi/ic_select_on.png deleted file mode 100644 index d8161d0a2d..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_select_on.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png deleted file mode 100644 index f7ce1009b8..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png deleted file mode 100644 index 1d718b0ebe..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_select_off.png b/app/src/main/res/drawable-xxxhdpi/ic_select_off.png deleted file mode 100644 index da08bfe9a9..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_select_off.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_select_on.png b/app/src/main/res/drawable-xxxhdpi/ic_select_on.png deleted file mode 100644 index 4d8d48fbed..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_select_on.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/drawable/ic_arrow_left.xml new file mode 100644 index 0000000000..b4d562a13e --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_left_24.xml b/app/src/main/res/drawable/ic_arrow_left_24.xml deleted file mode 100644 index 3b4a9cab4d..0000000000 --- a/app/src/main/res/drawable/ic_arrow_left_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml new file mode 100644 index 0000000000..3710c7ecb7 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml deleted file mode 100644 index 2a31b2ef3e..0000000000 --- a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24dp.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24dp.xml deleted file mode 100644 index f3dfdd0bdb..0000000000 --- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24dp.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24dp.xml deleted file mode 100644 index 19ec5a5eb8..0000000000 --- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml new file mode 100644 index 0000000000..1a3e8b4001 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_message_details__trash.xml b/app/src/main/res/drawable/ic_message_details__trash.xml deleted file mode 100644 index 85d4216958..0000000000 --- a/app/src/main/res/drawable/ic_message_details__trash.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/media_camera_button_background.xml b/app/src/main/res/drawable/media_camera_button_background.xml index e129933aea..c60e199823 100644 --- a/app/src/main/res/drawable/media_camera_button_background.xml +++ b/app/src/main/res/drawable/media_camera_button_background.xml @@ -2,15 +2,10 @@ - - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/media_count_button_background.xml b/app/src/main/res/drawable/media_count_button_background.xml index a5fdc45a06..40e8c4ebb6 100644 --- a/app/src/main/res/drawable/media_count_button_background.xml +++ b/app/src/main/res/drawable/media_count_button_background.xml @@ -1,12 +1,12 @@ - - + + - + + - \ No newline at end of file diff --git a/app/src/main/res/drawable/media_count_number_background.xml b/app/src/main/res/drawable/media_count_number_background.xml index 1ffe671559..5eba0a6df3 100644 --- a/app/src/main/res/drawable/media_count_number_background.xml +++ b/app/src/main/res/drawable/media_count_number_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/media_selected_indicator_off.xml b/app/src/main/res/drawable/media_selected_indicator_off.xml new file mode 100644 index 0000000000..3bb5a47aa1 --- /dev/null +++ b/app/src/main/res/drawable/media_selected_indicator_off.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/media_selected_indicator_on.xml b/app/src/main/res/drawable/media_selected_indicator_on.xml new file mode 100644 index 0000000000..002385210b --- /dev/null +++ b/app/src/main/res/drawable/media_selected_indicator_on.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/pill.xml b/app/src/main/res/drawable/pill.xml deleted file mode 100644 index f279f0f921..0000000000 --- a/app/src/main/res/drawable/pill.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml index be93efa248..940885af65 100644 --- a/app/src/main/res/layout/activity_conversation_v2.xml +++ b/app/src/main/res/layout/activity_conversation_v2.xml @@ -16,6 +16,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@+id/conversationRecyclerView" app:layout_constraintStart_toStartOf="parent" + android:theme="@style/Widget.Session.ActionBar.Flat" android:background="?colorPrimary" app:contentInsetStart="0dp"> diff --git a/app/src/main/res/layout/activity_webrtc.xml b/app/src/main/res/layout/activity_webrtc.xml index 4ae25d9634..5f99249523 100644 --- a/app/src/main/res/layout/activity_webrtc.xml +++ b/app/src/main/res/layout/activity_webrtc.xml @@ -53,7 +53,7 @@ android:elevation="8dp" android:layout_marginLeft="@dimen/small_spacing" android:layout_marginTop="@dimen/small_spacing" - android:src="@drawable/ic_baseline_arrow_back_24" + android:src="@drawable/ic_arrow_left" android:scaleType="centerInside" android:layout_width="@dimen/medium_profile_picture_size" android:layout_height="@dimen/medium_profile_picture_size" diff --git a/app/src/main/res/layout/fragment_create_group.xml b/app/src/main/res/layout/fragment_create_group.xml index 8ec9dc29bb..eb4c6070f7 100644 --- a/app/src/main/res/layout/fragment_create_group.xml +++ b/app/src/main/res/layout/fragment_create_group.xml @@ -30,7 +30,7 @@ android:clickable="true" android:contentDescription="@string/new_conversation_dialog_back_button_content_description" android:focusable="true" - android:src="@drawable/ic_arrow_left_24" + android:src="@drawable/ic_arrow_left" app:layout_constraintBottom_toBottomOf="@id/titleText" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/titleText" diff --git a/app/src/main/res/layout/fragment_join_community.xml b/app/src/main/res/layout/fragment_join_community.xml index 348e069d66..21868fd7ac 100644 --- a/app/src/main/res/layout/fragment_join_community.xml +++ b/app/src/main/res/layout/fragment_join_community.xml @@ -27,7 +27,7 @@ android:layout_marginStart="@dimen/medium_spacing" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_arrow_left_24" + android:src="@drawable/ic_arrow_left" app:layout_constraintBottom_toBottomOf="@id/titleText" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/titleText" diff --git a/app/src/main/res/layout/media_preview_activity.xml b/app/src/main/res/layout/media_preview_activity.xml index 78327b6cc3..fa65ef3fb8 100644 --- a/app/src/main/res/layout/media_preview_activity.xml +++ b/app/src/main/res/layout/media_preview_activity.xml @@ -18,7 +18,8 @@ + android:layout_height="wrap_content" + android:theme="@style/Widget.Session.ActionBar"/> diff --git a/app/src/main/res/layout/mediapicker_media_item.xml b/app/src/main/res/layout/mediapicker_media_item.xml index 14463ebbc7..42ef099b62 100644 --- a/app/src/main/res/layout/mediapicker_media_item.xml +++ b/app/src/main/res/layout/mediapicker_media_item.xml @@ -49,6 +49,20 @@ android:layout_height="match_parent" android:background="@color/transparent_black_90" /> + + + + + android:layout_width="@dimen/small_radial_size" + android:layout_height="@dimen/small_radial_size" + android:src="@drawable/media_selected_indicator_on" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/mediasend_activity.xml b/app/src/main/res/layout/mediasend_activity.xml index cc02afd1f3..f8e2143bf0 100644 --- a/app/src/main/res/layout/mediasend_activity.xml +++ b/app/src/main/res/layout/mediasend_activity.xml @@ -18,7 +18,10 @@ android:layout_marginBottom="32dp" android:layout_marginEnd="32dp" android:layout_gravity="bottom|end" - android:padding="8dp" + android:paddingStart="8dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:paddingEnd="4dp" android:gravity="center" android:orientation="horizontal" android:background="@drawable/media_count_button_background" @@ -37,15 +40,15 @@ android:paddingBottom="2dp" android:gravity="center" android:background="@drawable/media_count_number_background" - android:textColor="?colorAccent" + android:textColor="?colorPrimary" android:textSize="18sp" tools:text="3" /> @@ -60,7 +63,7 @@ android:layout_gravity="bottom|start" android:padding="12dp" android:src="@drawable/ic_camera_filled_24" - app:tint="@color/core_grey_60" + app:tint="?android:textColorPrimary" android:background="@drawable/media_camera_button_background" android:elevation="4dp" android:visibility="gone" diff --git a/app/src/main/res/layout/session_logo_action_bar_content.xml b/app/src/main/res/layout/session_logo_action_bar_content.xml index 52f99ecdea..22f6baf564 100644 --- a/app/src/main/res/layout/session_logo_action_bar_content.xml +++ b/app/src/main/res/layout/session_logo_action_bar_content.xml @@ -24,7 +24,7 @@ diff --git a/app/src/main/res/layout/view_conversation_setting.xml b/app/src/main/res/layout/view_conversation_setting.xml index 688aa01f37..ab9739402a 100644 --- a/app/src/main/res/layout/view_conversation_setting.xml +++ b/app/src/main/res/layout/view_conversation_setting.xml @@ -13,7 +13,7 @@ android:layout_gravity="center" android:alpha="0.6" android:visibility="gone" - android:src="@drawable/ic_baseline_keyboard_arrow_left_24dp" + android:src="@drawable/ic_arrow_left" app:tint="?android:textColorPrimary" tools:visibility="visible" /> @@ -48,7 +48,7 @@ android:layout_gravity="center" android:alpha="0.6" android:visibility="gone" - android:src="@drawable/ic_baseline_keyboard_arrow_right_24dp" + android:src="@drawable/ic_arrow_right" app:tint="?android:textColorPrimary" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/view_input_bar_recording.xml b/app/src/main/res/layout/view_input_bar_recording.xml index 73099e808a..b8d1183260 100644 --- a/app/src/main/res/layout/view_input_bar_recording.xml +++ b/app/src/main/res/layout/view_input_bar_recording.xml @@ -61,9 +61,9 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a01e2b69ab..0de7add2ec 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,13 +4,18 @@