From 4a39fe95886f11b37fad27d25d4dfd84bd49daba Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Wed, 2 Sep 2020 11:55:01 +1000 Subject: [PATCH] Conversation activity theme tweaks. --- .../ic_keyboard_arrow_down_white_24dp.png | Bin 168 -> 0 bytes .../ic_keyboard_arrow_up_white_36dp.png | Bin 190 -> 0 bytes .../ic_keyboard_arrow_down_white_24dp.png | Bin 145 -> 0 bytes .../ic_keyboard_arrow_up_white_36dp.png | Bin 156 -> 0 bytes .../ic_keyboard_arrow_down_white_24dp.png | Bin 201 -> 0 bytes .../ic_keyboard_arrow_up_white_36dp.png | Bin 259 -> 0 bytes .../ic_keyboard_arrow_down_white_24dp.png | Bin 268 -> 0 bytes .../ic_keyboard_arrow_up_white_36dp.png | Bin 301 -> 0 bytes .../ic_keyboard_arrow_down_white_24dp.png | Bin 303 -> 0 bytes .../ic_keyboard_arrow_up_white_36dp.png | Bin 371 -> 0 bytes .../ic_baseline_keyboard_arrow_down_24.xml | 10 + .../ic_baseline_keyboard_arrow_up_24.xml | 10 + .../attachment_type_selector.xml | 267 ------------------ res/layout/attachment_type_selector.xml | 3 +- res/layout/conversation_fragment.xml | 3 +- res/layout/conversation_search_nav.xml | 11 +- res/layout/recent_photo_view.xml | 3 +- res/layout/webrtc_answer_decline_button.xml | 8 +- res/values/themes.xml | 4 +- .../conversation/ConversationActivity.java | 8 +- 20 files changed, 42 insertions(+), 285 deletions(-) delete mode 100644 res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png delete mode 100644 res/drawable-hdpi/ic_keyboard_arrow_up_white_36dp.png delete mode 100644 res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png delete mode 100644 res/drawable-mdpi/ic_keyboard_arrow_up_white_36dp.png delete mode 100644 res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png delete mode 100644 res/drawable-xhdpi/ic_keyboard_arrow_up_white_36dp.png delete mode 100644 res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png delete mode 100644 res/drawable-xxhdpi/ic_keyboard_arrow_up_white_36dp.png delete mode 100644 res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png delete mode 100644 res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_36dp.png create mode 100644 res/drawable/ic_baseline_keyboard_arrow_down_24.xml create mode 100644 res/drawable/ic_baseline_keyboard_arrow_up_24.xml delete mode 100644 res/layout-sw420dp/attachment_type_selector.xml 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 bbb4fb4dc0ff4f975a8c40f0157aa6fcab2ed6d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8zNd?0h)3t!GlpCZ1_BHR7t|iG zxmdok_5DQ~&FqCNdM+LFT94-LHaHhK?W;-EpSPb&-kv#iETFdW#3c_y<|`UZf(}nNFRz0lQ`!Wl^a0VyDf4!&(3d#9>EBhxnfc4UW`u@) Q16s}C>FVdQ&MBb@0EB%&#{d8T 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 ddd0078f3f3f1777439da1fbb9cd197c8d4c1ad9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+R!42~~ zi){8NE?>cJoMx=IP)$%!S&KcWd`u#_XJh`}701KmUS2HE0Xm4m)78&qol`;+0MCp?KL7v# 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 ef8a4b6a4c219baa03de2e6a31c6570b453c3444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i2u~Ns5R22v2@Dq@9ie>Jo%R&15bL`bVmX76A>csh^**ynRzN!#JYD@<);T3K0RS+|HCX@v 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 dea8988386907cdd1741d2cd17eea26f5fe9cba4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8vZsqVMIEb_)E|q>@ zwManE`?-n**VTw7f!Db?_soof{rA~-S@b=&IASv7a;lS+#U#L=X%DU+^-|_uBj6@R~ZHuNXXC{an^LB{Ts5 Dk$r3v 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 f9622b7bee7a9d6f1b8ffcc8acada4b620896452..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawE_=E-hGg7(d(K;^$v~hbaoVfO zlJ%c#*1glQojxI!TP%vrNN~-O#EbvUUe40@lt}I|JO(6o9%j2ezs!0~Qo*$y5BvVU ziS1&W{$Ppv^3}%@ujyr5#wL2|KJN-Q?VDU)d7jhvkmP({mB=~kf-M4AjTM&0n;&gR z4q#=r^yr;0GE;ei5&v9y%49Hm^x9LRj-*yaMdZBs-$gd2Z Lu6{1-oD!MUz2dZ+-o}VT;IXGr7s% zIz^|LwTVucmXI5Nuh)6@AugBMr?{MEALeqHeR|cLZ7rdOxtgnkqMEkOH1Ut!60_!1 zhGk^vMYaUvNY7jTKW(kgr}JL&d%Ay9>zeIbf`1kpGQVyu)2W}Fnq+&C@9BSAqfPI& pTv~J6>Dt%x8Zc)A-M??ScDUNl?Fa8n+X?hPgQu&X%Q~loCIIeGhCcuR 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 30948d98332e518808da6c4ca30894c582006e7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgzInPhhE&{od+9cBlY@wBpq(!B zMooE<)vXd2?M{4bU(s^?z=?wVP2r5?=ls-812sTEQ)c@6OLN@$t6uz=?!ENgso?Ya zUnYedS6>mLyV7gcg)`wbPR8+`!XYnKuJ34>|MR8Lmi)8*9v7CH+J`pfy^5M}!8m@> zy4UPaRy`7Cd#3)&=V#$FXXj5(D5|Sy@^gFM zt~z6${oI7Qe-%yLKNoY_J?mGgm?=Lep}a1j>Fv+SoZp`JtNoZ^KjT4qU4GO0pL1F2 rKSy)gJ+Bw~b1q-V<~%#h@ezlmdtwA89DTBKHb}_R)z4*}Q$iB}7u$lp 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 62467ced43d56deb7698ac28b25c85b8470458dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFj{%KIEGZ*dV4+Euf;*c^`hJi zX6@W7^DNzj>~CotUEKBLTI_3SicG^e^%{^mWwTQR!)Sp>q z7pK{rF0>TRJv-Ut;yfEp;kRce>s*{@(22d7$+>cR>|glMfto#XVuflb+!ESSESEl6#9Bj*yf^WC6oFtE&m%XR~?qVjMBZB zz9oHyN&Ig1)0=0lD2bf?FYG>6rgDdMAbOJBa1Kk6~-y+W)VZAMXNjJzf1=);T3K0RYtYm)ZaT 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();