From fa395456a5765c287f965af67b194d60cf1099ee Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Thu, 22 Aug 2024 15:59:03 +1000 Subject: [PATCH 1/2] Sync name change (#1637) --- .../org/thoughtcrime/securesms/preferences/SettingsActivity.kt | 2 ++ 1 file changed, 2 insertions(+) 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 fc52541987..ace449822c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt @@ -281,6 +281,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() { Log.w(TAG, "Cannot update display name - missing user details from configFactory.") } else { user.setName(displayName) + // sync remote config + ConfigurationMessageUtilities.syncConfigurationIfNeeded(this) binding.btnGroupNameDisplay.text = displayName updateWasSuccessful = true } From 8deb21c0c6e616013e23a584e89c74f2fab0f957 Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Thu, 22 Aug 2024 21:36:31 +1000 Subject: [PATCH 2/2] Feature/icons fix (#1638) * Removing hardcoded blue styling for media picker indicator * Proper styling of media picker buttons * Normalising arrow icons * Tweaks --- .../conversation/v2/MessageDetailActivity.kt | 2 +- .../keyboard/emoji/KeyboardPageSearchView.kt | 4 +-- .../securesms/preferences/SettingsActivity.kt | 2 +- .../securesms/ui/components/AppBar.kt | 2 +- .../main/res/drawable-hdpi/ic_arrow_right.png | Bin 260 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 307 -> 0 bytes .../main/res/drawable-hdpi/ic_select_off.png | Bin 1847 -> 0 bytes .../main/res/drawable-hdpi/ic_select_on.png | Bin 1695 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 284 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 341 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 386 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 353 -> 0 bytes .../main/res/drawable-mdpi/ic_arrow_right.png | Bin 238 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 255 -> 0 bytes .../main/res/drawable-mdpi/ic_select_off.png | Bin 923 -> 0 bytes .../main/res/drawable-mdpi/ic_select_on.png | Bin 1110 -> 0 bytes .../res/drawable-xhdpi/ic_arrow_right.png | Bin 344 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 328 -> 0 bytes .../main/res/drawable-xhdpi/ic_select_off.png | Bin 2579 -> 0 bytes .../main/res/drawable-xhdpi/ic_select_on.png | Bin 2588 -> 0 bytes .../res/drawable-xxhdpi/ic_arrow_right.png | Bin 508 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 381 -> 0 bytes .../res/drawable-xxhdpi/ic_select_off.png | Bin 4687 -> 0 bytes .../main/res/drawable-xxhdpi/ic_select_on.png | Bin 4413 -> 0 bytes .../res/drawable-xxxhdpi/ic_arrow_right.png | Bin 652 -> 0 bytes .../ic_keyboard_arrow_left_grey600_24dp.png | Bin 502 -> 0 bytes .../res/drawable-xxxhdpi/ic_select_off.png | Bin 8534 -> 0 bytes .../res/drawable-xxxhdpi/ic_select_on.png | Bin 6981 -> 0 bytes app/src/main/res/drawable/ic_arrow_left.xml | 9 +++++ .../main/res/drawable/ic_arrow_left_24.xml | 10 ------ app/src/main/res/drawable/ic_arrow_right.xml | 9 +++++ .../drawable/ic_baseline_arrow_back_24.xml | 11 ------- .../ic_baseline_keyboard_arrow_left_24dp.xml | 5 --- .../ic_baseline_keyboard_arrow_right_24dp.xml | 5 --- app/src/main/res/drawable/ic_delete.xml | 9 +++++ .../drawable/ic_message_details__trash.xml | 9 ----- .../media_camera_button_background.xml | 9 ++--- .../media_count_button_background.xml | 10 +++--- .../media_count_number_background.xml | 2 +- .../drawable/media_selected_indicator_off.xml | 6 ++++ .../drawable/media_selected_indicator_on.xml | 5 +++ app/src/main/res/drawable/pill.xml | 5 --- .../res/layout/activity_conversation_v2.xml | 1 + app/src/main/res/layout/activity_webrtc.xml | 2 +- .../main/res/layout/fragment_create_group.xml | 2 +- .../res/layout/fragment_join_community.xml | 2 +- .../res/layout/media_preview_activity.xml | 3 +- .../res/layout/mediapicker_media_item.xml | 31 ++++++++++-------- .../main/res/layout/mediasend_activity.xml | 15 +++++---- .../session_logo_action_bar_content.xml | 2 +- .../res/layout/view_conversation_setting.xml | 4 +-- .../res/layout/view_input_bar_recording.xml | 6 ++-- app/src/main/res/values/styles.xml | 5 +++ 53 files changed, 95 insertions(+), 92 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_right.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_select_off.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_select_on.png delete mode 100644 app/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_right.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_select_off.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_select_on.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_right.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_select_off.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_select_on.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_right.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_select_off.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_select_on.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_select_off.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_select_on.png create mode 100644 app/src/main/res/drawable/ic_arrow_left.xml delete mode 100644 app/src/main/res/drawable/ic_arrow_left_24.xml create mode 100644 app/src/main/res/drawable/ic_arrow_right.xml delete mode 100644 app/src/main/res/drawable/ic_baseline_arrow_back_24.xml delete mode 100644 app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24dp.xml create mode 100644 app/src/main/res/drawable/ic_delete.xml delete mode 100644 app/src/main/res/drawable/ic_message_details__trash.xml create mode 100644 app/src/main/res/drawable/media_selected_indicator_off.xml create mode 100644 app/src/main/res/drawable/media_selected_indicator_on.xml delete mode 100644 app/src/main/res/drawable/pill.xml 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 bbc68bf0f6ae2d42b08a2a82c83a76393d17e8ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBI14-?iy0UMW`i(eN#`7Ipx`!7 z7srr@*0(bPxf&D%T+*#Q-9JAooy@zCKT*kOisYhJ)e2RcGevh#_*fiGO8p$Bp%m8C zyeL{jiL2r5p1%HFZS&L`tc-7_yp;T}@|&F@b(sj`RsyK;W>EO~Et%m9CO%A$pLuoB zwqI}7*7bx%w_kmh6K1+Zku>ygb(M!#ZO- b;{%3A4D|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?HuasQPP^>{Mf+IxD~ zYG+Q2{`;$Sr%{FvpH@;)Knm-Dc_*j8nRkMzLDxFowQI$nYg`(-?rC2B+a_)*IqP!s zmj0E-rOW?1?Y;5g!~Y4k?@cbR^JxCZ^NZosFT0ulpP8xxoz39s>gTe~DWM4fPv&fD 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 644c55711f7057a035f65fc703ea5a2af8d25d3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1847 zcmV-72gvw|P)Px*@kvBMRA>e5nQds5Wf;fLw6*sa-R4U=x1%;^l1n2kkjR-WqP}F1BGHFIf%riX z_E8c^@WY@$zceC3OVq`N#)!>o$kY{X=%%O;Tbo8(Zsp5f&eY@S|9d*u;n_>a7sPk%|swrp>)@+KdRCUMfI>AGG{4g z2s6i&w3$3m1^CC5M#xCn_=w7A37F$J_*4*2t287A+vsO3&f)xh;hu2U1=;}pMn=`h zBpL$d6iy}y$wDfqsHk|htgLKpR#w)$jEs!D^z`(cKp>DXFfh=6>(;Hln>TOvo;Y!$ zW&i&DziGTr7z%>=hyXbwtLoGWWO1HZ&JgAbOZV*A^KM&P+ritnZ~rc5BNCD6YH4XX zymRNy52RxidV>1Ui+-CVRi{R9p8RIEXA1?}wrzW(v$L~K9{b&14-F0V_w@9%cXV|8 zeE$6T>I)Yx9Mia;dV71@hKGmy++%t6>eZ_an>TNMPdZD`8`O^->_w9ydTg|q^Q1|h zQe##+1V~ zUaxnf`f$8ZVAe7P#*@dk6WK1sZ`$c+9ODaDtXQ$;(xppBOs^Jt*Ve6D-&Y^en{!($dxDyuy9==+UE7gB^+VS#`@`1MdhDGGCT?ATGN8F6--bLY<0s*T0UjARSuysDEHBZ1x} zmoHyF3<+#++O%nl+E@>40@!?L6i^1+MO|H8-=m1#rl6qUEw!PDoSaJMrOpu}k*l3( zmF-R<^P_s%nimQ9#kl_!*pX|qDl04BW)dJ!U0wZ|+ANf*s)tpg{%8fg=wHy-*ti?p z694w?+soCqTwtw)T?;5+QOy_guXvh6DmgiMgW8q}ggC4M^-o4@0<(2s7Ax}I_@G1X zn3OVs^Mz46(%6|q0sD4xet!OIDm}XAH2HkKK~=$sz;&1lS1bg*=pWHZJ)rAI14fFA zi`h6h4{#p;LhE260*ShyEz?O^sDYm2$B&;@!L5-SV=SGQdPj_e@6@SN^|a`An_pgD z?o|~6VKacv+_PuTI$IeRGyQ&DC=%G_BHG3@ZnA=h~cH%Oz}+S|+oVL>&Sj*1N<{U5rp@|Pw7!;HQ~F>;SPXjP6(o&SNL>z<~p+l9G~~4Mm@0TGhsu9`-QhLEe(QTK%0IAWcn8NA#Q9 zATz;n?v9#%PPw2TI}7#k;7fc^`gH5}tAba+Km2rLtTRM_F!`=syVl4Ez1pqQWiCxs zkR-%13O4&mT7T(_7cbr@d!8#-uKc26Sl~K?fB5OhL<9(tudc4{JCzTl=$S)@4!xr~ zFXE73Jzyvnf?o8eDP^|kK+RYEf$aaFazKDU*c4K~lOi}8moGFBU>4YU;`Wsi6685i zh|8CH2v{!0?PnE8u)x{>;_l-v1Q3e^B;xM#y2HRl zf;AC$e{i@-u&_BJG6Y^br~NM`(&JGD61L59HzF#e*R=e}7YzaV>JZ>r$Z&55M8?2< zhBhP1<%^dPE@FJ)nAX2pWj`d4FyJiPuDhge0s+8f%w0mxpz5PZv=Nxdis>>!jIlQA lb_I4jYi;yDk+__Je*wldi^(%~B_RL+002ovPDHLkV1k(nnA`vW 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 a1357ccc9ce93a1894a5c780a26ac7015efe565c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1695 zcmV;Q24MM#P)Px*SxH1eRA>e5ncq)bMHI(pmmiBP<(Fx(h{QI__@L1y1|yBJ;YHC06BTU0h$$N}B>`J37@+)=AIo|^xA$y@%Pz3( zvP+Ymic ztBdmcpQw_#p&gNV;tHz?@Y_TIRxWyfM@Pqty}iAi)6>&qksS(s8N*oSaOYx9=C*fE zs>u<+;}&_McZgOsH#av74Gr}O=CFMyA3y%y;^N|@G+h;45@j;ZPh8oKfP%-*i>j-u z51l=G_MP(b@`ssmd@gL>{bj*?bzwQ-xQOBB?+utY9}Sv=`v_jfjE;_;udlB^+27wk zBGqY8&c~J{u8ovlF$C~D2Yhi$OUpxN&YbzMq@;wcHXrvdnpe-wn!yPI$o0vE$*}qS z_a&2)=`+;_vrIujL1|M{)3M3P$=?PB2G|9_tAUsiD&7vz4tSzWv8?S0V}mj_u`R_SQ4Oz~7CaUK+MJLn;jM~jBX!5;lkGOl>lJKpz7TAKL5guh ztCtaV!0!_+71w#cva<3R(dNldr_8b*CwaJ=5|GpP!^_1^bP9z+--|1?iM`9BbE5cf z^elLH00OvAuH2Fj3iv0a?1aixfyW-U2+s%@z#>JWA=ox7x|e{uPq4AE@j2=2=aM4M zr&_RyZ7{f4c;DJ|L&qY(?Ha78s5r`KZrJF4(U2m+Cbkh53k1Nn0kd6UYl!{Xyj4of zFO#zKdcbcwgjW*;EMSr%1i%<|BQF8!*}M|VuemZG-uB&we!C^SSAhX>G3gG(BtSpd zW$`{wWn?BrVFzPzL@~ISI0ImeigyQKmdVEmJth`5U3}4jsVXQ27n4SzxH|wLzkW$w znNL3f#o%Ic@Y#!J?||Lz1Rh_Mr~N3kWeY>hVCW^llCR76EAQgwK+yX*wcu?GE+z+` zjlxCCh`o8ok!*aT=G?5vVKpmL~i!-1zM<)Ro|OuPqe2#q!Y zn6X7Gq&`4el9yrlhE11X8w`kxiJJ|KV0FYx0Cp?nZG`dP^xy+LU81(Z;^vYd0LGXE z!0GIO{4NX+5C231*@JWhBWz+Dak21vsypDc^T*x+>JY%s7CJjSzoAa*gX}@71)FZ# zW!=RB0kDBFD&EDVep7wWY!znwk^;OWd7AqCoQw=oA3u(=0J|@5Jr*>zcL$t=S6f@# z$-%+F5wWUYV;gp0D*{FaF4fi5-CkB!_5gXCv8!P-^zVi!mUK3xS57_7C$KS+Km9@o zbV-qmRZ}ZGii+2T^Z{q%rcJ9rf-r@@%#*7m-6x@JjHDBJ8&)aV!kn5D!WK5&Jn6iP zB^o+y+grMjbj07*$H&K)N%z&()*cP!<`g`0Bw+HgeWvfystL!O);6(qnG6IzkK1JU zuVv-h+uL84iz_4}XGC!waKy9}&xNGFBe)V*@t#fYZbtwXN`mazo=dL-a3=x@?uR}1 z500IH*FN@6?3sTt?ZkzY0KfD{IT!3m+W*OyC;`Fj2;|k3?#4J%UA`ZI14-?iy0WWg+Z8+Vb&Z8pdfpR zr>`sfLq;AUS*HUu9|NsB{`z;KB<_MJp`2{mDvvbJEden4p*t%`U z<=c1e{y34v-wKpvO!9Vj5$4$)GY!b`@N{tuvFLq!>Y!kQf&lXYhOQ2#N&mXHw%k$B zZ?Dzgz|(QDplbSQ(V+EfXNAq)UUs|c*;|H}AhDgOiB^q)^y89uX| Ua=$Kh3}_~Ur>mdKI;Vst01Xmm&;S4c 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 f5f0f219d7133283f048039f15d96cf1da49ab10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s3dtTpz6=aiY77hwEes65fI?gMx4-G2}`t+5TLgfYq6-9=({W~&^K z)9C5q7!q;#?X}~)4Gui4feF*+T;BEHPq2w^M)SmfA|F!Xb<$@BdHr1|p{Ty}ghg6Q ziFM1A`Dr~NQmUbROQj}D`D7WcJiJ71GMkT-te3Fb*%@2*UHW!0azW>cvuf$*UYwDf zV|j)5q4^3&Kl#kS09`)b{w%gDg+=hUWIzXh)ymPxer0aACj%kJWM zztGNNO5qBNJ(h1|xGZyIx-3kd8+&|tnf`_S*B9eo%C*1ZxBAyla?O9|ee%wJ{$u-0 jX8gXC@eUYT3fEaHe3hD-pESq;?Pu_G^>bP0l+XkKw5ET{ 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 0e3af28d8e2a7c0f3c03f4bba2b2877d5f01e7ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0px^>e z7sn8f&ZE;BIU5XkSoZr}@Qpb*QTCuVScd8dit{LE3fX0Ii9l>5Ujb$CD@q8?ZUEHQAvVV z@L)yci#C@&=&Bd} io_^`l9O=~G=WkKR z?&;zfVsScICsl#hfUlUB%i&K$1uqv5d&3gl!^w|K8m62!mP!1O^24czZO*BU*$o=@ zryew}l$p)e@hREi>HJRarOZ6vc1oNLWyaGCb!PC{xWt~$(69BKIQdPx&RY^oaR9FesmrYMoK@^6s)+&lXXh6XRyk!F>ZW`jkM8U?LJ2rkSSoj~hYtj${ z3zGg0x2z#Cm6Z!qSSlnClpu*TkN{R}z2f`SJI$@$TUx#vPx59uGv~bL%$Yl9rk2%Y zxo`~s*mwcO;a^~^E~z&F^eze^;gWD!2)lhXmLrseqVUu0|58g}HRY%PjANW#71}yG zJKLwGrtbCi_4P+0ksGjYZ*PBHUtj;6N~PZK?Ck7nXixYq5L8`(NbeuPIgUGon4CUe zSy`DY7K^)w0m7VgX3@pQwS^;ap+OU*8^iXov9ZBSCX*f*7Kh$co7ZCN+hit_VF7 z6BAGO_xCp)$N90au<%-r9%`JG-4w{obr<|*EQSuc*kB8X#(M-fgBGl*KY{`)?@p)F z&$Qxig+d`eJw5$WW43@Ji1--E68gY=pv<9TV}mUmaA~YtsJR`QFB5kt?GK0^g7NY3 zCmQb+_y}=~!ysV}9dvuKg##`)HAZmE`wGS_LX3}%6uK+NIV)q8^$NP!^uhrboa)B} zeE2Sc$Rd-IlP~mH5>nEtB6F9syu7?@(nT75(^X|1+`$%(7@Tn9L;Y5v%xh9hCrpLY z8E)g8t6vZ(t4Eeo=>!S3a1_M(7H)i~UpWm`0Z?9HlJZA22f|65LxsR`AkGhTqS5GW zHNF9aOl{9*vzt=lf;p`K9GBDT>gu8%@NHCWf%<1Fp-`yokZZ*2$!r0G4!0VUi9~|4 zUx|{j69|q&BO@b}V@tQ?mYPa-y#bWCQc=>SGNdN3V4%~05I~DK?_lHl;9{!E1WHXg zh6H8gJPOgQocR_af?&^^T8hhir68Ji8JR3J?K&m^ve48Ai3x%Wdg3%5r6wS=9lQw|d6v(e#Px(5J^NqR9FecS6fIFVHBR3bk)7o;(}ISc`LS{hawc}A-fW^1=$5jdkKqrioh=T zU=}4^o_Yu(Gc z=Re>1=KN>=^Do0JFxYv)tdH7=K{JM=3Y6#f7_8yFbq#$5PFzTimpqBJEQNOu-lp2Oj&KwzHm^H(hP z^kYak-X0LP-uDS>Z;y$F>k}^m0-j+G=E4WQ;E=e$sX;Pj7{eOp*4Ni>J$L@XtsIj% zxA|R&yYps>nTX83tQG^yoZM(+YB%KYq2Q$d#`SBbo0^(l5}%(8H4;aFqEZ9FQDjyM zzWrk3rIsLXFxNc)$vt<4nFvZP1u&;?G|Ig4MA$ucbN22X6%IZY`_S9l`;A;R0unO- zL1s$b`UejmJq>fl+rH_0Q$Fx^j`7D0QUsHYLP)A3{dt#X+Q(i?a0M}Ue z<+OgyMWw5^9DEYs`p589%^&OXGMHzFt^CNK`<2~puO%jAB1|SOg?b5aZJ`R@R#{nj z=I+~&n06ZbD~wV0axz$U_qwHpEX%&>>FMzhp|TX}$`l1uRaG6MLK9GMdO<2)0o=rC zAyZylEg%z{%*w)|^3I_Mm#W&+5eF`Cf*Uc&7kh&USpe2QlhR+7onu!DZ3NOe>3$v49(#n1>qphfcD?hWcMK<1QUB&`A6-ZmK#E42gK zrQ;sUOMt-`x*9I>O^QI=>ViDllz{Q^al}wkEDOM<5JgMHq|#jd1+22oa7r=Irp1j& zy%U<~3n~5n!`s&}#2e3cp{47Gn>#IxqlBAUwlsee9T^6RIS6(+1GtXjF!9+l;@nkY z;L+9e0=U5G85wpW24czFY5`c6iPqNEd*r~PrRoK6fwQfx?H*!~DK(&eO2PjVdV#$jUrnjFsgHOiu^ zr319##|M`1)+`~?boI)qmX;PL`NyRne8~hL6Vr5p@!}-2WpjB&_4>uxXsP|)>6E7; z6x``@6LW2cg%=`0KY~j~GP(G~&kw<81M;5Mp%e$z`5a1T6M>>c(-4p44Gj%P=W;B^ z9Ly!ZV#!x&Jan&t`YX^pqyaofHbC-E{+Of^KygLLLQpgR^{<%}U-JV&iQ-XQb1EZf1_-S+i#Rp)MF0Q*07*qoM6N<$f^B6F-2eap 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 510690366d5b622791e4eb47841a2ce5ed91819a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v^Pz`)4m z>EalY(fD>2H`gHp0T=ao3(Qx#e|RBx@ZJ$=7cnNbWslTNA3Cy$o!Zh;>w7sZJosE> z%G?V#{Tmidxg?aRZnZ*kfl6Jk1e0L*kLwdeIPWLT5GvfWrRQg^%-)Xc?~E^2v6rPS zeC;#CvDu)REs>4)5RX)gqzQ*{hCtc{g)<8ru}id-sTQ3p_Z0VxPIV6~+14GOu`M(z z#FXV)){M0_Zu2wW@0`{B!*@aa;urjqRoadB&Me%1`9%|3Y|x_as*-5dyEmM+i(Nb$ zTT(6im-+aMC!giLPHDL5Ee(0I=-Ga$kkF}B>g$ymzO)3qe^M%Pz~k(?BLSXO3^Ts> Vdw-MW>Hr26gQu&X%Q~loCII+ih2sDK 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 ff768e6a20d59c627ea0043f2d088a589e3f7396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 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 yl|~zX4A6j_r_LW(Wgryxal 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 Dkdb7A 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 f7ce1009b801a59f0e747fcc1920a120ec02ff06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 652 zcmV;70(1R|P)L3UIr`I&26(vq_5AR$d-Z@s13Xdw z=|4XGNCsdiAE^K=0>D~65&)RXhdTg!`EUkMC?Bo>D&@lw zK&gDV0jQM^CjiCr;R2vqJ{$m)%ZECEdihWWa3~+D050W25x}W@r~$Z@4^qH+wviBCv06l$oCPmFCWDFh((kSra9rO^8r%I2iu_b{5yb@^3jv>^@*Pou1*6K mrvZx70L5v5;xs^I0Q>;ILD@WWZ>E9(0000I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`&U2>EaktaqI1^-GR)G0xb{2N<@^nPB8M{om+Csc?pvQ3(Ji|6C4A1;>z`dzs%h9 zZ@pLl&B)w$7k}Sm5pZB&L?ixiALue(wy!~ypCL@`Am@%J%m)~Y?GJ?8F}&IMg{kJe zx{yu7{GSX3?ZNyGbN@H#-m_*{^0TVJBA$1`^K8bp8r28e|76#cNT~Y!)N0U;XI}An z{>G=zwHdC}*d3U2p6$lxoehjXeSlh9q*Lwq4K(JnN=!S?$a5y0q3xM5gSAXoczj{& zcDaUwEa%!Q6dJ#pTJ;?Gttjo1&?n@~aVIhF&^_OT{>x=d{~eOmH2S85H9ZT+S6OjQ z%d9DHqv`bD^;V8MqqYcaIUURFxHoRP@E38Jq^8GRo?ahfKIuN)`$1Q3H-pw8zTZP*oLmKk;A;5chcgnpR zcu253bRkNBieaWr0Dzt1m9pY%U#wk(f4QlCZO^ls(G(>p^_x6F?mESGY$qtSW2}2) zM96!bs!#{9Rf7=;cT#5|2fQFsu6Y1dHy)fVEmUSz>Z-x@zCU1@_}-c|pN9`)Y4A>sBsH|X>9j|X+OZVd8x6Yw zdw4*X|36hMhhqQscr_XCo$cVP54%Xp)vP_);{8O*0u{Sbq$hWc;NsUKQdz)tp9-~C;k*=E(d!p4~ufO#Uz>HFbb~G$?HaqCx!Oj@N(%S zmOIjLxwOCF8v>Mc=!L%<@rR+aRy1b3c|Ra@BNk#L zLeR;LVDRODq5dz`cswpMl_bt3O-o2f@w;}W4!oDRTiZ3)@l2hGJ!#@WA9mg~sha(n zRX@lh55zPi1nyXhYDw?bR9hWvikyLyw`39h_x;=aPsSkT259dH zQ>e_^nDCB_D+wGlbHFoQctsDRuRrl5FpE+lFwQ$oJlW+;Ou z_VKefRUalxH6Hb89@wx*oRhq>g$*cq0($Y^)-OJ4kF4*IjVCw6kBWv z62XxnkinA?IH_-FT5@_Z28Y9$U25$V#I2MKtcI;2_@0Vfo-ZJtDz={Zz$_;9xP(L9 zsXNwkb*8mAJ8_EwWk?L1hFLI!KZ94wRP2T4BA5K-&&v^+(y47pdUoApnR#p4b3Rnaxy-(krN!$JU(ydIagy3;?l?v zd%rVN6&24Y;hZ!+2k~B%WP<)lL_^{ko||=lYAMcpA^Kz7p`vm9uGV3?wWwbjSjDg4 zHK5eCL+r@*b8NfA34*qK$tYiOEG{##!oGBWcP=>gY~i#sirlu;Q3`c;wLQ{y@PpVP z=>B@CvUR`p+Tea&q7BP4%OVd@#}>%XL|BMb5bJLc%#OAV1K7wT4~{ls$}%JA2QLe`CYwpUU|Dqc=vQ19=KnXV^8WO)x@RRYysM;xem+`97 z>D!Mo<_}!|MES>`9X&sBFu$JjuXvaz@+{BsSI3?RchYbcv0IOypE>J)MhBIK(JjH3 z={rP2nc1ZToQmOUi)Q$Y4wZ~Ad7D}Y^5ge;mU?XeB+!Z44EE*R?%3u`+FiMh8}O9; zo)Y-&UrCKo`y&*`5pL~_?%a+e&yApdIRMWqxcQg;1Szn-*h2nAk*lA6V>`X8jf7q# z;wDnDdWu{Sb?~Fv9J)qx#y+nyMmfs0^~+Y%qL7hj{*OvMO-HN(bguUx{qV0d`FxPN zxzd3!cRT5J9!$60opMPm`l4^uQU!j04RiY~W;AvIu)%L1)dv_zDkPKrnZ+8ErJ5-j zB5z!c;p_PwbiF&RkuI{vG3h{8=Qw+ml+q$7Xj11GPBcfj`gwFiGbGfHZ{~nfCZCo7?S!U=mL_AB#w_WqWMobFNHsbgba4msKgIa^;Q2S5TM`BumnMRL|^>I?qzR{MG zik$nK4e~e^*{j=9QIjqp`(9yjv}*=oz8lA0aia;{v(@a3AU6@KgK{+GR$?rAIuS7i zS7V%wwaI`j@??EQl5M>@^d#n&(TZENIQba5FF zWi_aZ%%NfDC;OE9l$$zE!=6k0>|X|Sm)siW)u7gGpIgw)OSgMpzF%y43`^QZdiFs7 zSy>JzXA$<93Xo7kN1@v5JNA=9RYm-$ zmN=+D3`Z%FW%TC5RJn0#+07+KHeU8qzf`+?m`R0jet~jSEM@?Npo~3+M))S}5Nqqm zOH1tfd*`}XDLl4P`fmqS_4Wj_B1WHmeG?O=kw(}~veQn%-;vZx_uAq&<5fv|AThwo z0`RdUHIbBp3swXJtnANmDcjCz>tjbI*N{8pLqL`=AJ<)JVVQkc6 zKkAdHl}V@6Q3QzXe_Ekx8d5RD8chsa7BdP>?;m~?%5D_KGZQ9kMBYF(gGGnCFkb*> zOsUHM$su#k|9fL(a=K8i*TI?Pz?1(lDRbbW3_HPI=|Ba?GdVAu%L&NG5OWxUlkU$}ud{ z)z3!YP@xh8;oZf9Gbo%k0I}7Ca82fpbQR>YaT5#7mBi!<#$rTdnFW7@I9d!(PBeX_ zQ5F1tWWNNu|AnfUZU(Oz#{1E@lvupoA?WE*Q(Bkxt-5iM+}AX~Z_@DsOGOL`idlQLYFaV(~#)l983%Rxere@`SYZ12SNYa1_gQ zlt(HwHM}uiJko+7rIc9HLfV)*H7qa#*N>=(CZgcU1amf=f*(jhCakMfzgKZ>;PSi4 zt8MChU!rV5eC#Z1pJIu}Pp?Mp7yBH@kMC2yF~eeMM_Q4Qutgk=X2&3*8Myc5Z;nMN zw^ik$Yu#lNL!4hiHZdtJ)eBEdX;Ws4;E-o0|`{t>Lt|P(QX~76qO@~R-lgh zUA{8mMQQ&#d{F|-wJ3|S!&$`uRz|_%s-0usf_pk}9Fxq6EC`F5KCSSPO##32tA_W+ zFDVmx#@Iy${XDL`B0PPnb((nm@}$iCcI%Yar)A%^mh0;Q zgJb;4xt-HS@H3lwdn}0RN;|_jk$4_+2a!Tj5#Rmgjp(U6sM5Du4yBC`H}j7fcCVlU z6(SzW2Jb(wTB__M*(Z3DQ=`?A`ROFGB;Q93W61Dkmnn0As&1oQ;F;1vCxx1G&71P`>$NSb)f01(`(D|qLZ-0c~3Ee%>p z+N?mzQO@CPOw8YUEwG;2hEp2R*GKFR2ir;MS-UYHd+|2;N5#AeCe?ElC5Y-J&|`}; zOh=a^!FNkZJ+J;*nP0j)Gu4ed%|0cMVWgXaz-o`aDa5c)ux~}cr&5PZ7HD^HK*-Xu zt7Rt3lvn#eBvyn*ems-mSt~vxvn9I4muZ`Pn<5+hW$DMX?CjNm`Q3M2>-89!Q$6w# z>t|Ntiu6oeym^1HXyZUl`JzqXSVnYeLK(z1KQSYpEwb+S+p7VmDB1)5xoz-x?nk)Z zH1%2=#FHf$_La)0?eit9Ka20EGY)(TRNm_7m$C>)0RFB+QGXbojTexpTz_ANa>g>8 zTFdd{kRPXV=pj;vgT+prLW62(bg5RL?79~o#D1LCKS+s4PAz6RO;_2edYsluc48qj zCOQ0-QV*E{^wtk2D(`q}o%ReFD%>q@F?SNO6`jfkj##EZ4u>a1Lvmi&#tI`EKtmU0d@< znyGj=o7!uX@`%yyH+^bF4Y#V}E( zSF9jz6ET6kBF}#9(|LSX@C$vQ--qrK7p=$_XYQ!%S|qa+C4g8+SgwaJlhmDG&1h`~ zEi?9XrZ2MBne>GynF7!o+b7AZzlz_B%j3XYcCwm7zb7FxFH(u6ofd@WrHPd8{f+~i zu>_j-;aLtx&zluW*{k}HEk`b&mHr?Ef8lcaBo@3rN=|R~`d6exZ)eN8P7U*-YI{SM zama-;5@(`5wv~CniNZG2j&FW{m*`cwG=6RaW2j}omQ`1%dQ58AU4Dx}x_-eDixz@T zuvQo*!a)XyaP_$k3P0=kJfDk2P9_nfoZX6jRvV0K6!ZW@}&VodsD?*h+M{YaL@HlWZH+E*vt)3T%#-U>5^^9+x1x-zlUY1?>)*;Qi*Ot(H`hOxNOJ^4P&UF>mh z)q%a=|8RLIYpDtsf3teyg)EMbb=&&ULG4(k(C;+XEyruytgp{=#;KAyuI-ddTh!;7)j+whDKlZllp|HoR+8uQV*_6kWK!lcOMCpV1>wVzCwd|=Q8DNj z(ke;EUdh}M1`CUClk6cGO6?6aM(Z;vyc>1MJheJreFFO5k_y~!e08T1#aRP*UK25O z7pW7Q_o|)F(bHpl`C4B})^UDyH&Mn%QYG~l(GN)}%w16A)F8zBBm??mW0pI1kv;?= zrlHnwr;@^j$DEAGLaBY%U9a*kQ#TZkUe+rlzody% zVVhc1LHYy>+iPZOHlLpIYz`~K9%Wi|N;%_zKMECBKP}7+Pq|EX_`k~dZ2`KQx}?2J zrIvp=t@WPv9hR={qWo~;OgcOq)t`BC|5#7NWz!YMQXPD#tq~qaIVzS@G(FWE^X3MPQq(ie>wa5!Y`UYz`})fm z0@$T$pa1fFIhK%5AEYGRjE9Aej2GEjCvNy54)wQh`ktvuwv6}nCF(*q%vZu(om#2P zF|L5R10_0n7nc^I(NzvRUnU02D;52=gN&PE$NSJOgh1B`uEJNFN@Gx#kW2l4W-#me zllcDG56<@S@YTbJg!-LUus%qqr}p>8WrIVc`z|aKWY5lLKA}+-(LOuezf~?i)wx%U zuOkTPQeh^P_!Bp4`kW}=+HWGwGmuR)H-N-@O|Ds&NtWQ7!|9q!-;yWsBqPKrN&8D* z(@hk?550TdARn*N)z@Gx(_15EVI3a7($X`7$2e=YUW-X#AmJ?8QIPR7TF05gFLw*= zgEps(>xBOJlI+51ne2Vz^p?W_H&U{QGs_AX6t>U$N%eo0Z$nrMfiwAl4fd_|CLwLi z+e!m;asQ2Rhm}hHp{0xgtK%Uo9NjZ;LAvJUrQiNX92VKDI%cCk8H3tmViQ;9@(vqB zpClwN(LDPIGXshm-y6LXg<*4BYA&!;*h%By#Hon|MKT*rwUi0fV+FGu@`uDb^34l+ zPCTDO02^u;-MNgTP)dk;yJqb_C_}ByAK^6h?@#QtBog%T^%kx&!{gm}kporyE7)h3 z4m(w9TR1c2^P_RVnTu?je5##wnl1g716`H10-RvIIuV0mO>KQIq4gDje$U8%zkRl3 zB~5U0)1tfir|Vw-r)G4X1U7 z1;7w}n*br40bXtQovIg}Vc=W6A@TAL`6V*MJyoE9iQdZ4W+uu`H%@(gx|#%-J*<*6 zAy1Mi-#P(yh>7Z@2UHH&4P`vf!qp~1Y3ehkMK^_f25YZRt`6dCk^tDkIlIPOAONb7 z6nX=T)V9xc5o&PgJ0Q)$Ad_uKAj_?%BNio@*4p->Koos#LNpb}5I#D(L-tCN;pzMS zr9G4NG_Zf7EudkVS;lp`RKHAoQ@#0KA4Tn(Dp096iHn+xSOox}V%$<+!%oG?vN=WL z9&k`81(t)*^mA73kIcwdHI({J(yQ0hJGEn$3Hq_>`%HjIIo>)+-*}K}@90ecd|v}^ z=d01wN;b|EZQr(rIFP$VO;GHj_b*b-dHuX6Hp!)VSG?#s*%xIu@GwqQ4I8A1OM427 zMrL&v2ebX0m5Io)y>xGF!h&RqcLZ}zV&Oj{*YxWetK;x(M7M`={lUVke8gSUy13ovC^79bM~r8Zg)7G@>TQwJ}z_b(k7(D_N1c$+QlfXc}mB3 z1nAeqo2)N?cKw6kM2XP9$~Lrt)~-ziFKLmi=VvLz& z7?%oJ(n+e$!-Z{$ghRSS%jhau-c1(#*oruM%GZ%C6G0m|| z4si)b$C+QQe3rU3=gv-c<>X<)&oy0*KxDWGXwkKk zbZK;d^1j5A=O9R?h5vBL3k#qQz!n1hX$C4BlTd`}d#goqTZ+jPOaM6<fy?OR$hXBCtsT1&?rFAQPciq7|mwK4VE zEM)yf<`amZ;%);4f4O*@EN{{^oMvqG8MaRer|jkoHOB8%OZ|A~8o}EMA{Oc9VNFkD zW*)^wj5;~X?M}Cfvy`{1Tf03L!ch~lPPcBU%GxA&3PNvY$>V4d{O|RAhkrcKJ$8oIsvxdW zNpM?#4pmmAlngU4!YBG^3>_{wHT5Hg0IyKO_T$%__&xd&5DUG`ZxEvh2cHN?S}H3+ z6EpSF2Z;qrmWSZjSl~xKfV~szVhGDXF=i1rX?EIzz2SLWhkb?Z3T@j(cbQ+?s2;W@ zd@~b}W(*-)B~OeV%==G~Nt>ejDtfCe;GP%uZ9(OUdA+1INisp7*cS zsSr=zTXr)HU@V-hBH|uZ(c}6GQquLP{&=9bnG+%l1*|N`#REra1IHyq*oZ~gA55|B z_}546|K&4^NF-Oa!2N57lUNc==mMA{ZQmoeDu_ITuGQ3q<-^Db?-O-=j9`o#nfye4#O z&Y|-5=)3iRIJYPR>utH^FCKc|`Vnf!C~*d-OinA@0!^1YmS4iw*un!U;O$^{vgw!l+ChC#5sUW6$b6T)3@{27J+% z&5!SAO0FkVlW(L9Y@eI&*v*<0Z;Q(;=*h_>%lFSYfR>JCwKdP5`pkQ2E^~Hd@{Hg` zVVd{VP8gE5qsUo@HJdlv%O-uB9}60-GD}~UIRHq}5PUW>8X?al2{jKe@P1@NaPHeI!G_yr7eeN+_5C z$HxNG!C#^*jgP)ax<+P4l6^Z>JAI4(-#Sb7x|1)XJmRRJdfc`$;U=5+yWm>Ep_4Dk zuoKn!uZ0bF`9PH2ce_%UzkPNtqL*C5`m1$-{V$AJQ*s6Se_PL=rd+BfjmLR>QU%g< zA-HM236!=R*8BJDQds@aKh<}~pTcby)XyzdsFd}T7Z{GTpZI^x-#q>&z6f&K&{n+HHZk_K^FPPNSsUU$7i2E%|1$$ zuDA}YfCNheh#Iw|UwGnVwNo>9F!uCC1?_p{NFSnE?=Lu;&VvL6b@x1Kl<*%En$Y`= zW7^&S#K5Kq9bs4IS&ZWW8{-n*xs*!PKc2rp8f^?Y zWKMupAmxJm!l9=zTl|>liw!sF2x!)Gk&P9vQk2e@R9-*G$b7ADbEMsqN@MnlGq596 z8d4GK0;)jH`jEYun06yG2gi_h&K}TB;Au8i>MZu0e>F5nEoogMO#tA8FQzjzj9>up zPCZ*>-q0?cH`#`*=BHl?yZI#(UBV&p%ismPSk@k*?KF}M3?29HG>=DqP1?Pl+&L3HO)Q`_jRm$iJ5(qv8*n-XwzoiKGosB5QG0O g=0G8q?ciQcF}V^uvpnn}Py+BuMN_##$s+830fp 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 4d8d48fbed312105f5ad03f3c00ca8e5a398f4fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6981 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 + + 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 @@