From 7519400579e579a172c91a06d26edbc839fcd425 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 16 Jan 2020 11:37:52 +1100 Subject: [PATCH] WIP --- AndroidManifest.xml | 1 + res/drawable-anydpi-v24/ic_notification.xml | 20 +++++++++++------- res/drawable-hdpi/ic_notification.png | Bin 238 -> 675 bytes res/drawable-mdpi/ic_notification.png | Bin 199 -> 458 bytes res/drawable-xhdpi/ic_notification.png | Bin 284 -> 931 bytes res/drawable-xxhdpi/ic_notification.png | Bin 376 -> 1369 bytes res/layout/conversation_activity.xml | 3 ++- res/layout/conversation_item_update.xml | 15 +++++++------ res/layout/conversation_search_nav.xml | 14 +++++------- res/layout/expiration_timer_menu.xml | 2 ++ res/values/strings.xml | 4 ++-- res/values/styles.xml | 4 ++++ res/values/themes.xml | 14 ++++++++++-- .../conversation/ConversationActivity.java | 2 +- .../conversation/ConversationFragment.java | 11 +++++++++- .../conversation/ConversationUpdateItem.java | 7 +++--- 16 files changed, 63 insertions(+), 34 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6703c2e050..087d944da2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -289,6 +289,7 @@ android:name="org.thoughtcrime.securesms.conversation.ConversationActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:launchMode="singleTask" + android:theme="@style/Session.DarkTheme.NoActionBar" android:parentActivityName="org.thoughtcrime.securesms.ConversationListActivity" android:windowSoftInputMode="stateUnchanged"> - - - - + + + + diff --git a/res/drawable-hdpi/ic_notification.png b/res/drawable-hdpi/ic_notification.png index 533399d1263bcc070b49b3e3d03f201378b59c12..6ef38a0b8ab3dc845d343ff3e424620261a25727 100644 GIT binary patch delta 652 zcmV;70(1TD0iy+wBYy&FNklk%r#`iZ@67Xk z-<@Zkc_$Y8YaxV4fMHMqv%h2tbX04k0W5$QVL!G(a}YCK;D1t?zya%E?iX)o6&!(2 z&Up*kOw6Rf4F}zUqU9yf3$8f-8L0IeutV`RNQbm8JHa#ajOv70iatP3$i*_xT)R5a zGDT|lC25cRU>HIRm3J2ZGCpT=q zKZR@)2OhS-IH(Wu`s zjmUTdOQ2C_NU5Z0&)V7p-8PJMb22v`nJiw(kTSNB4}bBd^ho)TbvBF*@bwGjG*HwT zQpUFPZ+Am3hZY;AYPe9H3JW>mGk%bT;+hIvZR0FeZ}}cqDD{NlChD46F*VcYc?%}- z#7Sbbq2liY6jFF*-U?Il>d;h+F#NPfh1 zhGZtKoCbDGPJd_09@J~uOp%}Gf}iUtlR<5~2oSs&IO0V?wU-QYyr@ujetD76734{p md1YcdUUyq~|dOrXF N002ovPDHLkV1f&qQ_%nb diff --git a/res/drawable-mdpi/ic_notification.png b/res/drawable-mdpi/ic_notification.png index e8598325dd114d5d9a5add2126d8fdc85c30b387..276e9268f212c74c98d958ffc0d6b6bb911bcc56 100644 GIT binary patch delta 433 zcmV;i0Z#tM0m=iABYy#rNkl3-r5QPO5dj%`S!ouGmg1wyM$ab6VknEnSDWa~Y)lDz)%%~B+S%P z8_;=GC4(s2oz3=FKd@ak*(zSQY_}!dD&j1~g<->A^FtwX b@~@OX^al(w%xRuY00000NkvXXu0mjfaqPuW delta 172 zcmV;d08{_U1IGc7BYyynNklEpZ|w|PFflc0$+hxg_edp zjv9{5a3>`BLb4;8NW=e=otl7}YW|~wqd?3Km16?pZD{gjS<;1O$TlQP*heivx1@8R zEMY>jfgoHN5kZY& zA$qY$m*Uc-6HH|xSZSFq_WfUf!+!C+0ZLT|gQz2iSGOvmbzIz!N|s2!G*8z;i&(iQYZ|8vKYa z11!2sd<^&im;q!1!W+OU?Etr5fRu^&Qov_zG7O(qKz@j!nh$6Pe9=DG122;#NUX9G zz~hL|TrpstX;|_??$frgF{Xk}YS~nzvH)-%sOT^c*h**#ic4+W{B@T=*2Qm`E zx-B6D>(>K*lb$m`wS<&q9=F6Oz6tP+X&IFghZt!xV$qd=N4PHFoay)oD3VT64){yN zQ@}k#G4}!A1IS3<11h{OKEWng+rxP!?6}yNJ&X&)6$3AI8Lq z0l*)ZgVpTC0s3Ddm8VDAe20K%SiXkkL>b~n13><18htUeS|A*PW)JPVL6ec?LO2NJ)-a^lsdrXY^Jc}hG9Dp=5CbG0X%g% z=v`hMU~_i39P~`sH&r!Vi5J?!Ij;_|4>P5mweBFwx?Xx@X0LgK_HKB%(gte|Gd@15 zRVKm<=s7>}nHCHhtev1VM%jed2`XF;mWky|Z+{d_B-t6m+pb(nETR-v**S#|rn;38 zr`VHB$B>jX%1BsLG{sohv@k7M>8)}`1T5$3E%;eqJ#_05LWX%fVo70tKzep0gBO?s zwU#)bYLiXL;0@I&u|zx%p=AkSiw5so;y@3Jh;a#FjRs%(F6)AEV1+r5k`Trip+9Ev zoqtTrwy40zCW1yPj!AqYHCL4Nc_A+`;(XLjU^`38zvevsw1W*bYOL{6uRVh1UaQud zbEwf+YBFI;+d|cZUZs|3Q0>(jYS|vUB!Y{2sp{2<25L4(Z8<7WlR<24g4+JmE=}kl kZI{C5sV$wMTa(y76d_yJpkME000000Ne4wvM6N<$g5I&82mk;8 delta 257 zcmV+c0sj7@2b=+BzWEazhC18rk)G!tWFbX=( zB1kUcoQ1&Q!~fDXj!u5B%6C;UKNu0IbsRGMK_2nQ@B$@~fX9$9;Gfwd!=H2-!V{kG zg#T~&JwW7i=7GELOr)0bUyV*-yYlx5a4%{5JHq5kQh^VS<2LHiLc#+y^uOP6GRfAkWLTV8}NRyp5%&BX};UN8}TwW?e3qsHPK1-xQn%2_9*B@AJuX2RqHdH|b@ zFCPGhoen?~@)4KUhfWLwoL~sgaIY+KSi-&nid9VdIw9TxoODT`vqB$_>Q<-K)fe1qi(GYX@K|4!0mAoXaPe7D@1TD zY5|;8Uf!{A;0)fP)P__%Zu=By8_Q2wUfVL8Ep`PFl9V~*&SZE+&gPwsQ0v$akm@Co zIxIxm!RI_rp+Mqi$@r+O*$5??C7QgJY_h6W{(r!OSxALIrr(Qd=?%b^jZos;Q{xqp z$^ma|CMyEMOM6|Pq6uXBy8>KS|Dmery%Byr?rNiz}R;NlJ)8Cf@p4yBnnk(*j zq5>l(0k|8b<3l)8s!AZ!|J6k~fp6eNO!0zHrvQ(lG%-cEt`Av(@PC8&IIq}@EtZ3F zuYashH5RFbUE9J1H(iB5B;V768wF=#V>#!g-L46@V8fcWgTbJ(qlg#dRT?KJ5Cb|uaUEwt*%7+vr-MeJ70(ecr#Bz$Y6i9H#TF+wsP@QHyhSBP)VWJqWO zRhy3l8X&$+%8)Giu>}u(qe1ha3X&$Dh?B!qMe1aT9w>cn$U6dcGXd)X8KPlAH17j( zvY9f~v@BUI6O^9NT%akY1-L?%EPokaHZ$8}jm7C?V#*n(q)rT0%sB;LRsU>}&jf zyFKJAzD-~%i1E85BU5mIksVH?E67x)Y2Q_^7MHGPd_M0@tEs?pz5|}`!~UnwiDmb* z@=$(YGwE)-(t%EK&$3U%A6eMfwE1zopr01V}mDF6Tf diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml index 42c80f875f..84051f7b96 100644 --- a/res/layout/conversation_activity.xml +++ b/res/layout/conversation_activity.xml @@ -15,7 +15,8 @@ app:contentInsetLeft="24dp" app:contentInsetRight="20dp" android:background="@color/action_bar_background" - android:theme="@style/Session.DarkActionBar"> + android:theme="@style/Session.DarkActionBar" + app:popupTheme="@style/Session.DarkActionBar"> @@ -56,7 +56,8 @@ android:autoLink="all" android:gravity="center" android:linksClickable="true" - android:textColor="?attr/conversation_item_update_text_color" + android:textSize="@dimen/small_font_size" + android:textColor="@color/text" tools:text="Gwen Stacy set the disappearing message timer to 1 hour" /> diff --git a/res/layout/conversation_search_nav.xml b/res/layout/conversation_search_nav.xml index 0a5cab6192..5ce5b5b575 100644 --- a/res/layout/conversation_search_nav.xml +++ b/res/layout/conversation_search_nav.xml @@ -54,20 +54,16 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/res/layout/expiration_timer_menu.xml b/res/layout/expiration_timer_menu.xml index f95b562bfb..4e146fea64 100644 --- a/res/layout/expiration_timer_menu.xml +++ b/res/layout/expiration_timer_menu.xml @@ -13,6 +13,7 @@ android:layout_height="20dp" android:layout_gravity="center" android:src="@drawable/ic_timer" + android:background="@color/transparent" android:scaleType="fitCenter"/> \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 45648aa914..84ad12fff5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -496,8 +496,8 @@ %s is on Loki Messenger! You disabled disappearing messages. %1$s disabled disappearing messages. - You set the disappearing message timer to %1$s. - %1$s set the disappearing message timer to %2$s. + You set the disappearing message timer to %1$s + %1$s set the disappearing message timer to %2$s Your safety number with %s has changed. You marked your safety number with %s verified You marked your safety number with %s verified from another device diff --git a/res/values/styles.xml b/res/values/styles.xml index 6695193cde..d490519ad8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -40,6 +40,10 @@ normal + + @@ -160,13 +166,15 @@