From 108ecdece0f457d8ef0d752d4ab3c38c74ea0d50 Mon Sep 17 00:00:00 2001 From: Tommaso Berlose Date: Sun, 10 Jan 2021 02:08:15 +0100 Subject: [PATCH] Update transitions --- .../ui/fragments/MainFragment.kt | 6 +-- .../ui/fragments/SettingsFragment.kt | 6 +-- .../ui/fragments/tabs/TypographyFragment.kt | 2 - .../ui/viewmodels/MainViewModel.kt | 16 -------- .../round_content_copy_24.png | Bin 0 -> 285 bytes .../round_content_paste_24.png | Bin 0 -> 351 bytes .../round_switch_left_24.png | Bin 249 -> 249 bytes .../round_content_copy_24.png | Bin 0 -> 221 bytes .../round_content_paste_24.png | Bin 0 -> 253 bytes .../round_content_copy_24.png | Bin 0 -> 344 bytes .../round_content_paste_24.png | Bin 0 -> 434 bytes .../round_content_copy_24.png | Bin 0 -> 459 bytes .../round_content_paste_24.png | Bin 0 -> 602 bytes .../round_content_copy_24.png | Bin 0 -> 574 bytes .../round_content_paste_24.png | Bin 0 -> 765 bytes .../res/drawable/round_content_copy_24.xml | 10 +++++ .../res/drawable/round_content_paste_24.xml | 10 +++++ .../main/res/layout/bottom_sheet_dialog.xml | 2 +- app/src/main/res/layout/bottom_sheet_menu.xml | 1 + .../main/res/layout/bottom_sheet_menu_hor.xml | 37 +++++++++++------- app/src/main/res/layout/fragment_app_main.xml | 2 +- 21 files changed, 52 insertions(+), 40 deletions(-) create mode 100644 app/src/main/res/drawable-night-hdpi/round_content_copy_24.png create mode 100644 app/src/main/res/drawable-night-hdpi/round_content_paste_24.png create mode 100644 app/src/main/res/drawable-night-mdpi/round_content_copy_24.png create mode 100644 app/src/main/res/drawable-night-mdpi/round_content_paste_24.png create mode 100644 app/src/main/res/drawable-night-xhdpi/round_content_copy_24.png create mode 100644 app/src/main/res/drawable-night-xhdpi/round_content_paste_24.png create mode 100644 app/src/main/res/drawable-night-xxhdpi/round_content_copy_24.png create mode 100644 app/src/main/res/drawable-night-xxhdpi/round_content_paste_24.png create mode 100644 app/src/main/res/drawable-night-xxxhdpi/round_content_copy_24.png create mode 100644 app/src/main/res/drawable-night-xxxhdpi/round_content_paste_24.png create mode 100644 app/src/main/res/drawable/round_content_copy_24.xml create mode 100644 app/src/main/res/drawable/round_content_paste_24.xml diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt index 039ba78..6a4865f 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt @@ -63,8 +63,8 @@ class MainFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true) - reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false) + enterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, true) + reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false) } override fun onCreateView( @@ -103,7 +103,7 @@ class MainFragment : Fragment() { binding.actionSettings.setOnClickListener { Navigation.findNavController(it).navigate(R.id.action_appMainFragment_to_appSettingsFragment, null, null, FragmentNavigatorExtras( - binding.actionBack to "action_back" +// binding.fragmentTitle to "fragment_title" )) } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt index a7ffa9b..a6fc9e5 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt @@ -52,9 +52,9 @@ class SettingsFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move) - enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true) -// returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false) +// sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move) + enterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, true) + returnTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false) } override fun onCreateView( diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/TypographyFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/TypographyFragment.kt index 25c347b..a4e23ac 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/TypographyFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/TypographyFragment.kt @@ -6,7 +6,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -29,7 +28,6 @@ import com.tommasoberlose.anotherwidget.ui.activities.tabs.CustomFontActivity import com.tommasoberlose.anotherwidget.ui.activities.MainActivity import com.tommasoberlose.anotherwidget.ui.activities.tabs.CustomDateActivity import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel -import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget import com.tommasoberlose.anotherwidget.utils.isDarkTheme import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt index 1b5792f..42dab9d 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt @@ -96,7 +96,6 @@ class MainViewModel(context: Application) : AndroidViewModel(context) { val showWallpaper = Preferences.asLiveData(Preferences::showWallpaper) val showPreview = Preferences.asLiveData(Preferences::showPreview) val installedIntegrations = Preferences.asLiveData(Preferences::installedIntegrations) - var colorClipboard: ArrayList = ArrayList() // UI val fragmentScrollY = MutableLiveData() @@ -169,19 +168,4 @@ class MainViewModel(context: Application) : AndroidViewModel(context) { addSource(Preferences.asLiveData(Preferences::installedIntegrations)) { value = true } } - - init { - with(context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager) { - if (hasPrimaryClip()) { - (0..primaryClip!!.itemCount).forEach { - try { - val color = primaryClip!!.getItemAt(it).text.toString() - if (color.isColor()) { - colorClipboard.add(color) - } - } catch (ex: Exception) {} - } - } - } - } } diff --git a/app/src/main/res/drawable-night-hdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-hdpi/round_content_copy_24.png new file mode 100644 index 0000000000000000000000000000000000000000..ce479f3e42b5c78ffe2c185b501efbc37cfb5cfb GIT binary patch literal 285 zcmV+&0pk9NP){p4blBAS$v))A(Ijfi81t@s|%3?4`nHjtdBl#K_4DLBk zU5h`@Z#++*dg}C?V_Cmd*bJC5(_})$%tY8Bsjdlfkk!EiwE@_W$9|avHLk!(2DP<4 zJ2_O>_N+e$!lpp#9Z(H*zZpRx7e)UM{h_aiT3To;hgM{LnIabnRC?^>E9aNFJkF0M zD8^p2{5=C?S!5WqV5!NRrr+F8P_Wn4MKK~79O|G@cvPwQq)bi%IVfX>#LZBYh7sx! jmW>xDqe+_3C;h2zB6gJ3KU^}+%P literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-hdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-hdpi/round_content_paste_24.png new file mode 100644 index 0000000000000000000000000000000000000000..5de0c692ec21a250546979e3e27d939f7de186fc GIT binary patch literal 351 zcmV-l0igbgP)9|pihN_3|6lo!0Du3R6R%b6zyJSmFzo$*6l%=t z{|o+~1G8TKKk^1*k{SKzEg7#RNNBGp*LL22v; xY5uPx$(Rt_J{SLQ``?u)==@*vKO@7)001Nzo}Qd^7n}e9002ovPDHLkV1fn|tcw5u literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-hdpi/round_switch_left_24.png b/app/src/main/res/drawable-night-hdpi/round_switch_left_24.png index 35fd797ec7e5ecec070e145089da6ecda2628568..fbbff237155fabdb3101f5d1893223e9dfa85ea8 100644 GIT binary patch delta 206 zcmV;<05Sjh0r>%tGk;-sKmiF00O=4zFan~13Frwel@~%xff$1@$%_P0jKM$WGLpaY zBtMeR=Tj;trw?Jsijh?**)mCGrkv0mtlAxTQl&E*ZB;*!Q-*OuQmSRnti6zg>X;c- z0E$tDQ7Qt3C`!W!AV0<4Fd_)9ZfKVbUEEMXopiN^xxY)bxJTIyi_p7uR0Ik$78M%E zIP*pMzle;nDF-BHTI%?>MsC0(iFqFzu>4tU1sleB<>&MwFNlG8!>jxj&j0`b07*qo IM6N<$f|)&6&j0`b delta 206 zcmV;<05Sjh0r>%tGk@XhfC2~$0O=4zFan~13FrweRTe@_ff$1@$xA^LWAM+pjO4HU zibwLW0K0uI8$@9x(D#0OlN9ptNlbz8O8}|sg}90@j@D^W9F0r zC`K7ZBm#vf3d1NMKgGc?DhO_FXrByS-O!XO>1YiL|CB2Autyt~p?mA72oz>4D)b=Z z%opYVB09#V9FU%Asng#YxdYE6Mnr@GtDnU-Wy?6P{G49o4Tynx!+MR&nE(I)07*qo IM6N<$g56SE(f|Me diff --git a/app/src/main/res/drawable-night-mdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-mdpi/round_content_copy_24.png new file mode 100644 index 0000000000000000000000000000000000000000..6eace2c954d8be2199e74b24c026ed4759a9a0c3 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iC7v#hAr-gYUfIai7$|b!qxC&~ z$$dUzi+jRSrv}Oe>>;(9e?)o zUChT9==#b&i738wkS$`u18&nDh1(syEA8v~Ryd_l?8^ z(NmQLR~^&xUdOSXyO?;)Cc{gUW$_H})e0QK$MktUbuYP3nRey=-C|3PpNHH(vIHc! Vx7Jp5F$3Mp;OXk;vd$@?2>=0dSFZp7 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-mdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-mdpi/round_content_paste_24.png new file mode 100644 index 0000000000000000000000000000000000000000..e78d603a6a0cf9908960dbbd8eb3b21f5e753ded GIT binary patch literal 253 zcmV2OB7SR`VwclHhvk6<^lVDTA<4PFK76_0^}xWqGF^mG&obJh8R6Di$-SEp`1uL~*dnks{y zG;-(>yt#7cBV$KWYL~&Dv>M^T_Y5Npq;3^-B8)3wBf@q)Xc;>H>Y2@mMo{y?fAF`! zVlC)T23y(_+jT50mBE^9?8tl>%viVYpr$*PV&b`L?{OPbjjSH?sZBZtrTc2ZuEc0S|Z}cAzN)I#Gc>^MdsmCR!l)xvh=3;X1UpjNR;$7%+zC2v^5@4NzCF z|72SM7(a{+{^;f~0{`Qb550XY8{l=oWK2V8a3OR&+p$h7vf| qzNAHtR6vx|BF(z6EB;SHEcpT;35qwo- zRlq`25=CP131M6_iR@*PLUGP%_8k86f5RMD#xVX((8>u(Ub!PqfA#GnJnKhM$7oqL*1DF)`g$Ka3(DteT!sJ{5 zW(5GlV7hFn^3vCAr5d2nZ6W+)_DCvqfX5$<255i=Xn+Q2fCl_Qz?1?Y0GRax z7`ETYt4uKNBNvH@$vG!LTgh8rCBsgD0DBeMA5rIglTGYbV1G!5`?3ObGV1I8zcNUz cq2m|EC&;~fE?vY;oB#j-07*qoM6N<$f@2=MQ~&?~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxhdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-xxhdpi/round_content_copy_24.png new file mode 100644 index 0000000000000000000000000000000000000000..3ac8aac3045c8c5207e039fb0f04af81d1c61bb7 GIT binary patch literal 459 zcmV;+0W|)JP)vyifp zowAY@OGPqG>1#7h)6`Y>p6BMo^ZTvu)2G`xojS*HG#ZUnp@Sp~zB@y=Bxaaf%=5^! z3@1eqsce{Y!n`1t0)wWYb!2m73OW@A-I#*%6~i8wBTA>Ib}`9y#f)b;&<8P}Ga7jc z0+ctHavTKc!eGk2f)u16YeCdm1Y(RGvdj~*0z@ylQm5|$$*Jc)2oPK`M2%-o59huvJzYR&RoA*jK0UQi_5GbG zXjAx}`ot6z<4utBMZyr|I4lW*4!kTr7m(vHEAjyI&YHK~;0kga8W?4jE#FNuL6g_* z`2*-zVl!ylHc*bZZJ-PzL}>HTR_}+48z@l$GHJ&6U9|*?3xRTEX^{ZcvMfd#koiXu zG9sKk!cyy~nMHPuIpeasEku-l-|Z7wKN`(n$TtP~p^GOo9)$n^002ovPDHLkV1ggJ B!vO#Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxhdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-xxhdpi/round_content_paste_24.png new file mode 100644 index 0000000000000000000000000000000000000000..aa760a4d51864c9dbf090675618228caec5ff1b4 GIT binary patch literal 602 zcmV-g0;TwJ*?aV%~>_j3`N2!Pq zXN=dB_{}GlNl{l@&LCx+^^s)lIFqPqgPz)OGI-S%ZHLb}!5ZH6Hmu8@Ls=m_oGmm&GK0>EAyf%&i1063&h1Dl@H`O4}Gq#e1p z4i1XhmgQ)+ju-J)6IQ}y`(E=0x@kKe92B!{7N4M$?Rdc_=#DMpkx9^`Pf#)}(0Pw- zy?1?~J`_-8lGEmF)9pww3_8X${%CN1an+S=5@bENC%oj{K3!y)yPU3CZ5kB#2aSLP zBp?9^NI(J-kbndvAOQ(TKmrnwfCLl>lr{`{929ilD5oj-Klyn&jd5aJ_Xmo)-j>~? zk86QD&4?rQhR$bspnRcZwtI9yy@vqm&;cE{?S^oAK=%uHhVc+NLp15{iAGX9G)|cz oLl;s1TeX3>(T+x>q@-$GI~Ta?%8B93HUIzs07*qoM6N<$f()`1=Kufz literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_content_copy_24.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a8ccb81e4bdd883dc2c1646da0380eac880677 GIT binary patch literal 574 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{Kk5;uunK>+LN=k12%`$3NE3 zR7nw3@l@nH)Y-x&rr2S{VaahYGtha)0zbjFCjza%9^JZkMU88h*{&TT9xfbK9A;B5 z1@W5SNV@-`;Kc47OTJhByTiTz{${!Jw(|F?=SR;I5OEC@QFXQOUYr@bMD5y(>yb~i zzgZ?UFQ4;K_MeLWkIrJ-f1QO36P7<_&IZBj3mIJ!1BmF3Y`crW7~fQl`X0K26ZeK=Gq=;foTEj zLm@;Ne$O#t^*PGsFkkaQY0UvK-n7T|238fTI3%=o-}rS%rjjlAnuK=h+;SU+TEYBh z*K8ShRnrsaRX%0lXuO)yz$ot!z9fCaxBs^nC@HWkQ||dc^K@RrBXzEIkM}RtJZtw) zU4cbv=0o1yHRfycb2j_fy_G*@$Pg;axQge(?9u~o*D%j3R=nNNa(v4Txyov0H*bdh zuO<6?vgXWo?_cqT@#lVqoa{}1q|OUnc*y7R;ycR~qo;flU;hd|ol(qo=VRSOYkq$H zy{oR)i^nD%d1-m(l5qCIYnQ#$ulu~_dfv21qbrE_Cu>#LSsC#!GnW9<1%s!npUXO@ GgeCw2B=3d* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_content_paste_24.png new file mode 100644 index 0000000000000000000000000000000000000000..df9248df98d8ea1f60f748269ec3c7333ea3bfc5 GIT binary patch literal 765 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z;wjZ#WAGf*4x|h8NG!v$3GrV zo4ZxH(?wBSUGq|*qU1Dt;UvXbVL4kTnki;0{_jhcU3pilD$ix2ka&!2ao&}8Q>4na zMyWVSCmC(6+-;fp{O9M}H$VTG_uTUG_usp%&u@SK{_`!%=a$c}OpG ztb_8=D|>@_eya`Kh0@9!MHS`#1kG3U$0rxw<}+MKcy1M49p5{rzW0A>xAh)l^pxg!ZRg&^f3No(ny~5n_M-V_?;EP*8Gam1 z-gTm2w!d)6D#qt~nE7tCnNC*l>ya>&6ZyK(G|c6EL0yt6_l-pL7tAIGxp%JqezEFd zQ*1aZyT%TA7FGkETTP5xqSw7*{DW0v{0t@021KJ)(x zV61eRWc5mY5az4sSA+}y6RT#0jjlJ(`UcV;K6+;k33 p*zW&2YuUW5XN;DB!N32%xI_7jel5>U`VCCh44$rjF6*2UngFZ{UUmQg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/round_content_copy_24.xml b/app/src/main/res/drawable/round_content_copy_24.xml new file mode 100644 index 0000000..fbc19ab --- /dev/null +++ b/app/src/main/res/drawable/round_content_copy_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/round_content_paste_24.xml b/app/src/main/res/drawable/round_content_paste_24.xml new file mode 100644 index 0000000..e95fdde --- /dev/null +++ b/app/src/main/res/drawable/round_content_paste_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/bottom_sheet_dialog.xml b/app/src/main/res/layout/bottom_sheet_dialog.xml index 7180ec6..a770b91 100644 --- a/app/src/main/res/layout/bottom_sheet_dialog.xml +++ b/app/src/main/res/layout/bottom_sheet_dialog.xml @@ -38,7 +38,7 @@ android:id="@+id/message" android:gravity="start" android:textAlignment="viewStart" - android:text="Messaggio molto lungo di cui voirre akjcbasaskdask flasdas fashbdfjah fahsbd ajsbd " + android:text="" android:textColor="@color/colorPrimaryText"/> - + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="center_vertical"> + +