diff --git a/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png deleted file mode 100644 index bbb4fb4dc0..0000000000 Binary files a/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_keyboard_arrow_up_white_36dp.png b/res/drawable-hdpi/ic_keyboard_arrow_up_white_36dp.png deleted file mode 100644 index ddd0078f3f..0000000000 Binary files a/res/drawable-hdpi/ic_keyboard_arrow_up_white_36dp.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png deleted file mode 100644 index ef8a4b6a4c..0000000000 Binary files a/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_keyboard_arrow_up_white_36dp.png b/res/drawable-mdpi/ic_keyboard_arrow_up_white_36dp.png deleted file mode 100644 index dea8988386..0000000000 Binary files a/res/drawable-mdpi/ic_keyboard_arrow_up_white_36dp.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png deleted file mode 100644 index 058cebb7f9..0000000000 Binary files a/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_up_white_36dp.png b/res/drawable-xhdpi/ic_keyboard_arrow_up_white_36dp.png deleted file mode 100644 index ce4aa5602a..0000000000 Binary files a/res/drawable-xhdpi/ic_keyboard_arrow_up_white_36dp.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png deleted file mode 100644 index f9622b7bee..0000000000 Binary files a/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_36dp.png b/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_36dp.png deleted file mode 100644 index f91589d8bd..0000000000 Binary files a/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_36dp.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png deleted file mode 100644 index 30948d9833..0000000000 Binary files a/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_36dp.png b/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_36dp.png deleted file mode 100644 index 62467ced43..0000000000 Binary files a/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_36dp.png and /dev/null differ diff --git a/res/drawable/ic_baseline_keyboard_arrow_down_24.xml b/res/drawable/ic_baseline_keyboard_arrow_down_24.xml new file mode 100644 index 0000000000..884bee144c --- /dev/null +++ b/res/drawable/ic_baseline_keyboard_arrow_down_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_keyboard_arrow_up_24.xml b/res/drawable/ic_baseline_keyboard_arrow_up_24.xml new file mode 100644 index 0000000000..9b15755e53 --- /dev/null +++ b/res/drawable/ic_baseline_keyboard_arrow_up_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/layout-sw420dp/attachment_type_selector.xml b/res/layout-sw420dp/attachment_type_selector.xml deleted file mode 100644 index c17d36400c..0000000000 --- a/res/layout-sw420dp/attachment_type_selector.xml +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout/attachment_type_selector.xml b/res/layout/attachment_type_selector.xml index bbe1188eeb..ba2c4ab02d 100644 --- a/res/layout/attachment_type_selector.xml +++ b/res/layout/attachment_type_selector.xml @@ -241,9 +241,10 @@ android:layout_width="42dp" android:layout_height="42dp" android:paddingTop="4dp" - android:src="@drawable/ic_keyboard_arrow_down_white_24dp" + android:src="@drawable/ic_baseline_keyboard_arrow_down_24" android:scaleType="center" android:contentDescription="@string/attachment_type_selector__drawer_description" + android:tint="@android:color/white" app:circleColor="@color/gray50"/> + android:src="@drawable/ic_baseline_keyboard_arrow_down_24"/> diff --git a/res/layout/conversation_search_nav.xml b/res/layout/conversation_search_nav.xml index 310d7cfeb8..d0f4fb99ce 100644 --- a/res/layout/conversation_search_nav.xml +++ b/res/layout/conversation_search_nav.xml @@ -33,8 +33,7 @@ android:layout_marginBottom="8dp" android:background="?selectableItemBackgroundBorderless" android:padding="8dp" - android:src="@drawable/ic_keyboard_arrow_up_white_36dp" - android:tint="@color/signal_primary" + android:src="@drawable/ic_baseline_keyboard_arrow_up_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/conversation_search_down" app:layout_constraintTop_toTopOf="parent" /> @@ -48,8 +47,7 @@ android:layout_marginBottom="8dp" android:background="?selectableItemBackgroundBorderless" android:padding="8dp" - android:src="@drawable/ic_keyboard_arrow_down_white_24dp" - android:tint="@color/signal_primary" + android:src="@drawable/ic_baseline_keyboard_arrow_down_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -62,8 +60,9 @@ android:padding="8dp" android:background="@color/compose_view_background" android:visibility="gone" - app:SpinKit_Color="@color/text" + app:SpinKit_Color="?android:textColorPrimary" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="gone"/> \ No newline at end of file diff --git a/res/layout/recent_photo_view.xml b/res/layout/recent_photo_view.xml index 5d6db9fa30..7e8d2a3b81 100644 --- a/res/layout/recent_photo_view.xml +++ b/res/layout/recent_photo_view.xml @@ -1,5 +1,6 @@ - + @@ -23,7 +23,7 @@ android:layout_gravity="center_horizontal" android:layout_marginBottom="-15dp" android:alpha="0" - android:src="@drawable/ic_keyboard_arrow_up_white_36dp" + android:src="@drawable/ic_baseline_keyboard_arrow_up_24" android:tint="@color/gray20" tools:alpha="1"/> @@ -33,7 +33,7 @@ android:layout_gravity="center_horizontal" android:layout_marginBottom="-15dp" android:alpha="0" - android:src="@drawable/ic_keyboard_arrow_up_white_36dp" + android:src="@drawable/ic_baseline_keyboard_arrow_up_24" android:tint="@color/gray20" tools:alpha="1"/> @@ -43,7 +43,7 @@ android:layout_gravity="center_horizontal" android:layout_marginBottom="10dp" android:alpha="0" - android:src="@drawable/ic_keyboard_arrow_up_white_36dp" + android:src="@drawable/ic_baseline_keyboard_arrow_up_24" android:tint="@color/gray20" tools:alpha="1"/> diff --git a/res/values/themes.xml b/res/values/themes.xml index 1523168c23..f8f749f0bb 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -55,7 +55,7 @@ @color/core_grey_25 @style/TextSecure.BaseDarkTheme.SearchView - ?background + ?android:windowBackground @drawable/ic_document_small_dark @drawable/ic_document_large_dark #222 @@ -445,7 +445,7 @@ @color/compose_view_background - @color/gray95 + @drawable/ic_document_small_dark @drawable/ic_document_large_dark diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 01934be718..d839a90827 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -70,6 +70,7 @@ import androidx.core.content.pm.ShortcutManagerCompat; import androidx.core.graphics.drawable.IconCompat; import androidx.core.view.MenuItemCompat; import androidx.lifecycle.ViewModelProviders; +import androidx.loader.app.LoaderManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.annimon.stream.Stream; @@ -1268,9 +1269,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private void handleAddAttachment() { if (this.isMmsEnabled || isSecureText) { if (attachmentTypeSelector == null) { - attachmentTypeSelector = new AttachmentTypeSelector(this, getSupportLoaderManager(), new AttachmentTypeListener(), keyboardHeight); + attachmentTypeSelector = new AttachmentTypeSelector( + this, + LoaderManager.getInstance(this), + new AttachmentTypeListener(), + keyboardHeight); } - attachmentTypeSelector.keyboardHeight = keyboardHeight; attachmentTypeSelector.show(this, attachButton); } else { handleManualMmsRequired();