From 9842ba3ea968e7b48d86de661873c38a7574c9f3 Mon Sep 17 00:00:00 2001 From: Tommaso Berlose Date: Thu, 6 May 2021 17:29:29 +0200 Subject: [PATCH] Bugfixes --- app/build.gradle | 2 +- .../ui/fragments/MainFragment.kt | 30 ++++++++---------- .../ui/widgets/LeftAlignedWidget.kt | 18 ++++++----- .../ui/widgets/StandardWidget.kt | 19 ++++++----- .../round_more_time_white_18.png | Bin 0 -> 428 bytes .../round_more_time_white_20.png | Bin 0 -> 448 bytes .../round_more_time_white_24.png | Bin 0 -> 436 bytes .../round_more_time_white_36.png | Bin 0 -> 779 bytes .../round_more_time_white_48.png | Bin 0 -> 867 bytes .../round_more_time_white_18.png | Bin 0 -> 261 bytes .../round_more_time_white_20.png | Bin 0 -> 213 bytes .../round_more_time_white_24.png | Bin 0 -> 288 bytes .../round_more_time_white_36.png | Bin 0 -> 436 bytes .../round_more_time_white_48.png | Bin 0 -> 564 bytes .../round_more_time_24.png | Bin 0 -> 445 bytes .../round_more_time_24.png | Bin 0 -> 295 bytes .../round_more_time_24.png | Bin 0 -> 566 bytes .../round_more_time_24.png | Bin 0 -> 871 bytes .../round_more_time_24.png | Bin 0 -> 1133 bytes .../round_more_time_white_18.png | Bin 0 -> 436 bytes .../round_more_time_white_20.png | Bin 0 -> 371 bytes .../round_more_time_white_24.png | Bin 0 -> 564 bytes .../round_more_time_white_36.png | Bin 0 -> 867 bytes .../round_more_time_white_48.png | Bin 0 -> 1114 bytes .../round_more_time_white_18.png | Bin 0 -> 779 bytes .../round_more_time_white_20.png | Bin 0 -> 590 bytes .../round_more_time_white_24.png | Bin 0 -> 867 bytes .../round_more_time_white_36.png | Bin 0 -> 1293 bytes .../round_more_time_white_48.png | Bin 0 -> 1759 bytes .../round_more_time_white_18.png | Bin 0 -> 867 bytes .../round_more_time_white_20.png | Bin 0 -> 791 bytes .../round_more_time_white_24.png | Bin 0 -> 1114 bytes .../round_more_time_white_36.png | Bin 0 -> 1759 bytes .../round_more_time_white_48.png | Bin 0 -> 2370 bytes .../main/res/drawable/round_more_time_20.xml | 16 ++++++++++ .../main/res/drawable/round_more_time_24.xml | 16 ++++++++++ .../main/res/layout/fragment_tab_clock.xml | 2 +- .../res/layout/left_aligned_widget_sans.xml | 7 +++- app/src/main/res/layout/the_widget_sans.xml | 7 +++- 39 files changed, 81 insertions(+), 36 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/round_more_time_white_18.png create mode 100644 app/src/main/res/drawable-hdpi/round_more_time_white_20.png create mode 100644 app/src/main/res/drawable-hdpi/round_more_time_white_24.png create mode 100644 app/src/main/res/drawable-hdpi/round_more_time_white_36.png create mode 100644 app/src/main/res/drawable-hdpi/round_more_time_white_48.png create mode 100644 app/src/main/res/drawable-mdpi/round_more_time_white_18.png create mode 100644 app/src/main/res/drawable-mdpi/round_more_time_white_20.png create mode 100644 app/src/main/res/drawable-mdpi/round_more_time_white_24.png create mode 100644 app/src/main/res/drawable-mdpi/round_more_time_white_36.png create mode 100644 app/src/main/res/drawable-mdpi/round_more_time_white_48.png create mode 100644 app/src/main/res/drawable-night-hdpi/round_more_time_24.png create mode 100644 app/src/main/res/drawable-night-mdpi/round_more_time_24.png create mode 100644 app/src/main/res/drawable-night-xhdpi/round_more_time_24.png create mode 100644 app/src/main/res/drawable-night-xxhdpi/round_more_time_24.png create mode 100644 app/src/main/res/drawable-night-xxxhdpi/round_more_time_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_more_time_white_18.png create mode 100644 app/src/main/res/drawable-xhdpi/round_more_time_white_20.png create mode 100644 app/src/main/res/drawable-xhdpi/round_more_time_white_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_more_time_white_36.png create mode 100644 app/src/main/res/drawable-xhdpi/round_more_time_white_48.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_more_time_white_18.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_more_time_white_20.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_more_time_white_24.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_more_time_white_36.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_more_time_white_48.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_more_time_white_18.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_more_time_white_20.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_more_time_white_24.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_more_time_white_36.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_more_time_white_48.png create mode 100644 app/src/main/res/drawable/round_more_time_20.xml create mode 100644 app/src/main/res/drawable/round_more_time_24.xml diff --git a/app/build.gradle b/app/build.gradle index c0e9253..39d1ac7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { applicationId "com.tommasoberlose.anotherwidget" minSdkVersion 23 targetSdkVersion 30 - versionCode 132 + versionCode 134 versionName "2.3.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 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 67f4243..234df57 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 @@ -16,6 +16,7 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.RelativeLayout import androidx.core.content.ContextCompat +import androidx.core.view.children import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -183,8 +184,6 @@ class MainFragment : Fragment() { private var uiJob: Job? = null private fun updateUI() { - uiJob?.cancel() - if (Preferences.showPreview) { lifecycleScope.launch(Dispatchers.IO) { val bgColor: Int = ContextCompat.getColor( @@ -207,24 +206,19 @@ class MainFragment : Fragment() { } WidgetHelper.runWithCustomTypeface(requireContext()) { typeface -> + uiJob?.cancel() uiJob = lifecycleScope.launch(Dispatchers.IO) { val generatedView = MainWidget.getWidgetView(requireContext(), typeface).root withContext(Dispatchers.Main) { - generatedView.measure(0, 0) - binding.preview.measure(0, 0) - } - val bitmap = BitmapHelper.getBitmapFromView( - generatedView, - if (binding.preview.width > 0) binding.preview.width else generatedView.measuredWidth, - generatedView.measuredHeight - ) - - withContext(Dispatchers.Main) { - binding.widgetDetail.bitmapContainer.apply { - setImageBitmap(bitmap) + binding.widgetDetail.content.removeAllViews() + val container = LinearLayout(requireContext()).apply { + layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) } + container.gravity = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) Gravity.CENTER else Gravity.NO_GRAVITY + container.addView(generatedView) + binding.widgetDetail.content.addView(container) binding.widgetLoader.animate().scaleX(0f).scaleY(0f).alpha(0f) .setDuration(200L).start() @@ -310,7 +304,7 @@ class MainFragment : Fragment() { if (showClock) 0f else 1f, if (showClock) 1f else 0f ).apply { - duration = 300L + duration = 500L addUpdateListener { val animatedValue = animatedValue as Float binding.widgetDetail.timeContainer.layoutParams = @@ -318,6 +312,10 @@ class MainFragment : Fragment() { height = (initialHeight * animatedValue).toInt() } binding.widgetDetail.time.alpha = animatedValue + binding.widgetDetail.timeAmPm.alpha = animatedValue + binding.widgetDetail.altTimezoneTime.alpha = animatedValue + binding.widgetDetail.altTimezoneTimeAmPm.alpha = animatedValue + binding.widgetDetail.altTimezoneLabel.alpha = animatedValue } }.start() } @@ -334,7 +332,7 @@ class MainFragment : Fragment() { requireContext() ) else 0) ).apply { - duration = 300L + duration = 500L addUpdateListener { val animatedValue = animatedValue as Int val layoutParams = binding.preview.layoutParams diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt index 6d89ea0..7ecf1e3 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt @@ -88,6 +88,10 @@ class LeftAlignedWidget(val context: Context) { private fun updateGridView(bindingView: LeftAlignedWidgetBinding, views: RemoteViews, widgetID: Int): RemoteViews { val eventRepository = EventRepository(context) + val nextEvent = eventRepository.getNextEvent() + val eventsCount = eventRepository.getEventsCount() + eventRepository.close() + try { // Weather if (Preferences.showWeather && Preferences.weatherIcon != "") { @@ -131,7 +135,6 @@ class LeftAlignedWidget(val context: Context) { views.setOnClickPendingIntent(R.id.date_rect, calPIntent) views.setViewVisibility(R.id.first_line_rect, View.VISIBLE) - val nextEvent = eventRepository.getNextEvent() val nextAlarm = AlarmHelper.getNextAlarm(context) // Spacing @@ -149,7 +152,7 @@ class LeftAlignedWidget(val context: Context) { ) if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) { - if (Preferences.showNextEvent && eventRepository.getEventsCount() > 1) { + if (Preferences.showNextEvent && eventsCount > 1) { // Action next event views.setImageViewBitmap( @@ -381,8 +384,6 @@ class LeftAlignedWidget(val context: Context) { } catch (ex: Exception) { ex.printStackTrace() CrashlyticsReceiver.sendCrash(context, ex) - } finally { - eventRepository.close() } return views @@ -392,6 +393,10 @@ class LeftAlignedWidget(val context: Context) { // Generates the widget bitmap from the view fun generateWidgetView(typeface: Typeface? = null): LeftAlignedWidgetBinding { val eventRepository = EventRepository(context) + val nextEvent = eventRepository.getNextEvent() + val eventsCount = eventRepository.getEventsCount() + eventRepository.close() + val bindingView = LeftAlignedWidgetBinding.inflate(LayoutInflater.from(context)) bindingView.loader.isVisible = false @@ -440,13 +445,12 @@ class LeftAlignedWidget(val context: Context) { bindingView.date.text = DateHelper.getDateText(context, now) - val nextEvent = eventRepository.getNextEvent() val nextAlarm = AlarmHelper.getNextAlarm(context) if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) { // Multiple counter bindingView.actionNext.isVisible = - Preferences.showNextEvent && eventRepository.getEventsCount() > 1 + Preferences.showNextEvent && eventsCount > 1 bindingView.nextEvent.text = nextEvent.title @@ -883,8 +887,6 @@ class LeftAlignedWidget(val context: Context) { } } - eventRepository.close() - return bindingView } } \ No newline at end of file diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt index f4b2b79..19fa1f8 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt @@ -89,6 +89,10 @@ class StandardWidget(val context: Context) { private fun updateGridView(bindingView: TheWidgetBinding, views: RemoteViews, widgetID: Int): RemoteViews { val eventRepository = EventRepository(context) + val nextEvent = eventRepository.getNextEvent() + val eventsCount = eventRepository.getEventsCount() + eventRepository.close() + try { // Weather if (Preferences.showWeather && Preferences.weatherIcon != "") { @@ -138,7 +142,6 @@ class StandardWidget(val context: Context) { BitmapHelper.getBitmapFromView(bindingView.subLine, draw = false) ) - val nextEvent = eventRepository.getNextEvent() val nextAlarm = AlarmHelper.getNextAlarm(context) // Spacing @@ -156,7 +159,7 @@ class StandardWidget(val context: Context) { ) if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) { - if (Preferences.showNextEvent && eventRepository.getEventsCount() > 1) { + if (Preferences.showNextEvent && eventsCount > 1) { // Action next event views.setImageViewBitmap( @@ -402,8 +405,6 @@ class StandardWidget(val context: Context) { } catch (ex: Exception) { ex.printStackTrace() CrashlyticsReceiver.sendCrash(context, ex) - } finally { - eventRepository.close() } return views @@ -413,6 +414,10 @@ class StandardWidget(val context: Context) { // Generates the widget bitmap from the view fun generateWidgetView(typeface: Typeface? = null): TheWidgetBinding { val eventRepository = EventRepository(context) + val nextEvent = eventRepository.getNextEvent() + val eventsCount = eventRepository.getEventsCount() + eventRepository.close() + val bindingView = TheWidgetBinding.inflate(LayoutInflater.from(context)) bindingView.loader.isVisible = false @@ -462,15 +467,14 @@ class StandardWidget(val context: Context) { bindingView.date.text = DateHelper.getDateText(context, now) - val nextEvent = eventRepository.getNextEvent() val nextAlarm = AlarmHelper.getNextAlarm(context) if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) { // Multiple counter bindingView.actionNext.isVisible = - Preferences.showNextEvent && eventRepository.getEventsCount() > 1 + Preferences.showNextEvent && eventsCount > 1 bindingView.actionPrevious.isVisible = - Preferences.showNextEvent && eventRepository.getEventsCount() > 1 + Preferences.showNextEvent && eventsCount > 1 bindingView.nextEvent.text = nextEvent.title @@ -923,7 +927,6 @@ class StandardWidget(val context: Context) { } } - eventRepository.close() return bindingView } diff --git a/app/src/main/res/drawable-hdpi/round_more_time_white_18.png b/app/src/main/res/drawable-hdpi/round_more_time_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..c03205efedbfae7111609d84e42cdc2c1bde498f GIT binary patch literal 428 zcmV;d0aN~oP)2dqSK)$4}c?Xc+GL262Jkd%7MWw}fo7Aa3VIPCZq zjnjKoYVT>yX8G7_ynCMgXu0`(@_#bom81Dr-r;t3X1`0WyQA({dK746dxp(e@mDiz zoK#mgkC*D|4y8=Lr`9c+SD4pK3|Uq+mkkEZ>Y8&=Ex*~5*lSu_+Y&n3+QzfN6jqI8 z2MRP&<+85P{9)4DR4C9$nLeK}ogRfwDl~B|Wlrfjo*soxD)c*%Didg>M4^-2c#dZ& zQRt+?4Gm{f<_+$pM4^)kA26OWFYq`ep5e74>G26SQ|1ARl&HCD*^-7@))=&i3n?># z6$ew{m;xW|OI*Z?p_Cc0fcx3PRgV&V<}j1ZjN!Yp*_K=QX*ipyY2ll5*}|w*Jk53- z_7%$}9Y~MkrghEg&-NVF()Gi8Pc$^OteY~Jov9hKpz4b&*_{FBJv61zG~smq1HS;i W%YxC-|4Ib_0000e3egE^$z2|%9h45d5J+7G;7OvpSu<$(mSu$?U zYjxj!_SUJ~uu;!#>y60}?D9w=Q3r{{OQjgSpwUI%S#ZZaFPsg*8R=N=M`yIrQZ*VC z9rR`;->`1#uP@Aq57^w9qVqmFkq@qb*+^KtJtR?lx{ky1Qt`a2Xux%bnB2vco;O1=M4B5==+gF|W`x|Fb7GtfVcn zfyIp5xZ)F5yTwv7>4=_T%aIIxpZgw$5P~YU9ZgG)Ya!{iNu-$4#!~jfC!m^*oA4El z_I?^A0hv%oP=e=Va< q)Ku)wzhXy}l-+dIWyOE-_wxh2sn@1q#5B+V0000l3V64Z)C5l9F@md%Pb zh<*^g-Lz#&?@$!sCudH+bIzQ9A$)3BYW}Ic2dIP2dw@U@!;&2h7w+)aZ@X^*S#+Xf zSXl@mm{FCVl@y6j`&B|4nm{@63&I8mOKJHRO#hekK&81#Peud3htDMQryn6%An{rQ{pnV0zFc zs7w#K2g}7k%HVO_Sl~-R&>VP5@#q29FLJpI?oEl{>VgXf|jN6Mib|e zQjY14E`y{AX)_Osqe+btpV=$c9OjvVn%N><7vCa%wd@sd;MiV+juVTiD|v9!-nr1Q eGkGO^P(1_ViHSU+>xKCM0000 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_more_time_white_36.png b/app/src/main/res/drawable-hdpi/round_more_time_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..b215ca3d1097466f70e58f8f2f35bbba0622e26a GIT binary patch literal 779 zcmV+m1N8ifP)j;_jlj@IOp8S%gb5L z@~EblGh2hIA_~CJR=|4sW3jD(`4o(Q0mcqI4DpP2M1dcKm}8h4$6+)x&I;+Q*-;ox z%#hgxMm-M+s9#9>lP!~6r%(@aF-!u?VYv8&nO)PN+$^kfSYV0~{0uU}OI8GS5ObTz zjA|sDBAug;+BKSO6g%)`G!Qe$=FLOThWCtemPDSQ-(+j;oJI-=2 zb-lZpCCphzV3etd4bYvY|0)1)oPqfTHKrLTi9!x! zYM#h}udoBNa%A)QoQxMHo9_T@zbxXd&4-;5*on=DT^3lq9T=l(l#e>m4T0^l1-q+8 z`KlA$6j-q>*qvm!(}{WnR&5$NC)k%!Gomz69jsGeM>A^nN}7!0OTPlVP>T0DSfju? zG^$#rME3zt8pT`H`&@!rxnk() z6PU+pf@!sIFAvG&5>!d+oN8NPr{3Kyuvg?;z!l;p21F=PEvIFKadY=+5w}~6JA3G) zPT=$U(md7mq=*+Yr5TNPzj)7BbC?u|AltJ-wMns_pvjs`9p44_)H;q9gWs_A8Fm?} z;h?p}q?=X4i@=r5g4{RY7U|HROez^O=)<_P+voxwr928=)0+O8Q^5dngL0W8*(cJ1 zl&=Gb@PG>(qlO~NIKXjkGrLB!M8ificb8$ytyq9^JB31>;UefQiZ|QWPWo#;Z32qm zr_8y3Hr)6L@@pL?%wx`HE+Xt8OF7I%dhp@n5}ss4%-R2KzX4TfdcS)T8V>*f002ov JPDHLkV1lFTZ|VR5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_more_time_white_48.png b/app/src/main/res/drawable-hdpi/round_more_time_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..a66b5af3c523229955e35670de01453313ee855c GIT binary patch literal 867 zcmV-p1DyPcP)DLJI{wNy83M|@?SnVOO$ibC0?GhQST64D5)j9T+koB@5LbyC z9e!2<;stRxmwNnBe60_qaC zvC0A65fVY0xJ^~6VjKO_M%;#u1fRXLxMfvpq(2h(15OP?fP=;TSfy@$KYXvY53p|- z1e`8zT;mQDBhZZpu>~MSwZqNgUTFNOMg$JWBuG*1Fk0MI)tIbCU=+^9GWDz7KA{fu zVuQG2GAwtbg`M##c8FVnLqZKWTikLqWm+&x4=3O&arcKBFh$%OAtJ+)YdUDfwOHq$ zE)NknS#5nGBEzD6de{qZVkVwOYrG9JRov`I^~$jAlM&8S+m#_A!^UAAH~_1~Ek;-P zUB0d7OwfzZ)plWsXu!h@>7fmusBK2P?HK{bU(k!uYTJOrL&UH@K!yGBnflHTIpjQo zhfz2WtJU{>$R*byPMnOXpuTs|91>{wW5DRa*_f(--bQ=KFX2J*-(hzgg41ymMq`8i zdp>2!Nq-d~pY^F571Y zy-I>%7y!^m5SQW`nye+N#Vcs3Oxl~A1R)4r!oI53i+ao`s_D5^vlMfN zS}|o?GZIJ6BTw0DBpP~=C@4mr1A|C3^dix57J2sEN8-?fa!k3@i9DHirARbAIgT*0 z6N~h9V@9T`ZmbZCWG1eZBGK}!65q-6eYi95W@saRW7)o%)%Y`?-^6>#_zO}M00000 LNkvXXu0mjf1pILW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_more_time_white_20.png b/app/src/main/res/drawable-mdpi/round_more_time_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..74d329e889d1949d078b4be971901bdf6a43c97a GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc0wmQNuC@WGIi4<#AsXkePBi3eHV|Oh&M7)2 zv!eGWFKZ2h>my@NIfj0Nxw}Q`*uq|U3NAP7yR8vD*RQ&Id-bLH%=7cZdm@ zUNG4pht+se%R{Y=22T$8JxV+jIF)(5;Tnru`RDBQc_NOjxt0Hc$xEd^Hh*Q)37|U} NJYD@<);T3K0RWvlP~-pr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_more_time_white_24.png b/app/src/main/res/drawable-mdpi/round_more_time_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..cc152e2647aa934c0439abee973a37a63eb9d7e3 GIT binary patch literal 288 zcmV+*0pI?KP)U4dGwF%7jaZmn0~#{8UGkT&oevj$)PG^Bnmpgbi)GU4j92X~LUFSBENMlOE~TtDVYO2qDNZ zPnr(FxqI(kT!f&+D7n`C>$L|1(Go@SaGlN+bzks$q9K}KE$dV2hA+yMR%i^5UE@o< mLEWp~^MSS&#^0>|2|fV38!7Pi<_!M;0000l3V64Z)C5l9F@md%Pb zh<*^g-Lz#&?@$!sCudH+bIzQ9A$)3BYW}Ic2dIP2dw@U@!;&2h7w+)aZ@X^*S#+Xf zSXl@mm{FCVl@y6j`&B|4nm{@63&I8mOKJHRO#hekK&81#Peud3htDMQryn6%An{rQ{pnV0zFc zs7w#K2g}7k%HVO_Sl~-R&>VP5@#q29FLJpI?oEl{>VgXf|jN6Mib|e zQjY14E`y{AX)_Osqe+btpV=$c9OjvVn%N><7vCa%wd@sd;MiV+juVTiD|v9!-nr1Q eGkGO^P(1_ViHSU+>xKCM0000 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_more_time_white_48.png b/app/src/main/res/drawable-mdpi/round_more_time_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..374dda4e42825b8eeb457f59e6d36544f8d839f4 GIT binary patch literal 564 zcmV-40?Yl0P)_J84&V?O{@0VvE1pdkS1c>!DtK*9uo zb@6`I19ZeBWCXA*-f!jr0{~s?BP8A(^Aufu?vO*4CTJ7leQjRk6!&6r$Ih5GExLv= zO)ZNRj_8Tii9J~qWW8#9(8Ow!v#)YeAfVPSWHoQxDu#OQ9xoDZSJq-efj&{=W;Ze` z9W$UuO8(cxvpH=Fa%k5RcoUajN#4aXXIaJIdwI75u>I`3%8E+^e{Sxh?C)fbDO@&n%BEw%J6HGvg_oy zAK#UwZH30000n04b@XXyFkOlQ89ibG%=G=nybv zmRl$4q)DWoQ%Uy`O$pOyvH@9xB4mj+Ax(y>Ph)%>Y+CGd#DN)Ti5cUHPSu7zLgH$tW(=zuMV{F<4!+Km!jw6`hV{f-WVt34PF3D(X~Kh& n5EsDOnVU8tCd6CT^`Db3P`NTB2SHwb00000NkvXXu0mjfaE-@* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-mdpi/round_more_time_24.png b/app/src/main/res/drawable-night-mdpi/round_more_time_24.png new file mode 100644 index 0000000000000000000000000000000000000000..85b6c53ffdd5d9b259bc7a0e1ce4b7224b23d76f GIT binary patch literal 295 zcmV+?0oeYDP)WSmNY7}rXKFt2qK^PW=#uL~eYu-gFi5Y}eEg#**lvk`JLr3GiMZ0IY` zLr9xLhqcIv9XC#o%@HC*#ZF13aJ5W~km!V`kp_+`&v12}p5mJ;@!5EU tMZ|Br#+$s=OSIiJA1Eg!YK;05y8|{40tDD{TIc`(002ovPDHLkV1ndAceVfk literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xhdpi/round_more_time_24.png b/app/src/main/res/drawable-night-xhdpi/round_more_time_24.png new file mode 100644 index 0000000000000000000000000000000000000000..e98fae7921d8cec10a4ca6e897f16911f42b81a0 GIT binary patch literal 566 zcmV-60?GY}P)`!pcM`prttr3j?7tMiK*smG9tF_zJ#)rG?O1853hn z{29sIx(6C4ksiplJ(7MBM|$01gue|fk%fP z7o5`KXifyAso>FPFgfNzfXm6W>mb3na!fX>qR3J=IS&w+-Os8h9F7AHPpDC*NRAcO z*l0S;Zwd6PoO;ffa`vfAp~l;&QhTI^fo=Y9@wHTRi`xhtNzN<=_f6=r*S^}GRZ z$p|WH{UwuwL}G{MSB`mw3FI0_i9*4KAiN5y{;`@B<0J$PA*d~iz|TN=Q3M?!DB2LP zA?PzRK~G-ESrM!X`Z6H_u3&F(^~=Xq!Wyj^7mg8?r>(k=ba=C6yfO`l3@wFmqX1%E`s6kD^=KQ; zs#J%zEtFJn26$wn#xzpnML|{0*XZKJ5pGA@MX+_uQKU?5qAm7fxsTHP21Y${aH6;G z+TPrhy_r8i#-iX+39b8x8TtN%>e0cYK{a;Nm-dVH2_#;m3lt3ACjbBd07*qoM6N<$ Eg6x6;kN^Mx literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxhdpi/round_more_time_24.png b/app/src/main/res/drawable-night-xxhdpi/round_more_time_24.png new file mode 100644 index 0000000000000000000000000000000000000000..b49401ac7628382fb4341619d9a41bd31e23e91e GIT binary patch literal 871 zcmV-t1DO1YP)&ypGw-3~v4-I2p7MwXQwG8zLxm>puxE-uIBat` z9A(NttWzHc;|1!aK^xPhO4g{_z+3|Aps|kq+#K8Dc!0VpAiGpaiIah!-lt5CG^-?7 zakX6@qD|cBeYDylM7J1?`%hYUm*3KcR z8I}&#Jdssnd8W0@lXq$?3>mk@DHps88Hja{vxd$Nr#6%V>m`PSeQLf z%5Ye6_CQ71U?{>kG@xApRGtSQSu%3-0Mrmb>7aqQEi;@Qkc_dFz=3WE^&>l=ws<8G zIM9+%Z-)!?+Dbj42a+yZwHW`S2lR^*u8tkOD%6|dEb339pE%?3n9*sW-Uuh`Z}QF9 zJ$&Zgh|xKrUbO?-(Iv)MjBC8*w?G=H%;2g8&|6F?F11nM|BL^dxKK9c^|F@>rN81*1sxar_5{?%;fd1PNA1lcQ`j7;^2D zV!;_3nyZBY&oLW8ZyyzxFPEOG??4}$2I^{<`b1%FQR6Hw@I>C)R@W?FP-Ct*acNQ^ xGX)p}D@BoAaS7a{L6u#Kq^61zS!9vd^tL?ov@4fruy_W~?yshP(bG|p{p7TBD-j~Z|l1V0+WRl59 z3Dfi#(5J_AI^93vOioe=fe)OQUittGE&v#$4}c&UfDAx705HZ36{^%}(xS~FhwSi@ z7u0#o18$5g06Z31XP>VBGlBppP+=p;@eu{UB+InJIzM6nm|!J1WP$;lavoi=k0qBPJY)DYi`AR{$7T0nq12%yZ!D;t>t1lqum+WSj}E zGR1AmJf%s;F@V0V`wMi2x_-bKbL4&BzbyTw7h?$VXsGjhEK#s-T%z5?EDUk}kX4G- zt)q7IYo<}=hXhXzF9l?dDdpBZqLKuGFgUh37o>@q5aV2F9%;p0xf;W}7gn+1R4Q_Y3I) zur2^tGfjiZxIZRUfVp%5n33vlK3xFB6xuMaq{#rN3IM8U15g(Ll+y;FDF7(N34nWo z_2>F3T7n8MRsgpI>s$INL>gC&6@bVBcJx&o3M$591&|k6aM}Qj+XHYILUiSsXu#V= z!FoIXO?^OTJ`;OGb3xa2 z-ts4WFfk`s-e)ZKmQvET#5YASy;uFNtO=Ia6KLv{W8yYHB?xb}bkEpAF-E3)9W)y^{?uN&HvPve&D6dE6JI11T)CT*1(9x)kZs3XbNioIIHLq3C~ zy(`(-Hap=IRT~|%YNv}$g_YUpwwBX_Zak&?HJ9rX;Z*}lis0$8<@7g>?y?6J#n$a| zz?ADv7QuBJydjqdJIqIs=A2%5qR6ULb@L3gJX_8)k53HOoV#ChTie4BjBRJm zZ#yFmnl#Vg`n`fMuQ;J>#{Gik2M|KHwQSAzo$LsWPf-51>QrKm`aoI`>LVcbS!XfY zE1NbjRG(qBY0;!kl?pRPL&8il$t06ZG6|5sZsD|QkD2fS00000NkvXXu0mjft0@ao literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_more_time_white_18.png b/app/src/main/res/drawable-xhdpi/round_more_time_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..8799b18191c58496b767385c86e4a97c0d951f73 GIT binary patch literal 436 zcmV;l0ZaagP)l3V64Z)C5l9F@md%Pb zh<*^g-Lz#&?@$!sCudH+bIzQ9A$)3BYW}Ic2dIP2dw@U@!;&2h7w+)aZ@X^*S#+Xf zSXl@mm{FCVl@y6j`&B|4nm{@63&I8mOKJHRO#hekK&81#Peud3htDMQryn6%An{rQ{pnV0zFc zs7w#K2g}7k%HVO_Sl~-R&>VP5@#q29FLJpI?oEl{>VgXf|jN6Mib|e zQjY14E`y{AX)_Osqe+btpV=$c9OjvVn%N><7vCa%wd@sd;MiV+juVTiD|v9!-nr1Q eGkGO^P(1_ViHSU+>xKCM0000 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_more_time_white_20.png b/app/src/main/res/drawable-xhdpi/round_more_time_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..520096960755c75933c0c93781cde6c5d3ea0524 GIT binary patch literal 371 zcmV-(0gV2MP)BQ9{cWJH5r85b78Y_yC52z*au2WJ`)V#1BmmL_RmpZ$4SrDjhZkEp7_o11LEkd^h z3okglv7W57TI2&9b-_?HX+z^ zA;F!4#Yq=YL1QoO4&CA*gb*~$%+(9F-tunCiK7rg&_kTfi5Z524qnu<57!^ZmyUOd zR-S%YIbb#PkT}cRg6S2oV_#d>43k{1`*}&3i&cwn-p@5UHP#npGRj8(Kp)`wrGZx{ R0G9v&002ovPDHLkV1fzxo%#R( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_more_time_white_24.png b/app/src/main/res/drawable-xhdpi/round_more_time_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..374dda4e42825b8eeb457f59e6d36544f8d839f4 GIT binary patch literal 564 zcmV-40?Yl0P)_J84&V?O{@0VvE1pdkS1c>!DtK*9uo zb@6`I19ZeBWCXA*-f!jr0{~s?BP8A(^Aufu?vO*4CTJ7leQjRk6!&6r$Ih5GExLv= zO)ZNRj_8Tii9J~qWW8#9(8Ow!v#)YeAfVPSWHoQxDu#OQ9xoDZSJq-efj&{=W;Ze` z9W$UuO8(cxvpH=Fa%k5RcoUajN#4aXXIaJIdwI75u>I`3%8E+^e{Sxh?C)fbDO@&n%BEw%J6HGvg_oy zAK#UwZH30000DLJI{wNy83M|@?SnVOO$ibC0?GhQST64D5)j9T+koB@5LbyC z9e!2<;stRxmwNnBe60_qaC zvC0A65fVY0xJ^~6VjKO_M%;#u1fRXLxMfvpq(2h(15OP?fP=;TSfy@$KYXvY53p|- z1e`8zT;mQDBhZZpu>~MSwZqNgUTFNOMg$JWBuG*1Fk0MI)tIbCU=+^9GWDz7KA{fu zVuQG2GAwtbg`M##c8FVnLqZKWTikLqWm+&x4=3O&arcKBFh$%OAtJ+)YdUDfwOHq$ zE)NknS#5nGBEzD6de{qZVkVwOYrG9JRov`I^~$jAlM&8S+m#_A!^UAAH~_1~Ek;-P zUB0d7OwfzZ)plWsXu!h@>7fmusBK2P?HK{bU(k!uYTJOrL&UH@K!yGBnflHTIpjQo zhfz2WtJU{>$R*byPMnOXpuTs|91>{wW5DRa*_f(--bQ=KFX2J*-(hzgg41ymMq`8i zdp>2!Nq-d~pY^F5 z!WQOnF4ZPJ{B1{VD<49@yw{sgp)72Az0DNLk|%`-AOZ*xKu6$xT*OV>$0D9$9nS#p z8`kk7zQtX9f%6eSn=pteEMd=EiU2A=A8ue-UIfrdIE88K0Ehs}!wJk_PhoBMb_#pv zy(3)3nwnJZ?bNT{-VypRr)KTVOMarGD-Ac51bmO2c*Rdvga^!7Rpc8ACXm z{)S^1!g+j(F?@w5T^|5$;ZXZtU;!iOO>YP%yS4=3j`nR}68)*X=KcudmiFvm0zIj` zW*@-$#4CA|sQ|=88m8nu zM}GuR2$tk6q%tA^9K)WxkqDp=T#|Qy-U#5`9Y0r6K|}zv@@6A|g0LuWECMJ9Pvl)` zY5@35-s4mn*5wT~IDk*&{gO(ftJ$y@J+W9XM!`>w>`7p};A(hYyaPU0u6?RUB?VNBj) zvsw}P)5t6i-c%#TQVP7z zMS0(+7BDIA6$VpzBErlrx`+f++JFCMGrTI!s*Q5yqzq?)mAhrZM(1(tUgu!gItLt=e> zb$gg8)L4rLIArW#x==qq9$}KPj2ku8`FMyA_OOI045m=zF;>s8j;C0}ecZ%Fyq`h{ gA%qY@2;o2MFZ^&?Nv1}J4FCWD07*qoM6N<$f+{Qr00000 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_more_time_white_18.png b/app/src/main/res/drawable-xxhdpi/round_more_time_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..b215ca3d1097466f70e58f8f2f35bbba0622e26a GIT binary patch literal 779 zcmV+m1N8ifP)j;_jlj@IOp8S%gb5L z@~EblGh2hIA_~CJR=|4sW3jD(`4o(Q0mcqI4DpP2M1dcKm}8h4$6+)x&I;+Q*-;ox z%#hgxMm-M+s9#9>lP!~6r%(@aF-!u?VYv8&nO)PN+$^kfSYV0~{0uU}OI8GS5ObTz zjA|sDBAug;+BKSO6g%)`G!Qe$=FLOThWCtemPDSQ-(+j;oJI-=2 zb-lZpCCphzV3etd4bYvY|0)1)oPqfTHKrLTi9!x! zYM#h}udoBNa%A)QoQxMHo9_T@zbxXd&4-;5*on=DT^3lq9T=l(l#e>m4T0^l1-q+8 z`KlA$6j-q>*qvm!(}{WnR&5$NC)k%!Gomz69jsGeM>A^nN}7!0OTPlVP>T0DSfju? zG^$#rME3zt8pT`H`&@!rxnk() z6PU+pf@!sIFAvG&5>!d+oN8NPr{3Kyuvg?;z!l;p21F=PEvIFKadY=+5w}~6JA3G) zPT=$U(md7mq=*+Yr5TNPzj)7BbC?u|AltJ-wMns_pvjs`9p44_)H;q9gWs_A8Fm?} z;h?p}q?=X4i@=r5g4{RY7U|HROez^O=)<_P+voxwr928=)0+O8Q^5dngL0W8*(cJ1 zl&=Gb@PG>(qlO~NIKXjkGrLB!M8ificb8$ytyq9^JB31>;UefQiZ|QWPWo#;Z32qm zr_8y3Hr)6L@@pL?%wx`HE+Xt8OF7I%dhp@n5}ss4%-R2KzX4TfdcS)T8V>*f002ov JPDHLkV1lFTZ|VR5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_more_time_white_20.png b/app/src/main/res/drawable-xxhdpi/round_more_time_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..552c9c51f54df6c11ca069bcf3d2914ea2458929 GIT binary patch literal 590 zcmV-U07lLMlbKP>5hBcJ_(YmMJX_Xo`G*5KxlB!cuJ{qzeSW-a44zjnzOtfQ4uv zrI6Ak%C4@z6rQX}_QK9(*CO*&!@Otazvs+*-6+bHD_5>u|D`M|TfPr)1(o{%gX~^6 zWX`%hC(3^MuH=JfhPw(jZAVp8bq#FFp*HFYSf8~zp{8U((YXF7GU~CHKC0F|xzgg7 zRbqR%L0jSBODjg2t_gRYw>gyaxXyGG9^5q6LF{I;V|`(_HH$qBr|@lSW_lXOrrbdM z-KGWK2GC|x+o;bzdDI24X>ifprMv;JyO67GgVh$+C9srvby85pb@RCG1f0~LXTd>B zd)L4lV7~X@T~JI4_5^&14?YGHiNV9*TYT_sx*tdkehA9F2M;8uNHLE3eM|cUIL_X= zUWIbEZ?dVq2zIj%r-J=}zVgmcgMA)sWS&5xD2hCH7T`a;@Zc}o0hrA^W!BrGx2^*G z>)oLnagC}%=0)OTLj}^5jH=dDTwhbdlh%h_VxV*3D(&Ou2I9 c$`wby0EmE(&g~2zz5oCK07*qoM6N<$f(FqWSpWb4 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_more_time_white_24.png b/app/src/main/res/drawable-xxhdpi/round_more_time_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..a66b5af3c523229955e35670de01453313ee855c GIT binary patch literal 867 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_more_time_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_more_time_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..e20c97312a67952d8fd6540e23856a0141b498b4 GIT binary patch literal 1759 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/round_more_time_20.xml b/app/src/main/res/drawable/round_more_time_20.xml new file mode 100644 index 0000000..b6aa086 --- /dev/null +++ b/app/src/main/res/drawable/round_more_time_20.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/app/src/main/res/drawable/round_more_time_24.xml b/app/src/main/res/drawable/round_more_time_24.xml new file mode 100644 index 0000000..4250cae --- /dev/null +++ b/app/src/main/res/drawable/round_more_time_24.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_tab_clock.xml b/app/src/main/res/layout/fragment_tab_clock.xml index e29d2f0..4a7a1b8 100644 --- a/app/src/main/res/layout/fragment_tab_clock.xml +++ b/app/src/main/res/layout/fragment_tab_clock.xml @@ -163,7 +163,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:padding="12dp" - android:src="@drawable/round_text_fields_24" + android:src="@drawable/round_more_time_24" app:tint="@color/colorPrimaryText"/> + android:layout_height="wrap_content" + android:id="@+id/content"> diff --git a/app/src/main/res/layout/the_widget_sans.xml b/app/src/main/res/layout/the_widget_sans.xml index 367dfd3..896c1c6 100644 --- a/app/src/main/res/layout/the_widget_sans.xml +++ b/app/src/main/res/layout/the_widget_sans.xml @@ -30,6 +30,7 @@ android:layout_height="wrap_content" android:gravity="center" android:format12Hour="h:mm" + android:includeFontPadding="false" android:padding="0dp" android:lines="1" android:maxLines="1" @@ -41,6 +42,7 @@ android:gravity="center" android:format12Hour="a" android:format24Hour="" + android:includeFontPadding="false" android:padding="0dp" android:lines="1" android:maxLines="1" @@ -66,6 +68,7 @@ android:padding="0dp" android:lines="1" android:maxLines="1" + android:includeFontPadding="false" style="@style/AnotherWidget.Widget.Title" android:gravity="center_vertical"/> + android:layout_height="wrap_content" + android:id="@+id/content">