From e990b229c8307ea987c73f85e473f277221b0631 Mon Sep 17 00:00:00 2001 From: Tommaso Berlose Date: Mon, 4 May 2020 18:27:42 +0200 Subject: [PATCH] Add clock bottom margin, fixes #50 --- .../anotherwidget/global/Constants.kt | 64 ++---------------- .../anotherwidget/global/Preferences.kt | 1 + .../ui/activities/MainActivity.kt | 41 ++++++----- .../ui/fragments/ClockSettingsFragment.kt | 22 ++++++ .../ui/viewmodels/MainViewModel.kt | 1 + .../anotherwidget/ui/widgets/MainWidget.kt | 9 +++ .../round_format_line_spacing_black_18.png | Bin 0 -> 237 bytes .../round_format_line_spacing_black_24.png | Bin 0 -> 240 bytes .../round_format_line_spacing_black_36.png | Bin 0 -> 338 bytes .../round_format_line_spacing_black_48.png | Bin 0 -> 369 bytes .../round_format_line_spacing_black_18.png | Bin 0 -> 177 bytes .../round_format_line_spacing_black_24.png | Bin 0 -> 163 bytes .../round_format_line_spacing_black_36.png | Bin 0 -> 240 bytes .../round_format_line_spacing_black_48.png | Bin 0 -> 254 bytes .../round_format_line_spacing_black_18.png | Bin 0 -> 240 bytes .../round_format_line_spacing_black_24.png | Bin 0 -> 254 bytes .../round_format_line_spacing_black_36.png | Bin 0 -> 369 bytes .../round_format_line_spacing_black_48.png | Bin 0 -> 458 bytes .../round_format_line_spacing_black_18.png | Bin 0 -> 338 bytes .../round_format_line_spacing_black_24.png | Bin 0 -> 369 bytes .../round_format_line_spacing_black_36.png | Bin 0 -> 535 bytes .../round_format_line_spacing_black_48.png | Bin 0 -> 666 bytes .../round_format_line_spacing_black_18.png | Bin 0 -> 369 bytes .../round_format_line_spacing_black_24.png | Bin 0 -> 458 bytes .../round_format_line_spacing_black_36.png | Bin 0 -> 666 bytes .../round_format_line_spacing_black_48.png | Bin 0 -> 829 bytes .../drawable/round_format_line_spacing.xml | 10 +++ app/src/main/res/layout/activity_main.xml | 17 +---- .../res/layout/fragment_clock_settings.xml | 37 ++++++++++ app/src/main/res/layout/the_widget_sans.xml | 26 ++++++- app/src/main/res/values-fr/strings.xml | 5 ++ app/src/main/res/values-it/strings.xml | 5 ++ app/src/main/res/values/strings.xml | 5 ++ .../compile-file-map.properties | 2 +- .../tmp/debug/dex-renamer-state.txt | 2 +- .../tmp/debug/zip-cache/androidResources | Bin 147 -> 147 bytes 36 files changed, 153 insertions(+), 94 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/round_format_line_spacing_black_18.png create mode 100644 app/src/main/res/drawable-hdpi/round_format_line_spacing_black_24.png create mode 100644 app/src/main/res/drawable-hdpi/round_format_line_spacing_black_36.png create mode 100644 app/src/main/res/drawable-hdpi/round_format_line_spacing_black_48.png create mode 100644 app/src/main/res/drawable-mdpi/round_format_line_spacing_black_18.png create mode 100644 app/src/main/res/drawable-mdpi/round_format_line_spacing_black_24.png create mode 100644 app/src/main/res/drawable-mdpi/round_format_line_spacing_black_36.png create mode 100644 app/src/main/res/drawable-mdpi/round_format_line_spacing_black_48.png create mode 100644 app/src/main/res/drawable-xhdpi/round_format_line_spacing_black_18.png create mode 100644 app/src/main/res/drawable-xhdpi/round_format_line_spacing_black_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_format_line_spacing_black_36.png create mode 100644 app/src/main/res/drawable-xhdpi/round_format_line_spacing_black_48.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_18.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_24.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_36.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_48.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_format_line_spacing_black_18.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_format_line_spacing_black_24.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_format_line_spacing_black_36.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_format_line_spacing_black_48.png create mode 100644 app/src/main/res/drawable/round_format_line_spacing.xml diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt index cb1d555..9e94c8e 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt @@ -7,63 +7,11 @@ object Constants { const val RESULT_APP_NAME = "RESULT_APP_NAME" const val RESULT_APP_PACKAGE = "RESULT_APP_PACKAGE" - const val PREF_SHOW_EVENTS = "PREF_SHOW_EVENTS" - const val PREF_SHOW_WEATHER = "PREF_SHOW_WEATHER" - const val PREF_WEATHER_ICON = "PREF_WEATHER_ICON" - const val PREF_WEATHER_TEMP = "PREF_WEATHER_TEMP" - const val PREF_WEATHER_TEMP_UNIT = "PREF_WEATHER_TEMP_UNIT" - const val PREF_WEATHER_REAL_TEMP_UNIT = "PREF_WEATHER_REAL_TEMP_UNIT" - const val PREF_CALENDAR_ALL_DAY = "PREF_CALENDAR_ALL_DAY" - const val PREF_CALENDAR_FILTER = "PREF_CALENDAR_FILTER" - - const val PREF_EVENT_ID = "PREF_EVENT_ID" - const val PREF_NEXT_EVENT_ID = "PREF_NEXT_EVENT_ID" - const val PREF_NEXT_EVENT_NAME = "PREF_NEXT_EVENT_NAME" - const val PREF_NEXT_EVENT_START_DATE = "PREF_NEXT_EVENT_START_DATE" - const val PREF_NEXT_EVENT_ALL_DAY = "PREF_NEXT_EVENT_ALL_DAY" - const val PREF_NEXT_EVENT_LOCATION = "PREF_NEXT_EVENT_LOCATION" - const val PREF_NEXT_EVENT_END_DATE = "PREF_NEXT_EVENT_END_DATE" - const val PREF_NEXT_EVENT_CALENDAR_ID = "PREF_NEXT_EVENT_CALENDAR_ID" - const val PREF_CUSTOM_LOCATION_LAT = "PREF_CUSTOM_LOCATION_LAT" - const val PREF_CUSTOM_LOCATION_LON = "PREF_CUSTOM_LOCATION_LON" - const val PREF_CUSTOM_LOCATION_ADD = "PREF_CUSTOM_LOCATION_ADD" - const val PREF_HOUR_FORMAT = "PREF_HOUR_FORMAT" - const val PREF_ITA_FORMAT_DATE = "PREF_ITA_FORMAT_DATE" - const val PREF_WEATHER_REFRESH_PERIOD = "PREF_WEATHER_REFRESH_PERIOD" - const val PREF_SHOW_UNTIL = "PREF_SHOW_UNTIL" - const val PREF_CALENDAR_APP_NAME = "PREF_CALENDAR_APP_NAME" - const val PREF_CALENDAR_APP_PACKAGE = "PREF_CALENDAR_APP_PACKAGE" - const val PREF_WEATHER_APP_NAME = "PREF_WEATHER_APP_NAME" - const val PREF_WEATHER_APP_PACKAGE = "PREF_WEATHER_APP_PACKAGE" - const val PREF_WEATHER_PROVIDER_API_KEY = "PREF_WEATHER_PROVIDER_API_KEY" - const val PREF_EVENT_APP_NAME = "PREF_EVENT_APP_NAME" - const val PREF_EVENT_APP_PACKAGE = "PREF_EVENT_APP_PACKAGE" - const val PREF_SHOW_EVENT_LOCATION = "PREF_SHOW_EVENT_LOCATION" - const val PREF_TEXT_COLOR = "PREF_TEXT_COLOR" - const val PREF_TEXT_MAIN_SIZE = "PREF_TEXT_MAIN_SIZE" - const val PREF_TEXT_SECOND_SIZE = "PREF_TEXT_SECOND_SIZE" - const val PREF_TEXT_CLOCK_SIZE = "PREF_TEXT_CLOCK_SIZE" - const val PREF_WEATHER_PROVIDER = "PREF_WEATHER_PROVIDER" - const val PREF_SHOW_CLOCK = "PREF_SHOW_CLOCK" - const val PREF_CLOCK_APP_NAME = "PREF_CLOCK_APP_NAME" - const val PREF_CLOCK_APP_PACKAGE = "PREF_CLOCK_APP_PACKAGE" - const val PREF_TEXT_SHADOW = "PREF_TEXT_SHADOW" - const val PREF_SHOW_DIFF_TIME = "PREF_SHOW_DIFF_TIME" - const val PREF_SHOW_DECLINED_EVENTS = "PREF_SHOW_DECLINED_EVENTS" - const val PREF_OPEN_WEATHER_API_KEY = "PREF_OPEN_WEATHER_API_KEY" - const val PREF_DARK_SKY_API_KEY = "PREF_DARK_SKY_API_KEY" - const val PREF_WU_API_KEY = "PREF_WU_API_KEY" - const val PREF_SECOND_ROW_INFORMATION = "PREF_SECOND_ROW_INFORMATION" - const val PREF_CUSTOM_FONT = "PREF_CUSTOM_FONT" - const val PREF_CUSTOM_FONT_FILE = "PREF_CUSTOM_FONT_FILE" - const val PREF_SHOW_NEXT_EVENT = "PREF_SHOW_NEXT_EVENT" - const val PREF_SHOW_WIDGET_PREVIEW = "PREF_SHOW_WIDGET_PREVIEW" - const val PREF_SHOW_GPS_NOTIFICATION = "PREF_SHOW_GPS_NOTIFICATION" - const val CUSTOM_FONT_PRODUCT_SANS = 1 - - const val itDateFormat = "EEEE, d MMM" - const val engDateFormat = "EEEE, MMM d" - const val goodHourFormat = "HH:mm" - const val badHourFormat = "hh:mm a" + enum class ClockBottomMargin(val value: Int) { + NONE(0), + SMALL(1), + MEDIUM(2), + LARGE(3) + } } \ No newline at end of file diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt index b634747..7097044 100755 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt @@ -45,6 +45,7 @@ object Preferences : KotprefModel() { var textMainSize by floatPref(key = "PREF_TEXT_MAIN_SIZE", default = 26f) var textSecondSize by floatPref(key = "PREF_TEXT_SECOND_SIZE", default = 18f) var clockTextSize by floatPref(key = "PREF_TEXT_CLOCK_SIZE", default = 90f) + var clockBottomMargin by intPref(default = Constants.ClockBottomMargin.MEDIUM.value) var showClock by booleanPref(key = "PREF_SHOW_CLOCK", default = false) var clockAppName by stringPref(key = "PREF_CLOCK_APP_NAME", default = "") var clockAppPackage by stringPref(key = "PREF_CLOCK_APP_PACKAGE", default = "") diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt index 4243576..cc88a44 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt @@ -19,6 +19,7 @@ import androidx.lifecycle.lifecycleScope import com.google.android.material.tabs.TabLayoutMediator import com.tommasoberlose.anotherwidget.R import com.tommasoberlose.anotherwidget.global.Actions +import com.tommasoberlose.anotherwidget.global.Constants import com.tommasoberlose.anotherwidget.global.Preferences import com.tommasoberlose.anotherwidget.global.RequestCode import com.tommasoberlose.anotherwidget.helpers.BitmapHelper @@ -32,6 +33,7 @@ import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget import com.tommasoberlose.anotherwidget.utils.getCurrentWallpaper import com.tommasoberlose.anotherwidget.utils.toPixel import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.the_widget_sans.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.launch @@ -69,10 +71,9 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh }.attach() // Init clock - clock.setTextColor(ColorHelper.getFontColor()) - clock.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(this@MainActivity)) - clock.format12Hour = "hh:mm" - clock.isVisible = Preferences.showClock + time.setTextColor(ColorHelper.getFontColor()) + time.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(this@MainActivity)) + time.isVisible = Preferences.showClock preview.layoutParams = preview.layoutParams.apply { height = 160.toPixel(this@MainActivity) + if (Preferences.showClock) 100.toPixel(this@MainActivity) else 0 @@ -99,18 +100,24 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh val bitmap = BitmapHelper.getBitmapFromView(generatedView, if (preview.width > 0) preview.width else generatedView.measuredWidth, generatedView.measuredHeight) withContext(Dispatchers.Main) { // Clock - clock.setTextColor(ColorHelper.getFontColor()) - clock.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(this@MainActivity)) - clock.format12Hour = "hh:mm" + time.setTextColor(ColorHelper.getFontColor()) + time.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(this@MainActivity)) + time.format12Hour = "hh:mm" - if ((Preferences.showClock && !clock.isVisible) || (!Preferences.showClock && clock.isVisible)) { + // Clock bottom margin + clock_bottom_margin_none.isVisible = Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.value + clock_bottom_margin_small.isVisible = Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.value + clock_bottom_margin_medium.isVisible = Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.value + clock_bottom_margin_large.isVisible = Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.value + + if ((Preferences.showClock && !time.isVisible) || (!Preferences.showClock && time.isVisible)) { if (Preferences.showClock) { - clock.layoutParams = clock.layoutParams.apply { + time.layoutParams = time.layoutParams.apply { height = RelativeLayout.LayoutParams.WRAP_CONTENT } - clock.measure(0, 0) + time.measure(0, 0) } - val initialHeight = clock.measuredHeight + val initialHeight = time.measuredHeight ValueAnimator.ofFloat( if (Preferences.showClock) 0f else 1f, if (Preferences.showClock) 1f else 0f @@ -118,19 +125,19 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh duration = 500L addUpdateListener { val animatedValue = animatedValue as Float - clock.layoutParams = clock.layoutParams.apply { + time.layoutParams = time.layoutParams.apply { height = (initialHeight * animatedValue).toInt() } } addListener( onStart = { if (Preferences.showClock) { - clock.isVisible = true + time.isVisible = true } }, onEnd = { if (!Preferences.showClock) { - clock.isVisible = false + time.isVisible = false } } ) @@ -149,13 +156,13 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh } }.start() } else { - clock.layoutParams = clock.layoutParams.apply { + time.layoutParams = time.layoutParams.apply { height = RelativeLayout.LayoutParams.WRAP_CONTENT } - clock.measure(0, 0) + time.measure(0, 0) } - widget_bitmap.setImageBitmap(bitmap) + bitmap_container.setImageBitmap(bitmap) widget_loader.animate().scaleX(0f).scaleY(0f).start() widget.animate().alpha(1f).start() } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt index dd83f7c..1e7befc 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt @@ -83,6 +83,17 @@ class ClockSettingsFragment : Fragment() { } }) + viewModel.clockBottomMargin.observe(viewLifecycleOwner, Observer { + maintainScrollPosition { + clock_bottom_margin_label.text = when (it) { + Constants.ClockBottomMargin.NONE.value -> getString(R.string.settings_clock_bottom_margin_subtitle_none) + Constants.ClockBottomMargin.SMALL.value -> getString(R.string.settings_clock_bottom_margin_subtitle_small) + Constants.ClockBottomMargin.LARGE.value -> getString(R.string.settings_clock_bottom_margin_subtitle_large) + else -> getString(R.string.settings_clock_bottom_margin_subtitle_medium) + } + } + }) + viewModel.showNextAlarm.observe(viewLifecycleOwner, Observer { maintainScrollPosition { show_next_alarm_label.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible) @@ -116,6 +127,17 @@ class ClockSettingsFragment : Fragment() { }.show() } + action_clock_bottom_margin_size.setOnClickListener { + BottomSheetMenu(requireContext(), header = getString(R.string.settings_show_next_alarm_title)).setSelectedValue(Preferences.clockBottomMargin) + .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_none), Constants.ClockBottomMargin.NONE.value) + .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_small), Constants.ClockBottomMargin.SMALL.value) + .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_medium), Constants.ClockBottomMargin.MEDIUM.value) + .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_large), Constants.ClockBottomMargin.LARGE.value) + .addOnSelectItemListener { value -> + Preferences.clockBottomMargin = value + }.show() + } + action_clock_app.setOnClickListener { if (Preferences.showClock) { startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java), 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 4f76083..8dce8de 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 @@ -33,6 +33,7 @@ class MainViewModel : ViewModel() { val clockAppName = Preferences.asLiveData(Preferences::clockAppName) val showNextAlarm = Preferences.asLiveData(Preferences::showNextAlarm) val dateFormat = Preferences.asLiveData(Preferences::dateFormat) + val clockBottomMargin = Preferences.asLiveData(Preferences::clockBottomMargin) val showBigClockWarning = Preferences.asLiveData(Preferences::showBigClockWarning) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt index 978e739..da58952 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt @@ -208,12 +208,21 @@ class MainWidget : AppWidgetProvider() { private fun updateClockView(context: Context, views: RemoteViews, widgetID: Int): RemoteViews { if (!Preferences.showClock) { views.setViewVisibility(R.id.time, View.GONE) + views.setViewVisibility(R.id.clock_bottom_margin_none, View.GONE) + views.setViewVisibility(R.id.clock_bottom_margin_small, View.GONE) + views.setViewVisibility(R.id.clock_bottom_margin_medium, View.GONE) + views.setViewVisibility(R.id.clock_bottom_margin_large, View.GONE) } else { views.setTextColor(R.id.time, ColorHelper.getFontColor()) views.setTextViewTextSize(R.id.time, TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(context)) val clockPIntent = PendingIntent.getActivity(context, widgetID, IntentHelper.getClockIntent(context), 0) views.setOnClickPendingIntent(R.id.time, clockPIntent) views.setViewVisibility(R.id.time, View.VISIBLE) + + views.setViewVisibility(R.id.clock_bottom_margin_none, if (Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.value) View.VISIBLE else View.GONE) + views.setViewVisibility(R.id.clock_bottom_margin_small, if (Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.value) View.VISIBLE else View.GONE) + views.setViewVisibility(R.id.clock_bottom_margin_medium, if (Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.value) View.VISIBLE else View.GONE) + views.setViewVisibility(R.id.clock_bottom_margin_large, if (Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.value) View.VISIBLE else View.GONE) } return views diff --git a/app/src/main/res/drawable-hdpi/round_format_line_spacing_black_18.png b/app/src/main/res/drawable-hdpi/round_format_line_spacing_black_18.png new file mode 100644 index 0000000000000000000000000000000000000000..28489fb28dbf79e340d0e3f6cb55372f37a15b6f GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d_0r?{;o{Vb8~X+3}IeqmrCyGZ{YCD%A0Zevv)(yT$ l-_*%@?ruW2n~el3gQQD`&nea5sX+HLc)I$ztaD0e0syr|Tj>A* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_format_line_spacing_black_24.png b/app/src/main/res/drawable-hdpi/round_format_line_spacing_black_24.png new file mode 100644 index 0000000000000000000000000000000000000000..206e904c4c244224b6be94bb4fd3ab2db536d53d GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBwtKobhEy=Vz1GNjI6$QJp%RB& z7gHCLmCHn1D~Ah=O%Hl6IC8z(=Dr_U zVISgITqpQX_@8*i@n3tP<%ypLdhACNdlqo4iqXE;&-kwWBbTt%{lhEbZ?H=pKdiCn onZ$M=>C*FGXxFJ35jx)(YvjJ$uQ!^y2j~R`Pgg&ebxsLQ02UTwssI20 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_format_line_spacing_black_36.png b/app/src/main/res/drawable-hdpi/round_format_line_spacing_black_36.png new file mode 100644 index 0000000000000000000000000000000000000000..ac3451396d503f3baec5934b0be27ecae2a97dac GIT binary patch literal 338 zcmV-Y0j>UtP)41nI4mF>LV!aE3xH)20xSX?0K(z`5CGr+AwUQr1PF@&00AHb2oOS;UMw=g z{$>6%bKl1UfEUL24>V2FG;L4TphbmZHXuyyQ56*x$CVRhk85y^F_A4+|BJH69V0mS zK#f_uM2J}9HV95GFl%oJ1|8y^I7NNp5VN+y_(O=iVw~J!iQm@a0b?R}=z>%07*qoM6N<$f&+AgQ2+n{ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_format_line_spacing_black_48.png b/app/src/main/res/drawable-hdpi/round_format_line_spacing_black_48.png new file mode 100644 index 0000000000000000000000000000000000000000..39e23fbcf6cb60cf8a299e5c4c08073ec24aebba GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V6^abaSW+oe0y7vhbd9w*vAJC z6gZj`cs@Pd_w=+S&!L(`fi_2pwx3PS20YCQ9P8Mdp5)fPzIXTS-T(V-Yi{%3uf4wL znF|;&=dND6b=x;V-mR;{_LZAVJg^arR&r=w7K>Uq)iif~uWW&qrfGTp5{ ztJhqTU}O<+V7MyfzyM}2vII1AFS5r*2#C9WVrSw|0HOv4FwqsiPIv3_-lTU6&u-B< z;Ck^ZW2illddnFn_+ZhCZylf4d}WFeiJg!$r$gLT`s6Xrg1|2hn+kuZ9z4c)@)+aG i1#b^3DuIC4JJybgFVyx-F^d5PC4;A{pUXO@geCy`%b6Dd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_format_line_spacing_black_18.png b/app/src/main/res/drawable-mdpi/round_format_line_spacing_black_18.png new file mode 100644 index 0000000000000000000000000000000000000000..b6de9e897d0ae96650af05c5f1e94b4b7e233966 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rhe3QrfukP60R3CRO&9rnzHcC&VH z3Rpilp!T9|g#+(T{-YlQ3fTqbGn6@)bufEgu2BecDASY^znSn=`pSZ;phL~?*gP3N zrYYR(=XHLn(qZVq+)@76h(l|+;f}){th&EaPxwwS%HZ5I;|ojYOxItIGG4+dOnoTj z@JFVDpV^RqEzf`cV>6~bIsBC4aZQex&#^@YvYz|qvvB_^tYTi*;pAY;?WViHKvZyB zLdDWWf!wn`ii%EIu5{+mJ1YV207FqloknRtWd-IVN<3ef7BevHPtL9tKJqRdXe)!K LtDnm{r-UW|M))*; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_format_line_spacing_black_36.png b/app/src/main/res/drawable-mdpi/round_format_line_spacing_black_36.png new file mode 100644 index 0000000000000000000000000000000000000000..206e904c4c244224b6be94bb4fd3ab2db536d53d GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBwtKobhEy=Vz1GNjI6$QJp%RB& z7gHCLmCHn1D~Ah=O%Hl6IC8z(=Dr_U zVISgITqpQX_@8*i@n3tP<%ypLdhACNdlqo4iqXE;&-kwWBbTt%{lhEbZ?H=pKdiCn onZ$M=>C*FGXxFJ35jx)(YvjJ$uQ!^y2j~R`Pgg&ebxsLQ02UTwssI20 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_format_line_spacing_black_48.png b/app/src/main/res/drawable-mdpi/round_format_line_spacing_black_48.png new file mode 100644 index 0000000000000000000000000000000000000000..a99a89130a1652569da31ed21082b29515dfe94b GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtqn<8~Ar*{or!}%NJBqjjJ8?xi zFmy98va~C>E}0VV!)39gMO(o`vimH9#lf1Q^mk_-Gp_lcaQ5JuM#Ezv5f9WjZzMJ! z4(osK((>nHj!UcZoBD5@-v55o9GPOFCGS|EE}#8@|k1|%Oc%$NbBwtKobhEy=Vz1GNjI6$QJp%RB& z7gHCLmCHn1D~Ah=O%Hl6IC8z(=Dr_U zVISgITqpQX_@8*i@n3tP<%ypLdhACNdlqo4iqXE;&-kwWBbTt%{lhEbZ?H=pKdiCn onZ$M=>C*FGXxFJ35jx)(YvjJ$uQ!^y2j~R`Pgg&ebxsLQ02UTwssI20 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_format_line_spacing_black_24.png b/app/src/main/res/drawable-xhdpi/round_format_line_spacing_black_24.png new file mode 100644 index 0000000000000000000000000000000000000000..a99a89130a1652569da31ed21082b29515dfe94b GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtqn<8~Ar*{or!}%NJBqjjJ8?xi zFmy98va~C>E}0VV!)39gMO(o`vimH9#lf1Q^mk_-Gp_lcaQ5JuM#Ezv5f9WjZzMJ! z4(osK((>nHj!UcZoBD5@-v55o9GPOFCGS|EE}#8@Uq)iif~uWW&qrfGTp5{ ztJhqTU}O<+V7MyfzyM}2vII1AFS5r*2#C9WVrSw|0HOv4FwqsiPIv3_-lTU6&u-B< z;Ck^ZW2illddnFn_+ZhCZylf4d}WFeiJg!$r$gLT`s6Xrg1|2hn+kuZ9z4c)@)+aG i1#b^3DuIC4JJybgFVyx-F^d5PC4;A{pUXO@geCy`%b6Dd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_format_line_spacing_black_48.png b/app/src/main/res/drawable-xhdpi/round_format_line_spacing_black_48.png new file mode 100644 index 0000000000000000000000000000000000000000..f1962ba3d28bde3d75f42222b11425db69f35712 GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V4Udb;uuoF`1Y1y4s)VJ`$u-R zW~YS)8dp|Yd|zU4KEXg@PI`dMyybq)Rj*{N*vbO9Zp?()ihRe;PPqk1}p!iDa{1!!9<(GE64H zy+N`->0e>|l$#+k39b#A7li-sm}gYHVEu<5vIeRrY&US%++nO(bVud}!*MUZ{cLG5 zP6wM)7?@8muuWj(QDByEU^8goNnnsXz+lwCc!%{Vdx7{A`2(>5bqwW>KhXtNGUCwc z(B%F=SfXiPdBP*T6=&|wtmBls!#Z{59L)oQ5<9uIKD+&SJnt^+Utj4T8;->W#I>Li zY)f4;0-{>jmb!fS!8z>!=ZgmMDM>s%KU^UJIB7|K+<{*o=O-FU1LKIn)78&qol`;+ E0J%@JTL1t6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_18.png b/app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_18.png new file mode 100644 index 0000000000000000000000000000000000000000..ac3451396d503f3baec5934b0be27ecae2a97dac GIT binary patch literal 338 zcmV-Y0j>UtP)41nI4mF>LV!aE3xH)20xSX?0K(z`5CGr+AwUQr1PF@&00AHb2oOS;UMw=g z{$>6%bKl1UfEUL24>V2FG;L4TphbmZHXuyyQ56*x$CVRhk85y^F_A4+|BJH69V0mS zK#f_uM2J}9HV95GFl%oJ1|8y^I7NNp5VN+y_(O=iVw~J!iQm@a0b?R}=z>%07*qoM6N<$f&+AgQ2+n{ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_24.png b/app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_24.png new file mode 100644 index 0000000000000000000000000000000000000000..39e23fbcf6cb60cf8a299e5c4c08073ec24aebba GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V6^abaSW+oe0y7vhbd9w*vAJC z6gZj`cs@Pd_w=+S&!L(`fi_2pwx3PS20YCQ9P8Mdp5)fPzIXTS-T(V-Yi{%3uf4wL znF|;&=dND6b=x;V-mR;{_LZAVJg^arR&r=w7K>Uq)iif~uWW&qrfGTp5{ ztJhqTU}O<+V7MyfzyM}2vII1AFS5r*2#C9WVrSw|0HOv4FwqsiPIv3_-lTU6&u-B< z;Ck^ZW2illddnFn_+ZhCZylf4d}WFeiJg!$r$gLT`s6Xrg1|2hn+kuZ9z4c)@)+aG i1#b^3DuIC4JJybgFVyx-F^d5PC4;A{pUXO@geCy`%b6Dd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_36.png b/app/src/main/res/drawable-xxhdpi/round_format_line_spacing_black_36.png new file mode 100644 index 0000000000000000000000000000000000000000..5e91b43f6a0ee0a7536c79f8ce44d0c723dbcaa5 GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz1|<8_!p|}=Fy8ZYaSW+oe0!(S%{fux_(OhY z4gm!R4gn_#r4|7;jti_U0*CaJS{Pzo8bE9(4rdO zt~s}E=q3H$*sGPS>S7)DPb#-&eRsjvBVHZbu0Q-7eJea?_pAuci*iYy8{cjNvG%b^ zyxIBXjmk$ulkT@u-tA+Tc(e7(8{MDW_S4?Y1Iq3Dk~42l|E0SR4#s`P z%h{XeeQvaovQJi5J(-uYE9o=e>~%L(%(PzL?wfmbS#O@uZLR+clMP-e%t+v9OK4J* zXyR;3;82rjQUnWdvJ|h1tv6VH>nl4F<8B>P1eGzB)!BeWnCGCt8ta1sJO^2zJRbv= zWD)7(>#FN4Z=~j2URn14ozQ!!d&%y8TcxWHE)9NLcXpG0{M@YVpC>(gf1@$@?UL&Y z)Q?CVZwh|^P*6ay z&+l=X#=yYX>gnPbQo;E4#?eIQKmq5AhG%BXocXrkQhjM;+x{M|mth5RYf`*4mre=t z()?Px^wP{Ve;3#&75$w5^kMgec6}$geH@iPl%9Y%+Dvi^S|Z+0Ef#t$tD3>yk@eML zr(1D8zt~o$w(R8d`xg1lS!(m?jjqB zJu@fXjB~>6*UJj0rF~0%$#C{eOFh4* znZb60xm*7cxu4RDlld!?OWr8v_w?C5>AkqIeUG8lw+ZHM$K^g9dvU}0+)24PlWi^3 xs|)^-Uq)iif~uWW&qrfGTp5{ ztJhqTU}O<+V7MyfzyM}2vII1AFS5r*2#C9WVrSw|0HOv4FwqsiPIv3_-lTU6&u-B< z;Ck^ZW2illddnFn_+ZhCZylf4d}WFeiJg!$r$gLT`s6Xrg1|2hn+kuZ9z4c)@)+aG i1#b^3DuIC4JJybgFVyx-F^d5PC4;A{pUXO@geCy`%b6Dd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_line_spacing_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_format_line_spacing_black_24.png new file mode 100644 index 0000000000000000000000000000000000000000..f1962ba3d28bde3d75f42222b11425db69f35712 GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V4Udb;uuoF`1Y1y4s)VJ`$u-R zW~YS)8dp|Yd|zU4KEXg@PI`dMyybq)Rj*{N*vbO9Zp?()ihRe;PPqk1}p!iDa{1!!9<(GE64H zy+N`->0e>|l$#+k39b#A7li-sm}gYHVEu<5vIeRrY&US%++nO(bVud}!*MUZ{cLG5 zP6wM)7?@8muuWj(QDByEU^8goNnnsXz+lwCc!%{Vdx7{A`2(>5bqwW>KhXtNGUCwc z(B%F=SfXiPdBP*T6=&|wtmBls!#Z{59L)oQ5<9uIKD+&SJnt^+Utj4T8;->W#I>Li zY)f4;0-{>jmb!fS!8z>!=ZgmMDM>s%KU^UJIB7|K+<{*o=O-FU1LKIn)78&qol`;+ E0J%@JTL1t6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_line_spacing_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_format_line_spacing_black_36.png new file mode 100644 index 0000000000000000000000000000000000000000..0a22e94f407907e118eb414745ad91d280179cf9 GIT binary patch literal 666 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=CI|S0xB}_H2C6EROMz}OED7=p zX7FD<+oJ#f?_ieX-S^MCOPrq1vwwT~=J(efzTaNFzB#;Iz(ymx{P5??#T?E$(+%>y z&+l=X#=yYX>gnPbQo;E4#?eIQKmq5AhG%BXocXrkQhjM;+x{M|mth5RYf`*4mre=t z()?Px^wP{Ve;3#&75$w5^kMgec6}$geH@iPl%9Y%+Dvi^S|Z+0Ef#t$tD3>yk@eML zr(1D8zt~o$w(R8d`xg1lS!(m?jjqB zJu@fXjB~>6*UJj0rF~0%$#C{eOFh4* znZb60xm*7cxu4RDlld!?OWr8v_w?C5>AkqIeUG8lw+ZHM$K^g9dvU}0+)24PlWi^3 xs|)^-~LJO8=J?r;T%)iSSnuE$4T_P+i3y-o7U zt-^i`3`{znE{-7;jBjtT_NfH&umqZ?tb?p_4kAQ zrc(aPu5Gv(6ZL0P+RlG3r%BzrU()F9E573jR%(4hWooG}b9D6m8!}1t3lg$-2Y3BE zXYjjT<3?2Yth@hyKW44=+H$$ReoI39%xAOzerM{pm%?O&4P3B8gc<&^+ots{1WeC5BbY|lzG*^)<=x2|C~4(Pi?(cbwJ5h z;kW)2xe0&8z4%Z3<6g?1^1t;HbJ2gGJnMg_j|~5uesU-@FfidD8YZ-V)n>K%wd7g+ zi}2+OmjCUlUwCozp=;Z?{yx-_?4v^;!H0(UOR- z`cDr2E&cB#cPsv<{*%VPTY=0Q@xSpfD{JblS=+CP^uNzv{NTc@#}EJVipWGww%M}3 tvB^36+8fWRs;zCka&m5L(3n49@Q-0q`nAZ1m5CofLY}UEF6*2UngD2yG5!Dm literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/round_format_line_spacing.xml b/app/src/main/res/drawable/round_format_line_spacing.xml new file mode 100644 index 0000000..59e3804 --- /dev/null +++ b/app/src/main/res/drawable/round_format_line_spacing.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60032fa..09be4ac 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -76,22 +76,7 @@ android:id="@+id/widget" android:alpha="0" android:gravity="center"> - - + + + + + + + + + + + + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cc7f89d..ef80c2d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -171,4 +171,9 @@ Ceci est un projet de développeur unique,\ndonc merci pour le soutien! Ceci est un projet open-source, n\'hésitez pas à aider. Commentaires et suggestions + Marge inférieure de l\'horloge + Aucun + Petit + Moyen + Grand \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 878ece7..fd873dc 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -172,4 +172,9 @@ Grazie per supportare il progetto! Contribuisci a questo progetto open source. Feedback + Margine inferiore orologio + Nessuno + Piccolo + Medio + Grande \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 761d8a5..77fc1d1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -183,4 +183,9 @@ This is an open-source project, feel free to help. Feedback and feature requests Google Tasks + Clock bottom margin + None + Small + Medium + Large diff --git a/tasksintegration/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/tasksintegration/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 61f7347..625b5b2 100644 --- a/tasksintegration/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/tasksintegration/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Mon May 04 02:02:08 CEST 2020 +#Mon May 04 17:41:28 CEST 2020 diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 0c54562..cd5d1b6 100644 --- a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Mon May 04 17:33:06 CEST 2020 +#Mon May 04 18:04:57 CEST 2020 base.0=/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 030f00d841c29d12d27093e407128aec39501a82..ee61657145a5a2e77875bf5114de99e715981f32 100644 GIT binary patch delta 28 gcmbQtIGIr-z?+eY0Sq`87&sIePMn(jV4_Gp07KsfH2?qr delta 28 gcmbQtIGIr-z?+eY0Sq`87&sIe4u9cem?%;Y06w1t^#A|>