From 1f22426dec104f6f45ac5122e71c0d97ca3ba7d5 Mon Sep 17 00:00:00 2001 From: Tommaso Berlose Date: Tue, 4 May 2021 18:32:20 +0200 Subject: [PATCH] Update align support --- .idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes .../anotherwidget/global/Constants.kt | 2 +- .../ui/fragments/MainFragment.kt | 15 +++++- .../ui/fragments/tabs/LayoutFragment.kt | 12 +++-- .../ui/viewmodels/MainViewModel.kt | 1 + .../ui/widgets/LeftAlignedWidget.kt | 44 ++++++++++-------- .../anotherwidget/ui/widgets/MainWidget.kt | 2 - .../ui/widgets/StandardWidget.kt | 22 +++++---- .../anotherwidget/utils/Extensions.kt | 4 +- ...round_align_horizontal_center_white_18.png | Bin 0 -> 207 bytes ...round_align_horizontal_center_white_20.png | Bin 0 -> 210 bytes ...round_align_horizontal_center_white_24.png | Bin 0 -> 203 bytes ...round_align_horizontal_center_white_36.png | Bin 0 -> 292 bytes ...round_align_horizontal_center_white_48.png | Bin 0 -> 245 bytes .../round_align_horizontal_left_white_18.png | Bin 0 -> 184 bytes .../round_align_horizontal_left_white_20.png | Bin 0 -> 186 bytes .../round_align_horizontal_left_white_24.png | Bin 0 -> 174 bytes .../round_align_horizontal_left_white_36.png | Bin 0 -> 275 bytes .../round_align_horizontal_left_white_48.png | Bin 0 -> 251 bytes .../round_align_horizontal_right_white_18.png | Bin 0 -> 187 bytes .../round_align_horizontal_right_white_20.png | Bin 0 -> 189 bytes .../round_align_horizontal_right_white_24.png | Bin 0 -> 174 bytes .../round_align_horizontal_right_white_36.png | Bin 0 -> 275 bytes .../round_align_horizontal_right_white_48.png | Bin 0 -> 253 bytes ...round_align_horizontal_center_white_18.png | Bin 0 -> 166 bytes ...round_align_horizontal_center_white_20.png | Bin 0 -> 172 bytes ...round_align_horizontal_center_white_24.png | Bin 0 -> 123 bytes ...round_align_horizontal_center_white_36.png | Bin 0 -> 203 bytes ...round_align_horizontal_center_white_48.png | Bin 0 -> 172 bytes .../round_align_horizontal_left_white_18.png | Bin 0 -> 142 bytes .../round_align_horizontal_left_white_20.png | Bin 0 -> 159 bytes .../round_align_horizontal_left_white_24.png | Bin 0 -> 122 bytes .../round_align_horizontal_left_white_36.png | Bin 0 -> 174 bytes .../round_align_horizontal_left_white_48.png | Bin 0 -> 176 bytes .../round_align_horizontal_right_white_18.png | Bin 0 -> 147 bytes .../round_align_horizontal_right_white_20.png | Bin 0 -> 163 bytes .../round_align_horizontal_right_white_24.png | Bin 0 -> 125 bytes .../round_align_horizontal_right_white_36.png | Bin 0 -> 174 bytes .../round_align_horizontal_right_white_48.png | Bin 0 -> 175 bytes .../round_align_horizontal_center_24.png | Bin 0 -> 213 bytes .../round_align_horizontal_left_24.png | Bin 0 -> 188 bytes .../round_align_horizontal_right_24.png | Bin 0 -> 187 bytes .../round_align_horizontal_center_24.png | Bin 0 -> 124 bytes .../round_align_horizontal_left_24.png | Bin 0 -> 124 bytes .../round_align_horizontal_right_24.png | Bin 0 -> 126 bytes .../round_align_horizontal_center_24.png | Bin 0 -> 176 bytes .../round_align_horizontal_left_24.png | Bin 0 -> 181 bytes .../round_align_horizontal_right_24.png | Bin 0 -> 179 bytes .../round_align_horizontal_center_24.png | Bin 0 -> 285 bytes .../round_align_horizontal_left_24.png | Bin 0 -> 274 bytes .../round_align_horizontal_right_24.png | Bin 0 -> 272 bytes .../round_align_horizontal_center_24.png | Bin 0 -> 329 bytes .../round_align_horizontal_left_24.png | Bin 0 -> 328 bytes .../round_align_horizontal_right_24.png | Bin 0 -> 331 bytes ...round_align_horizontal_center_white_18.png | Bin 0 -> 203 bytes ...round_align_horizontal_center_white_20.png | Bin 0 -> 216 bytes ...round_align_horizontal_center_white_24.png | Bin 0 -> 172 bytes ...round_align_horizontal_center_white_36.png | Bin 0 -> 245 bytes ...round_align_horizontal_center_white_48.png | Bin 0 -> 308 bytes .../round_align_horizontal_left_white_18.png | Bin 0 -> 174 bytes .../round_align_horizontal_left_white_20.png | Bin 0 -> 211 bytes .../round_align_horizontal_left_white_24.png | Bin 0 -> 176 bytes .../round_align_horizontal_left_white_36.png | Bin 0 -> 251 bytes .../round_align_horizontal_left_white_48.png | Bin 0 -> 312 bytes .../round_align_horizontal_right_white_18.png | Bin 0 -> 174 bytes .../round_align_horizontal_right_white_20.png | Bin 0 -> 216 bytes .../round_align_horizontal_right_white_24.png | Bin 0 -> 175 bytes .../round_align_horizontal_right_white_36.png | Bin 0 -> 253 bytes .../round_align_horizontal_right_white_48.png | Bin 0 -> 313 bytes ...round_align_horizontal_center_white_18.png | Bin 0 -> 292 bytes ...round_align_horizontal_center_white_20.png | Bin 0 -> 287 bytes ...round_align_horizontal_center_white_24.png | Bin 0 -> 245 bytes ...round_align_horizontal_center_white_36.png | Bin 0 -> 483 bytes ...round_align_horizontal_center_white_48.png | Bin 0 -> 464 bytes .../round_align_horizontal_left_white_18.png | Bin 0 -> 275 bytes .../round_align_horizontal_left_white_20.png | Bin 0 -> 254 bytes .../round_align_horizontal_left_white_24.png | Bin 0 -> 251 bytes .../round_align_horizontal_left_white_36.png | Bin 0 -> 448 bytes .../round_align_horizontal_left_white_48.png | Bin 0 -> 466 bytes .../round_align_horizontal_right_white_18.png | Bin 0 -> 275 bytes .../round_align_horizontal_right_white_20.png | Bin 0 -> 257 bytes .../round_align_horizontal_right_white_24.png | Bin 0 -> 253 bytes .../round_align_horizontal_right_white_36.png | Bin 0 -> 444 bytes .../round_align_horizontal_right_white_48.png | Bin 0 -> 466 bytes ...round_align_horizontal_center_white_18.png | Bin 0 -> 245 bytes ...round_align_horizontal_center_white_20.png | Bin 0 -> 366 bytes ...round_align_horizontal_center_white_24.png | Bin 0 -> 308 bytes ...round_align_horizontal_center_white_36.png | Bin 0 -> 464 bytes ...round_align_horizontal_center_white_48.png | Bin 0 -> 596 bytes .../round_align_horizontal_left_white_18.png | Bin 0 -> 251 bytes .../round_align_horizontal_left_white_20.png | Bin 0 -> 369 bytes .../round_align_horizontal_left_white_24.png | Bin 0 -> 312 bytes .../round_align_horizontal_left_white_36.png | Bin 0 -> 466 bytes .../round_align_horizontal_left_white_48.png | Bin 0 -> 592 bytes .../round_align_horizontal_right_white_18.png | Bin 0 -> 253 bytes .../round_align_horizontal_right_white_20.png | Bin 0 -> 367 bytes .../round_align_horizontal_right_white_24.png | Bin 0 -> 313 bytes .../round_align_horizontal_right_white_36.png | Bin 0 -> 466 bytes .../round_align_horizontal_right_white_48.png | Bin 0 -> 588 bytes .../round_align_horizontal_center_24.xml | 10 ++++ .../round_align_horizontal_left_24.xml | 11 +++++ .../round_align_horizontal_right_24.xml | 11 +++++ app/src/main/res/layout/fragment_app_main.xml | 2 + .../main/res/layout/fragment_tab_layout.xml | 3 +- .../main/res/layout/left_aligned_widget.xml | 2 +- .../res/layout/left_aligned_widget_sans.xml | 34 +++++++++----- app/src/main/res/layout/the_widget_sans.xml | 21 +++++++-- 107 files changed, 138 insertions(+), 58 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_18.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_20.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_24.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_36.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_48.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_18.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_20.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_24.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_36.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_48.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_18.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_20.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_24.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_36.png create mode 100644 app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_48.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_18.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_20.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_24.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_36.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_48.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_18.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_20.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_24.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_36.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_48.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_18.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_20.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_24.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_36.png create mode 100644 app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_48.png create mode 100644 app/src/main/res/drawable-night-hdpi/round_align_horizontal_center_24.png create mode 100644 app/src/main/res/drawable-night-hdpi/round_align_horizontal_left_24.png create mode 100644 app/src/main/res/drawable-night-hdpi/round_align_horizontal_right_24.png create mode 100644 app/src/main/res/drawable-night-mdpi/round_align_horizontal_center_24.png create mode 100644 app/src/main/res/drawable-night-mdpi/round_align_horizontal_left_24.png create mode 100644 app/src/main/res/drawable-night-mdpi/round_align_horizontal_right_24.png create mode 100644 app/src/main/res/drawable-night-xhdpi/round_align_horizontal_center_24.png create mode 100644 app/src/main/res/drawable-night-xhdpi/round_align_horizontal_left_24.png create mode 100644 app/src/main/res/drawable-night-xhdpi/round_align_horizontal_right_24.png create mode 100644 app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_center_24.png create mode 100644 app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_left_24.png create mode 100644 app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_right_24.png create mode 100644 app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_center_24.png create mode 100644 app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_left_24.png create mode 100644 app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_right_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_18.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_20.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_36.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_48.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_18.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_20.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_36.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_48.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_18.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_20.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_36.png create mode 100644 app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_48.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_18.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_20.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_24.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_36.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_48.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_18.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_20.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_24.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_36.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_48.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_18.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_20.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_24.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_36.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_48.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_18.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_20.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_24.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_36.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_48.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_18.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_20.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_24.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_36.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_48.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_18.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_20.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_24.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_36.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_48.png create mode 100644 app/src/main/res/drawable/round_align_horizontal_center_24.xml create mode 100644 app/src/main/res/drawable/round_align_horizontal_left_24.xml create mode 100644 app/src/main/res/drawable/round_align_horizontal_right_24.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 64d3a40ba2006e5a13b25073a36fd41c7968e269..d6a67dcd8909d949c7a52a2af6a2933e2c76787e 100644 GIT binary patch delta 15 XcmbQqGLvP(3>LGr69+fWsbvHJFZl*n delta 15 XcmbQqGLvP(3>Hqk$?O~F)G`79C@BR4 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 a4eab88..fa36ce3 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt @@ -83,7 +83,7 @@ object Constants { enum class WidgetAlign(val rawValue: Int) { LEFT(0), - RIGHT(1), +// RIGHT(1), CENTER(2) } } \ No newline at end of file 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 048acf8..c890ea7 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 @@ -9,9 +9,11 @@ import android.provider.Settings import android.util.DisplayMetrics import android.util.Log import android.util.TypedValue +import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.LinearLayout import android.widget.RelativeLayout import androidx.core.content.ContextCompat import androidx.core.view.isVisible @@ -42,7 +44,8 @@ class MainFragment : Fragment() { companion object { fun newInstance() = MainFragment() - private var PREVIEW_BASE_HEIGHT: Int = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) 120 else 200 + private val PREVIEW_BASE_HEIGHT: Int + get() = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) 120 else 200 } private lateinit var viewModel: MainViewModel @@ -154,6 +157,10 @@ class MainFragment : Fragment() { viewModel.widgetAlign.observe(viewLifecycleOwner) { updatePreviewVisibility() + lifecycleScope.launch { + delay(350) + updateClock() + } } viewModel.showPreview.observe(viewLifecycleOwner) { @@ -252,6 +259,10 @@ class MainFragment : Fragment() { binding.widgetDetail.clockBottomMarginLarge.isVisible = Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.rawValue + // Align + binding.widgetDetail.timeContainer.layoutParams = (binding.widgetDetail.timeContainer.layoutParams as LinearLayout.LayoutParams).apply { + gravity = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) Gravity.CENTER_HORIZONTAL else Gravity.NO_GRAVITY + } } private fun updateClockVisibility(showClock: Boolean) { @@ -261,7 +272,7 @@ class MainFragment : Fragment() { updatePreviewVisibility() if (showClock) { - binding.widgetDetail.timeContainer.layoutParams = binding.widgetDetail.timeContainer.layoutParams.apply { + binding.widgetDetail.timeContainer.layoutParams = (binding.widgetDetail.timeContainer.layoutParams as LinearLayout.LayoutParams).apply { height = RelativeLayout.LayoutParams.WRAP_CONTENT } binding.widgetDetail.timeContainer.measure(0, 0) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/LayoutFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/LayoutFragment.kt index 8df929f..2ba7cc2 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/LayoutFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/LayoutFragment.kt @@ -6,6 +6,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -98,9 +99,14 @@ class LayoutFragment : Fragment() { viewModel.widgetAlign.observe(viewLifecycleOwner) { maintainScrollPosition { + binding.widgetAlignIcon.setImageDrawable(when (it) { + Constants.WidgetAlign.LEFT.rawValue -> ContextCompat.getDrawable(requireContext(), R.drawable.round_align_horizontal_left_24) + Constants.WidgetAlign.CENTER.rawValue -> ContextCompat.getDrawable(requireContext(), R.drawable.round_align_horizontal_center_24) + else -> ContextCompat.getDrawable(requireContext(), R.drawable.round_align_horizontal_center_24) + }) + binding.widgetAlignLabel.text = when (it) { Constants.WidgetAlign.LEFT.rawValue -> getString(R.string.settings_widget_align_left_subtitle) - Constants.WidgetAlign.RIGHT.rawValue -> getString(R.string.settings_widget_align_right_subtitle) Constants.WidgetAlign.CENTER.rawValue -> getString(R.string.settings_widget_align_center_subtitle) else -> getString(R.string.settings_widget_align_center_subtitle) } @@ -204,10 +210,6 @@ class LayoutFragment : Fragment() { getString(R.string.settings_widget_align_left_subtitle), Constants.WidgetAlign.LEFT.rawValue ) - .addItem( - getString(R.string.settings_widget_align_right_subtitle), - Constants.WidgetAlign.RIGHT.rawValue - ) .addOnSelectItemListener { value -> Preferences.widgetAlign = value }.show() 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 915f85a..9d5562c 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 @@ -132,6 +132,7 @@ class MainViewModel(context: Application) : AndroidViewModel(context) { addSource(Preferences.asLiveData(Preferences::customFontName)) { value = true } addSource(Preferences.asLiveData(Preferences::customFontVariant)) { value = true } addSource(Preferences.asLiveData(Preferences::secondRowInformation)) { value = true } + addSource(Preferences.asLiveData(Preferences::widgetAlign)) { value = true } addSource(Preferences.asLiveData(Preferences::showDividers)) { value = true } addSource(Preferences.asLiveData(Preferences::secondRowTopMargin)) { value = true } addSource(Preferences.asLiveData(Preferences::isDateCapitalize)) { value = true } 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 7a28fc2..a1255c1 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 @@ -7,6 +7,7 @@ import android.content.Intent import android.graphics.Color import android.graphics.Typeface import android.text.format.DateUtils +import android.util.Log import android.util.TypedValue import android.view.LayoutInflater import android.view.View @@ -16,6 +17,7 @@ import android.widget.RemoteViews import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.view.isVisible +import androidx.core.view.updateMargins import com.tommasoberlose.anotherwidget.R import com.tommasoberlose.anotherwidget.databinding.LeftAlignedWidgetBinding import com.tommasoberlose.anotherwidget.db.EventRepository @@ -127,7 +129,7 @@ class LeftAlignedWidget(val context: Context) { PendingIntent.FLAG_UPDATE_CURRENT ) views.setOnClickPendingIntent(R.id.date_rect, calPIntent) - views.setViewVisibility(R.id.date_layout, View.VISIBLE) + views.setViewVisibility(R.id.first_line_rect, View.VISIBLE) val nextEvent = eventRepository.getNextEvent() val nextAlarm = AlarmHelper.getNextAlarm(context) @@ -184,7 +186,7 @@ class LeftAlignedWidget(val context: Context) { views.setViewVisibility(R.id.next_event_rect, View.VISIBLE) // Event time difference - if (Preferences.showDiffTime && Calendar.getInstance().timeInMillis < (nextEvent.startDate - 1000 * 60 * 60)) { + if (Preferences.showDiffTime && Calendar.getInstance().timeInMillis < nextEvent.startDate) { views.setImageViewBitmap( R.id.next_event_difference_time_rect, BitmapHelper.getBitmapFromView( @@ -192,8 +194,9 @@ class LeftAlignedWidget(val context: Context) { draw = false ) ) - views.setViewVisibility(R.id.next_event_difference_time_rect, View.VISIBLE) + views.setOnClickPendingIntent(R.id.next_event_difference_time_rect, eventIntent) + views.setViewVisibility(R.id.next_event_difference_time_rect, View.VISIBLE) } else { views.setViewVisibility(R.id.next_event_difference_time_rect, View.GONE) } @@ -227,12 +230,14 @@ class LeftAlignedWidget(val context: Context) { ) views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE) - // Second row - views.setImageViewBitmap( - R.id.sub_line_rect, - BitmapHelper.getBitmapFromView(bindingView.subLine, draw = false) - ) + views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE) views.setViewVisibility(R.id.sub_line_rect, View.VISIBLE) + views.setViewVisibility(R.id.weather_sub_line_rect, View.VISIBLE) + views.setViewVisibility(R.id.first_line_rect, View.GONE) + + views.setViewVisibility(R.id.sub_line_top_margin_small_sans, View.GONE) + views.setViewVisibility(R.id.sub_line_top_margin_medium_sans, View.GONE) + views.setViewVisibility(R.id.sub_line_top_margin_large_sans, View.GONE) } else if (GlanceProviderHelper.showGlanceProviders(context) && bindingView.calendarLayout.isVisible) { var showSomething = false loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) { @@ -354,15 +359,11 @@ class LeftAlignedWidget(val context: Context) { if (showSomething) { - views.setImageViewBitmap( - R.id.sub_line_rect, - BitmapHelper.getBitmapFromView(bindingView.subLine, draw = false) - ) - views.setViewVisibility(R.id.first_line_rect, View.VISIBLE) - views.setViewVisibility(R.id.calendar_layout_rect, View.GONE) + views.setViewVisibility(R.id.weather_rect, View.VISIBLE) views.setViewVisibility(R.id.sub_line_rect, View.VISIBLE) + views.setViewVisibility(R.id.calendar_layout_rect, View.GONE) views.setViewVisibility(R.id.weather_sub_line_rect, View.GONE) } else { // Spacing @@ -371,6 +372,12 @@ class LeftAlignedWidget(val context: Context) { views.setViewVisibility(R.id.sub_line_top_margin_large_sans, View.GONE) } } + + // Second row + views.setImageViewBitmap( + R.id.sub_line_rect, + BitmapHelper.getBitmapFromView(bindingView.subLine, draw = false) + ) } catch (ex: Exception) { ex.printStackTrace() CrashlyticsReceiver.sendCrash(context, ex) @@ -542,12 +549,9 @@ class LeftAlignedWidget(val context: Context) { bindingView.subLine.isVisible = true bindingView.weatherSubLine.isVisible = true - bindingView.subLineTopMarginSmall.visibility = - if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.rawValue) View.VISIBLE else View.GONE - bindingView.subLineTopMarginMedium.visibility = - if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.rawValue) View.VISIBLE else View.GONE - bindingView.subLineTopMarginLarge.visibility = - if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.rawValue) View.VISIBLE else View.GONE + bindingView.subLineTopMarginSmall.visibility = View.GONE + bindingView.subLineTopMarginMedium.visibility = View.GONE + bindingView.subLineTopMarginLarge.visibility = View.GONE } else if (GlanceProviderHelper.showGlanceProviders(context)) { bindingView.subLineIcon.isVisible = true var showSomething = false 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 adb1dcc..ef013d5 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 @@ -99,7 +99,6 @@ class MainWidget : AppWidgetProvider() { WidgetHelper.runWithCustomTypeface(context) { val views = when (Preferences.widgetAlign) { Constants.WidgetAlign.LEFT.rawValue -> LeftAlignedWidget(context).generateWidget(appWidgetId, min(dimensions.first - 8.toPixel(context), min(width, height) - 16.toPixel(context)), it) - Constants.WidgetAlign.RIGHT.rawValue -> LeftAlignedWidget(context).generateWidget(appWidgetId, min(dimensions.first - 8.toPixel(context), min(width, height) - 16.toPixel(context)), it) else -> StandardWidget(context).generateWidget(appWidgetId, min(dimensions.first - 8.toPixel(context), min(width, height) - 16.toPixel(context)), it) } appWidgetManager.updateAppWidget(appWidgetId, views) @@ -109,7 +108,6 @@ class MainWidget : AppWidgetProvider() { fun getWidgetView(context: Context, typeface: Typeface?): ViewBinding { return when (Preferences.widgetAlign) { Constants.WidgetAlign.LEFT.rawValue -> LeftAlignedWidget(context).generateWidgetView(typeface) - Constants.WidgetAlign.RIGHT.rawValue -> LeftAlignedWidget(context).generateWidgetView(typeface) else -> StandardWidget(context).generateWidgetView(typeface) } } 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 1901107..3503207 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 @@ -129,7 +129,13 @@ class StandardWidget(val context: Context) { PendingIntent.FLAG_UPDATE_CURRENT ) views.setOnClickPendingIntent(R.id.date_rect, calPIntent) - views.setViewVisibility(R.id.date_layout, View.VISIBLE) + views.setViewVisibility(R.id.first_line_rect, View.VISIBLE) + + // Second row + views.setImageViewBitmap( + R.id.sub_line_rect, + BitmapHelper.getBitmapFromView(bindingView.subLine, draw = false) + ) val nextEvent = eventRepository.getNextEvent() val nextAlarm = AlarmHelper.getNextAlarm(context) @@ -207,7 +213,7 @@ class StandardWidget(val context: Context) { views.setViewVisibility(R.id.next_event_rect, View.VISIBLE) // Event time difference - if (Preferences.showDiffTime && Calendar.getInstance().timeInMillis < (nextEvent.startDate - 1000 * 60 * 60)) { + if (Preferences.showDiffTime && Calendar.getInstance().timeInMillis < nextEvent.startDate) { views.setImageViewBitmap( R.id.next_event_difference_time_rect, BitmapHelper.getBitmapFromView( @@ -249,13 +255,11 @@ class StandardWidget(val context: Context) { BitmapHelper.getBitmapFromView(bindingView.nextEvent, draw = false) ) views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE) - - // Second row - views.setImageViewBitmap( - R.id.sub_line_rect, - BitmapHelper.getBitmapFromView(bindingView.subLine, draw = false) - ) views.setViewVisibility(R.id.sub_line_rect, View.VISIBLE) + views.setViewVisibility(R.id.weather_sub_line_rect, View.VISIBLE) + + views.setViewVisibility(R.id.first_line_rect, View.GONE) + } else if (GlanceProviderHelper.showGlanceProviders(context) && bindingView.calendarLayout.isVisible) { var showSomething = false loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) { @@ -383,9 +387,9 @@ class StandardWidget(val context: Context) { ) views.setViewVisibility(R.id.first_line_rect, View.VISIBLE) - views.setViewVisibility(R.id.calendar_layout_rect, View.GONE) views.setViewVisibility(R.id.sub_line_rect, View.VISIBLE) + views.setViewVisibility(R.id.calendar_layout_rect, View.GONE) views.setViewVisibility(R.id.weather_sub_line_rect, View.GONE) } else { // Spacing diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt index 707f29b..8d7fc41 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt @@ -21,7 +21,9 @@ import android.content.res.Resources import android.graphics.drawable.Drawable import android.util.DisplayMetrics import android.util.TypedValue +import android.view.animation.AlphaAnimation import android.widget.RelativeLayout +import androidx.annotation.UiThread import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.core.animation.addListener import androidx.core.view.isVisible @@ -262,4 +264,4 @@ fun View.setOnSingleClickListener(l: View.OnClickListener) { fun View.setOnSingleClickListener(l: (View) -> Unit) { setOnClickListener(OnSingleClickListener(l)) -} \ No newline at end of file +} diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_18.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..264233dac1d90d055c3c2d2cfbea101e4263df4c GIT binary patch literal 207 zcmV;=05JcFP)I@OwK@h>l*7d9d8NkxQ0i41utZkl+O@fI=6!g39xCi$y#3w|_KpBoH zK!sx(&>zEy$qnm)-txsZRIzZbh04S_uBkJzmh}R((%NZeG=`19X!){#&TS7)s1ItZ zNqkVs?C9Z4>c$FB^9wf?F*%@#$X}g2*h%^Cdwc4a-1}UwXags_UVOr1f|dXP002ov JPDHLkV1hKmStI}e literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_20.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..a804e134b6e9fad9bb6b941819678cd3ec6835e6 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfCAHnVv3=Ar`0KPT9-ZU?9+%t8Qt&!n{PHJ_cuySsZes+O);`F@cm!%N!;#s&Mh zg(ojwlf{rRC(mz>oBO$}k^-Z38k-XvEqkR}tarFvjy7d5u!!yb)1T5QQZk$SwMO5C zNtxFdbzb7%9@idiuVZ^WiBDE-;jNmUt|$JJ3NHTE_`;mcW~#huO(k2#6`&&-JYD@< J);T3K0RX}OPB#Dm literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_24.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..3a36a32c71e18378302f7e8970aa5173b3a82319 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpBu^K|5Rc<;ukGe-P+)KkjCJ8s zPY^aUoEDa&puCgG)>%M(2Ok4t2$#K$*QDSBk1v=0=T+uAULhaF5b@4gis9~pRRT?t zvOT;Fx<3lI>|Jqf@p0#?^WH?w@A&?VVNtE__5cB{Z$Q^Ec)I$ztaD0e0svSI BMb-cS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_36.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..6ad39c5e360633678eedc990e0bda6c04aedd34d GIT binary patch literal 292 zcmV+<0o(qGP)+B*R|;{DeZft zQDpgpkg#P-5`v1k0B|9m9?Q8WpB}3QtTN0n!_>>ARKnN~*j}8MK8Kbx_)5c4#?JW6 zS>8b3dAylyyki@weY9SwR%}BQbl#|r;@Nqe<2VZAG%R)!=Q-w9t_(Bm>o8XAUcS^j zR_{;;`cVa{=b)w5BdHs=)?u}({MI_msW7L*7K(P$vCw|Ca%3}YDc?DdGqRU|j7%&X6WBdAhso~xx;jrb%5;12CZ$uoDyptiZ#k&)gxqp4lHjalPoJ zt#AMR|6kAh^42%ztylRKbN{FQ(|*us6S3uQ`rrB=_H`c~*E1|Ld;GuUpqfu^%>R6$ z3t!&XYl-du`}|M--}{XGA+ozZwjIqs_Fs}S0&BCO7fR17CboFyt=akR{00BcpGXMYp literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_24.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ee41b43f83b854f4cb69437bf1aaac0bb91dc5 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8si%u$h{y4_*EaGVP~dS13`-I= z^Kw0%bFW2-_pZM@=Z1+(T{;%m_nvp)*xi1{_gjP11seqhzAua}kAmizG-yNw{R%L3 z+{)j{Imu3hcZz_&;`S!C$MyWxOr5*xgjcK*Pht}N+NBq-{PN3-@Cmmkzx~>I!;n9T XLFC~%1;y7u2QYZL`njxgN@xNA^~yYW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_36.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..3fa79acff23f6cfb75a743e71a0bfb7fce38cfdb GIT binary patch literal 275 zcmV+u0qp*XP)Py5XNz6?5(iUmXI)l!4Y%<1|TFbfT6K<0edHM025k6w5Rx6XzxAl{E^n4I0@mlKOI3VL+uDMT0v1Nsak z60F2eN(okZ!YT=tF?ygzGFgE%YHp;Fmwrl3H~H11)@=P<8p`JWw-zU002ovPDHLkV1fc9bbbH; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_48.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..5bd216f1d8cf67a96efd020b6aadfe7291dcc71e GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tcsbhGg7(duuOmvw?_fBA2m| z9OJb`?mdjm7Xo8fxnxe_m?M7I;y=6Nb@kh(tAlqj1YKIO;+Xi7V~Y}@*n;mumAJlLw%S}?(BcUY{zEY3i|(F zdBMwP^?EsV!GGU3ut)uWF2f?|z?%DC^1t-thui;qckp?N#|IUr&q~k m=}AS2{44t2C$x8Jurcr%rW6zxmaGE0hQZU-&t;ucLK6UNBu~%) literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_20.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..f19c9394c8afe44b7ad83109f9175bd54298144b GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfCAH7Ec$)5R21quh{cB7>FD%oZad? z<1AaI$~k47vO-4jBGrvM8rIL9p0&EI>;7ze=imQa0v#4EP%b;FePLHpgJF%2m+RWK zT_HzObnc`pPA=$=tm4!zW8Ss+iTQM%o?B8H`>&?=&uBUJ^YDzdQKg4wADs~MA;oYW o)A?TU$MTcP{ohYs{9cn?n|c1~xne;Rf$m}OboFyt=akR{034P{z5oCK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_24.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..33bcf6e04d23ef94864ac9d37fa15ded767a39f1 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8si%u$h{y4_*EaGVP~dU7xaNpj z&XlfcH}`P5O6{7@%J6gox5&>I@rNagVxJ&U*hNH!B%6 XwL~5sP-JNaI)K5`)z4*}Q$iB}AuK!F literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_36.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..4298f7fe20c7f33f9a86125e6e77665b0e0c829e GIT binary patch literal 275 zcmV+u0qp*XP)ohyL$s&(EsP0`uz_(Bl6hNh z@inuvlkq%@r4#m)Y;>qI08iE$*o#j}4eXoBFvAS%T>HfAMxPkp86%-)T51v}jDUve zX$V}f6q%$hSSEyJE?7h>K($0}1yW4rS_=2l56P)UpPbM-h+&4!1Y^O0qspUZ#ZA0j z{lu=~jkpJU2!AoX*j@PZ?8Q#PW5GZzUPK3;L2$`daFnxlWtd?z#8j6qn(HLhMVaMK Zc>{bU<8q3F%LD)b002ovPDHLkV1g1Oa!~*P literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_48.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..cd08e6e2d8e7acee84abc3d6edfb265bedbc64a5 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawj(EB_hGg7(dut?>nLnOL+r=Py_<^v3 z%ZHeZH`yDQPX52B5$67X`jK@X`?_3QRP(-=Hm{an^LB{Ts5!mlo! literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_36.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..3a36a32c71e18378302f7e8970aa5173b3a82319 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpBu^K|5Rc<;ukGe-P+)KkjCJ8s zPY^aUoEDa&puCgG)>%M(2Ok4t2$#K$*QDSBk1v=0=T+uAULhaF5b@4gis9~pRRT?t zvOT;Fx<3lI>|Jqf@p0#?^WH?w@A&?VVNtE__5cB{Z$Q^Ec)I$ztaD0e0svSI BMb-cS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_48.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..1fe59df922ab3e4ad1a0427851ef2a41b26e1e59 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DVow*xkch)?uOH+*pdjFKan72v z=eGE{-u|)k$t%al3Y^BgHaAkmzU`Xh-|DecsMLXR!HWiUHl9C{3KL%J@l+Q)=8)$8 zNg^YVAa#Bxwhy W>Cet6@9YO!&*16m=d#Wzp$Py!HbYwg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_18.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..19785fb63294884603d7bc203d1ad162acc2b6d8 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mLOop^Lp07OCn)g!nf_DWDgTe~DWM4fArUx| literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_20.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..f01c184d242bc056f860dd9d06cf5fc90e80c47e GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc0wmQNuC@WGG*1`D5RLQ62?}z5(*NcEoIg{d z_1*vf|I5|g5;+1AIdnz-J^!)3L6mEuw#`R*>mT3ZWkVm@%5eSvYwjAV@zefSy^UCg zS9Sd2sNAmThqi0t4lMe>a?L?e;(^nbj_gH~B{ymWDax){k`_3NiQ%Ep W)349lKgIwJWAJqKb6Mw<&;$U)PcJ+G literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_36.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ee41b43f83b854f4cb69437bf1aaac0bb91dc5 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8si%u$h{y4_*EaGVP~dS13`-I= z^Kw0%bFW2-_pZM@=Z1+(T{;%m_nvp)*xi1{_gjP11seqhzAua}kAmizG-yNw{R%L3 z+{)j{Imu3hcZz_&;`S!C$MyWxOr5*xgjcK*Pht}N+NBq-{PN3-@Cmmkzx~>I!;n9T XLFC~%1;y7u2QYZL`njxgN@xNA^~yYW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_48.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..4cdacfa6eacc2fba9f5af6809a03b16fad0b87c1 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Da!(h>kch)?uOH+*pdjE9=zlFO zJu1Cv+s9(gCqe;J6rIwfDmI+f$>BI>rdU`sspJ6TfrZTPBn%QBFm|L!8E2*>$!n}x z@}+SX%N1URpB-1c%P#UrNNC-vUf9-XR4LTfXjOUT8{-q@ApM)J#vi;L{;{mOAMt#1 ZOoiX{XAd_ey#_jg!PC{xWt~$(69A20L5TnW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_18.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..1df81b4c5bdc6dda613fc9cf059e72de4f40bd42 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mqC8z3Lp07OCoGWp!~a*`IpX5` z|E4XXfB(n(?^*O;>;LvY_xl;Q{|R>t3;7^#t>F-Mwo)?zbsI36}4z?5aUxfZ|d~a5@2BXTRL}5|E({TKwB6*UHx3vIVCg!03@?IHvj+t literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_20.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..41314d0c419cf06c9a19a32916caa520e18703ac GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc0wmQNuC@WGEKe855RLQ62@Ax2od0wGlfAJa z*WLgB|G)R^IV7;)kU)^=Kk;Ad8$^p1X#83K@Bi)kHxF1=IbHt$zd&P8d*0TU|0{G1 ze(hJ;IZx49u}iriy7%GQ>K!7B*spNj3FCgqS#ayutVt&F*)`5!Jjc@HZ_1gczMZkVuqBg;qiSGNpgnxw%}%^MU3uc)I$ztaD0e0szPIF023m literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_36.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..33bcf6e04d23ef94864ac9d37fa15ded767a39f1 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8si%u$h{y4_*EaGVP~dU7xaNpj z&XlfcH}`P5O6{7@%J6gox5&>I@rNagVxJ&U*hNH!B%6 XwL~5sP-JNaI)K5`)z4*}Q$iB}AuK!F literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_48.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..cf318945e79d4836e37e23c753a76c3e6e6fcd53 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DGEW!Bkch)?uOH+*pdjE9=zlFO zJ!<))+&?izeSw>gw9MRXb0bx(#P4S;hX~g}z7q^7)(?6Z7~@$!xJVgiy41*ftWo*e zxQpcqFT-cSNc~7xVTA{e9QQY5yY8-Zx?~d|Z&mi5@tN|bxJ_MZ4hQE}E Y!)*Gq8CtjefG%M0boFyt=akR{05wlOPyhe` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-hdpi/round_align_horizontal_center_24.png b/app/src/main/res/drawable-night-hdpi/round_align_horizontal_center_24.png new file mode 100644 index 0000000000000000000000000000000000000000..48c3e74a59e3600760d59fdb8c0167341cbdc31d GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8Lp98VX=kcwMxuXzhLD2TKsu1#QY z-cg>&Jn2Qmft{Qu5`?ucxadB}XDDz;eb{_>(#-tB51pp{H5b{kMdbTJDaRG>oq3xs zsAy=pc=ktRrz9nny!kREFYRHD7`yB7sU>Dh^c+vM6`8!&OmSWARL8gI&<0t#Uu_Gy zntQf8s`1R)dqIXRQ(xp-Mv=(jhZ2%9-?c?QWd>|fx4x$SXzxu%+hG2)TXRw;1Kr8s M>FVdQ&MBb@0GrrQi~s-t literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-hdpi/round_align_horizontal_left_24.png b/app/src/main/res/drawable-night-hdpi/round_align_horizontal_left_24.png new file mode 100644 index 0000000000000000000000000000000000000000..47745139ed33012c407bb77c510796acc4e8ee6c GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8v!{z=NX4zU*UoYtP~c$;*gZ*m zN5f|k5%q#?Igi-tmVVL5RAON<+*w&M{m;ug?;0DV4>Eaac!&j5es|k0wldT1B8K8lc$SgNX4zU*A8+XP~c$=*gZ*m zN5f|k5%q#?Igi->1yz}Dn<%s7$#ac8-JVx0Pit^k2%0QtX zGv_ho{eS!4|3CfwfBxKWTlMgBz0(8ZR5PCTgrkp3YwjHt+%bP;`r!hOFs@A+qKphN X2XB;0pWsLU8pq)2>gTe~DWM4ffMzU= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-mdpi/round_align_horizontal_left_24.png b/app/src/main/res/drawable-night-mdpi/round_align_horizontal_left_24.png new file mode 100644 index 0000000000000000000000000000000000000000..ff42ba088c35bed5231bd150b640dd136e264246 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1XHOT$kcwN$2@AM?$p5vUWx~t* zU%IWk?SJn7`hUk+>;B~*zVhLxz1@eIMbd4l8bP0l+XkKkSZ;8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-mdpi/round_align_horizontal_right_24.png b/app/src/main/res/drawable-night-mdpi/round_align_horizontal_right_24.png new file mode 100644 index 0000000000000000000000000000000000000000..16d5034d51d542cbb708c066d98eddcdcf0a35e2 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1S5FtmkcwN$2@)m`>c9NYxMX7T zCtu=>)W7Y2|NoR1|M7D_Z}8#g|9>1vKb0%Ncd$#TQI4U-rdPGYKKOduLxD9Rrx&F# ZGjxSqYP==euL3lX!PC{xWt~$(697z2FAD$w literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xhdpi/round_align_horizontal_center_24.png b/app/src/main/res/drawable-night-xhdpi/round_align_horizontal_center_24.png new file mode 100644 index 0000000000000000000000000000000000000000..aa4e2b45787d5145620643f5312a9fdc7836768c GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Da!(h>kcwMxuW#f%puof8pkb^@O4>-Y-3b=>d{yU4<^;up)N{TsPd Z&CjPK`7m2a?E*T1!PC{xWt~$(69CA{K!yMS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xhdpi/round_align_horizontal_left_24.png b/app/src/main/res/drawable-night-xhdpi/round_align_horizontal_left_24.png new file mode 100644 index 0000000000000000000000000000000000000000..8a8570f696c5f938c7091069b2109b77f1aef01a GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D8c!F;kcwMxuW#f$V8FxT5Pt6n zcNWw1Pm7`+2QTpu-Y~H;>BN3^iwPBt-hq9bQao+Pn0aJnk1_xH%fcb>fnh}fixH>A zD;bF!o#z{GFg;>8a8o%+KhjlLAz@|4`_?Enw@)fM%oA<0o->@26RbX|HLD?>>5IR@ eZ|T)F)3~R+_o}%N=5QY94hBzGKbLh*2~7YffImq9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xhdpi/round_align_horizontal_right_24.png b/app/src/main/res/drawable-night-xhdpi/round_align_horizontal_right_24.png new file mode 100644 index 0000000000000000000000000000000000000000..b070723e4076a764a93669cf5c13e1e84494fe44 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DDo+>3kcwMxuW#gSFyLW15OPz6 zyQ*nQTHyMRB41dN;#j`Sx3W4pO?Rir({jh=gBL0q7A`(q;b1?Hfia#X;33Bul?N-5 z6P(rT*pyh0Fg0xUK9aYI&9|XpGXG=7GrYHs>c0N$V6)}TJ?1&FN@bHxGniP`RIqG1 dAMv!T?4y-e&FYq8(}1pE@O1TaS?83{1OTS(LTdm3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_center_24.png b/app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_center_24.png new file mode 100644 index 0000000000000000000000000000000000000000..94806cdb6bdef10bc37fdd1c118c0c28e21eb175 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~dVo)eE0F$A1XyS5WeHTuTN30K z%)sJOQry5?e&*-@1D}0<`KACRW_Y?dhE&{odn22RS&@e&Ve*?f zjY*8XJSGL|hwcmhyV|Als>9d2;{xA>J4_vMYi*5fi-gbBHz}DW7Dp!>@MGD%`2W7B wiR(*`#3{REB%fGT{N_ueLe{dN8S2kiT^f`tV}v?ffNo^)boFyt=akR{0ELl(N&o-= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_left_24.png b/app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_left_24.png new file mode 100644 index 0000000000000000000000000000000000000000..0ed8123a2635ac0b483d37ac4168abd81bb6ef8d GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xZ3?!EyURMI7)B}7%T!Hj|BEULZFH4|O-jX1{ zU?u^9P09MZsyeH;^mdS z)a53+G4xDSD`VI;^#vNI;#x&>oC8BzV=oqoxW?WPUF#57!nJ#m>5*A3H++};?h|yk z;9b4MXqKSBM=s`yNvF)-bgjB@Ns8xz=RWNRn<|VBNfr4XDiLPgm+Zp3{NZFSH_@4G kZ2>DkDx|DAVbH|Lkfknt>vE|~9nfJ6p00i_>zopr038^3oB#j- literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_right_24.png b/app/src/main/res/drawable-night-xxhdpi/round_align_horizontal_right_24.png new file mode 100644 index 0000000000000000000000000000000000000000..6c9e01288ec228a7e2c17e876172757916c8cdb6 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xZ3?!EyURMI7)B}7%T!Hj|BEULZFH4|O-jX1{ zU?u^9P09MZsyeH;^mb+ z)8!_*G4xDSD`VI;^#vNI;#x&>oC8BzV=oqoxW?WPUF#57!nJ#m>5*A3H++};?h|yk z;GMn1XcfmqWe)cOvv*6H7(#al%QBTb^xMZ#z-6jDAzNtK>=PelmE3#Q^cbu4*2kCEaH-czgEjmlwSA59kpFPgg&ebxsLQ0I(35RR910 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_left_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_left_24.png new file mode 100644 index 0000000000000000000000000000000000000000..337f90bc8a17956ac5d46e66fe608259f010e2e4 GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3-2k5uS0MeLXt2;@^=zO9{*oZS zU0q|D^6|x3&1+?O*+{+t}a-&z+Cnik{6<8?rrbpVMBv iX(Gen2~3L_81B4_pC)^F|8$@?7(8A5T-G@yGywp92#s0* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_right_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_right_24.png new file mode 100644 index 0000000000000000000000000000000000000000..55402353b94cedbbb33473432e976a0b3eefb46d GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3-2k5uS0MeLXt2;@^=zO9{*oZS zUgN+K>NqF#t|Fa8)chit2b`f zygqsFIvwe2r>`}yY5pZp&ENKQ&EF3<#95C1zh1u~_dQ?Sx9F97ZcX9PIkSyJ=1dmL zwKQv%H&Yu9#5XMS&$pJf)mSD{vfKK?vJLIbu{`Jacno(~7#w@h#aOTM@6w;mpX87C zx3OioF){g`XInAjkl@#?AB8@Yew_7@_oLG1UgI!T=06jEcz-^Bs$RxkYL*2fW7Wso o${S2p+gDefT^%~J*7p_Xo1^j5=3Hed2l|A;)78&qol`;+04vg|k0wldT1B8LpBu^K|5Rc<;ukGe-P+)KkjCJ8s zPY^aUoEDa&puCgG)>%M(2Ok4t2$#K$*QDSBk1v=0=T+uAULhaF5b@4gis9~pRRT?t zvOT;Fx<3lI>|Jqf@p0#?^WH?w@A&?VVNtE__5cB{Z$Q^Ec)I$ztaD0e0svSI BMb-cS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_20.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..53577be53eb7473c049200d448e1f1538c6df46f GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU0wmSG7d!(}^F3W0Lp+YZy|$3I)j*^*u_>Lg z?U2C%W1irvq91w=ahU1^^!}A>xcnsO7thY+n@%qG^S@OpC(6duxKLJtf#dA~-iEUW z^&5K5{5f)y@y64;XCfY{`DGOuWf}y|UUD#oH;wmLmO<8r^u(#p86Ifd(fbmY!~UK% zXlrGVSn|=uvS;+=?sU)eD7#>kvh<>n@7vmh)0mdKI;Vst0OVv?mH+?% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_24.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..1fe59df922ab3e4ad1a0427851ef2a41b26e1e59 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DVow*xkch)?uOH+*pdjFKan72v z=eGE{-u|)k$t%al3Y^BgHaAkmzU`Xh-|DecsMLXR!HWiUHl9C{3KL%J@l+Q)=8)$8 zNg^YVAa#Bxwhy W>Cet6@9YO!&*16m=d#Wzp$Py!HbYwg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_36.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..6261b302605b26eecc4353e628c83445715bb195 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw_ISEDhGg7(duuOmvw?_fBA0|@ zKSTD;?Gnsv1@5K6s$QazU7t&m=NcbWe==YFVWyJO?=2aZmwL|@j7%&X6WBdAhso~xx;jrb%5;12CZ$uoDyptiZ#k&)gxqp4*KFFU=XL&u6i_@9S&vS{rGkUCFSKbLh*2~7a@(sbbf literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_18.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ee41b43f83b854f4cb69437bf1aaac0bb91dc5 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8si%u$h{y4_*EaGVP~dS13`-I= z^Kw0%bFW2-_pZM@=Z1+(T{;%m_nvp)*xi1{_gjP11seqhzAua}kAmizG-yNw{R%L3 z+{)j{Imu3hcZz_&;`S!C$MyWxOr5*xgjcK*Pht}N+NBq-{PN3-@Cmmkzx~>I!;n9T XLFC~%1;y7u2QYZL`njxgN@xNA^~yYW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_20.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..e6b495235630129cf8ffd69ed10c0a35e6780b05 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU0wmSG7d!(}vpiiKLp+YZy{66AU?9K}&~zw4 zFosn}>@cIjoYs(s976Y{4@zFJFsf1UHQODqeePF(U-e$4wT@iHv9I_|b|n94{KlBe zVA^=%;)2xp))tn);;PsIG&N!&@gaok1S9=6_E2)AyRs~5>J7^ z)ESIH literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_24.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..4cdacfa6eacc2fba9f5af6809a03b16fad0b87c1 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Da!(h>kch)?uOH+*pdjE9=zlFO zJu1Cv+s9(gCqe;J6rIwfDmI+f$>BI>rdU`sspJ6TfrZTPBn%QBFm|L!8E2*>$!n}x z@}+SX%N1URpB-1c%P#UrNNC-vUf9-XR4LTfXjOUT8{-q@ApM)J#vi;L{;{mOAMt#1 ZOoiX{XAd_ey#_jg!PC{xWt~$(69A20L5TnW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_36.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..5bd216f1d8cf67a96efd020b6aadfe7291dcc71e GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tcsbhGg7(duuOmvw?_fBA2m| z9OJb`?mdjm7Xo8fxnxe_m?M7I;y=6Nb@kh(tAlqj1YKIO;+Xi7GpEDiy8=%7}oU4&A9N#*zqL)3A3d>%m4I- zlmyN9+ria3J#^QnhCSTT$(0WGmL3&7@HY>)A=6oJ@^tlcS?83{1ONsicKHAR literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_18.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..33bcf6e04d23ef94864ac9d37fa15ded767a39f1 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8si%u$h{y4_*EaGVP~dU7xaNpj z&XlfcH}`P5O6{7@%J6gox5&>I@rNagVxJ&U*hNH!B%6 XwL~5sP-JNaI)K5`)z4*}Q$iB}AuK!F literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_20.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..452925e7edcb6a892f633a576a67a06eede45e57 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU0wmSG7d!(}^F3W0Lp+YZy{66AU?9K}&~zw4 zFosn}>@cIjoYs(s9;*Ayn~WC}ru=xZX~P8pkFslK=S!?tKKK0L$g$P$1z*UGMRyw0 z*n1o9vkNLXS5|TzQR(2Yt(Z9>IDxm0jq8f}fr(7QXL2?y)K_)w?lTmviOgZlbzd3! zX#Lrjo6KVZ>?^9mHq-_1g-uvzvTGmTiN}|0wIhIP?*BWt^IyR~U2g3=2j+iUZw~SU NgQu&X%Q~loCIF2tQ$qj% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_24.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..cf318945e79d4836e37e23c753a76c3e6e6fcd53 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DGEW!Bkch)?uOH+*pdjE9=zlFO zJ!<))+&?izeSw>gw9MRXb0bx(#P4S;hX~g}z7q^7)(?6Z7~@$!xJVgiy41*ftWo*e zxQpcqFT-cSNc~7xVTA{e9QQY5yY8-Zx?~d|Z&mi5@tN|bxJ_MZ4hQE}E Y!)*Gq8CtjefG%M0boFyt=akR{05wlOPyhe` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_36.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..cd08e6e2d8e7acee84abc3d6edfb265bedbc64a5 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawj(EB_hGg7(dut+S8`yv+s@u8CUu z2YWV5O>dl}x?oWgV_ug=kkHbNIR?|`YG4!GO6>;^|v-V&cb z-K;7F(! nIQLIu(eK27-;Z~=xRhk@tG@T}wvy?c3zGMA^>bP0l+XkKE30+B*R|;{DeZft zQDpgpkg#P-5`v1k0B|9m9?Q8WpB}3QtTN0n!_>>ARKnN~*j}8MK8Kbx_)5c4#?JW6 zS>8b3dAylyyki@weY9SwR%}BQbl#|r;@Nqe<2VZAG%R)!=Q-w9t_(Bm>o8XAUcS^j zR_{;;`cVa{=b)w5BdHs=)?u}({MI_msW7L*7K(P$vCw|Ca%3}YDc?DdGqRU|ST5QX71YygAMLd^__9grf*RET-lzzt)-1T+*VB@KUyD5S%|#*irY+*6;8I|L1s3>yXh2G-Sj7%&X6WBdAhso~xx;jrb%5;12CZ$uoDyptiZ#k&)gxqp4eJ%V z@UUBlU4IliF1wqM`ZMk(@3qfz*NU5Y_q6lgNzi?tsB0b(XTCnt{Auj^Zuz*wc6Z(< zTlVY!sD3)>&LZwx6(?`4nDAwx*5YkpRu#@x8B4brXYuMcnk zhen?bsS#bh{&evDyqGKXyr&oK`>V8P#sR%!+(E&cujd9w-#Ev!ZFB3~GYRU^H!kv& zZE4j#o8TQCah&Jc#@5uHWd_opKQ?o*ZQfk_C~=~&?((0)?K{oS3io~!dh{tP>&plG z&fY5}^Yl08GQxrZ5+46W#ojoo9+cA+ewFBOQ0~5n>p{64t}ZSv^{<5&Oe$HdYA(AF P7Py5XNz6?5(iUmXI)l!4Y%<1|TFbfT6K<0edHM025k6w5Rx6XzxAl{E^n4I0@mlKOI3VL+uDMT0v1Nsak z60F2eN(okZ!YT=tF?ygzGFgE%YHp;Fmwrl3H~H11)@=P<8p`JWw-zU002ovPDHLkV1fc9bbbH; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_20.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..48d08f1a8161f0134cb4e1715b6e374deb302584 GIT binary patch literal 254 zcmVVU5ClLH%Ag3xR7C|Yhz?E^;w~)o367TFU!Q?&vlt2Ox`2s%x4N!Vl>37L3qDvd zw1y4eSZjFu!CPziAHjkJ3nsxBF~MJa6UHJKJ!Y^nqtAyunDO~=pu!;^j#N12!$yTI zA9hGIHo+BqCpZ|^%jgO_U^Te}3l{tyID2HC4aIV}a7m;pnz9y+1xL!NuYd!k+*H7x zQs*k*vU+<|U~et-XO&%(OR!+UuREeXb~b+MP_8K4>|3z0z(zBTzyJUM07*qoM6N<$ Ef=`8JE&u=k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_24.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..5bd216f1d8cf67a96efd020b6aadfe7291dcc71e GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tcsbhGg7(duuOmvw?_fBA2m| z9OJb`?mdjm7Xo8fxnxe_m?M7I;y=6Nb@kh(tAlqj1YKIO;+Xi7yU#;d!gfc zg@~w1wcj$1%QoEzK60=52zN%J=8_LgFSm8LJlX$rQ{LnQ)xXo)-+yMY=Sea8JmY3h zM@Pp$_gUG?yX{IZ`hA`hpN24UEieJQ4;F z#+&|xsLa)S?U?GSbGH^XX0BWu*Y#%U;%UbW)|Q6z-Q8-|lDTko(aTk>vTK6;Ld!O& zX-6cpzuweTTDHMXJ0hPwdvnv)vJF<+5xMNQGfuRbW+eY?^1FFp($`5^sUOz!3j4i3 zrr)&nqNBO3vxooP5{aJzpKdb2ZHF)_5Av^M1BkmAfc0uKjhW$(eMSq&Er8ueop4HKhL0 z==wbARMC@+TOTI;e|0a#Bj?u+@%g%_e%4`+*eE_#q+M ZUwUXMtoYpTJ1}M#JYD@<);T3K0RYpc#&iGx literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_48.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..e2b2f4a13e6c7f7928c1313f9f437b4343de153d GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=oC178T!Hj|$^b|Fr8b}`VkJR- z!3=CU$397&`+qk3xXbKYpVbc7y*oJTMy1N`6b1%HO-~ockP61PcUadQb`W5>ct9;V z?f(B2^8?=mMrFB%s#m1lu@w{)v<-iLdh3+ePv1P+dH3<+-)B?)hI|Zty0P!okCodP zO!qH1#uQTLc$7(`o{5D+K*6Dbff2$;Td?hQdqsxx{jHf7ELxXjo@soh>Y`iBW}>H< zEh)Ufv}Nsa$6SwW{^o5Hw#l-+Rm`>L(NbLdqxp~d%&&gA1vh@rm-srJ?{fF*|8Lv> z^Ukt!XkdYw46@?L>_7M054aq1f0=m&Xz))Z#fhIv&lq(%WUEA*E-<^aRp^4)OEb=l z{*v7+Axg0y*?#65{hxd5|Az1OhOhKx*~G*D-{$`>ZSrmohyL$s&(EsP0`uz_(Bl6hNh z@inuvlkq%@r4#m)Y;>qI08iE$*o#j}4eXoBFvAS%T>HfAMxPkp86%-)T51v}jDUve zX$V}f6q%$hSSEyJE?7h>K($0}1yW4rS_=2l56P)UpPbM-h+&4!1Y^O0qspUZ#ZA0j z{lu=~jkpJU2!AoX*j@PZ?8Q#PW5GZzUPK3;L2$`daFnxlWtd?z#8j6qn(HLhMVaMK Zc>{bU<8q3F%LD)b002ovPDHLkV1g1Oa!~*P literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_20.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_20.png new file mode 100644 index 0000000000000000000000000000000000000000..be140dd3246a12060a073bfcedf6c8ff9c7600d6 GIT binary patch literal 257 zcmV+c0sj7pP)ST5Cu>g#$X87OvMBqhz(8*;w>zc2CAPTQIsmWFHR;2|9gN}`R?nwPEme27_i`m z1w(7t@QAgBwtS?-y|bEJf&~k{AnYEfu_KdQA>5Mq2(wGmqF}Zr)F_xOMkNYn zt6+|Tx$?`@TL`&00000NkvXX Hu0mjfEaqsx literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_24.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..cd08e6e2d8e7acee84abc3d6edfb265bedbc64a5 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawj(EB_hGg7(dutfSu zE-opPpWS-3rhM+!t2XM_0_V$aUbyno^;Izm%f)YKir@IlT6UiGn{L8^21aH!9ti_5 z;~RTIROaHj_k?Q7Ze=`Wx*WuAJ9X1?z9^}~Tdw&E?#j&Nxa=hE`f^dL?3$1zUe*!9 zT-RnRTTzBYz*6aNtp$+-DKi=NS zzBE5U^w#TD?n0NG!{63daa86q!fl5zoDTP}ab0v{KBlZNKk=MK*q@KLSF{%tNFEej znHbmn(aQA9YmLReyq~RVUIicC)5pF0iots3dul*ok9|J8pCcD-h-sJb-5g)NF*aeQ z!{(TfPZ5^0S~f@MevTG;ypdkX)g!ivPfe-b>a%S+w633WKMspUXO@geCy(%eub+ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_48.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..35d53dae3e09447c64841f8caf4e1235472610ae GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=oC178T!Hj|$^b|Fr8b}`VkJR- z!3=CU$397&`+qk3xXbKYpVbc7y*oJTMy1N`6b1%HO-~ockP61PcU&j27z(f)WIP*U z{Qdv@T|U<*<<5Gl_=xph&!yHZWhJFu_uehNlOHaA{;{OIt-RXn<(=!L`b)1I^Iyxl zqI?|yEHC^U7#NvYI0O_NK#VK=k4669GU2N=&4_clWOTjpnyyQ3HgCo~ zr)y^64c`Q|J$J12czt<+@)Ft13zC=4nXG8plEl90cFH^Jt^X6>*C$u!z0#x1|DJC1`Mj)Nc5>GB{TsZlzK(zS)ar}AZSmY+ z*AMOV3JL$?_;2=^`sLT;zx`8p`|sWU|7d9a?}zoxX;7!a+?@2GEUCg;n1N%N#{?gx hgC^20E-p=RjLo-7dbOpdT>%CwgQu&X%Q~loCIB3mj7%&X6WBdAhso~xx;jrb%5;12CZ$uoDyptiZ#k&)gxqp4qHApVdGt?A;;{^Cx&cHe9Nw^3XK%;S_vJOLjMVqFWW~Uu?Hst@+8=l(C z3=>5R!!YmQfHTfGgvvW%1OSXUg~*FvyeBaZ518RIS$M#51uO|9kU#pB8@w6G67ERz}W;iy8{Ok;NT9dO@Ote z0q?!@dQroV1T7YCxCO2Fsg5F~C~$E;*VQMlf|~_W77GLtNFad(61WrKmjc4ASlF^K zP%6QGE3G^ivHb>rqm9gOQwU)TTDn zbRA$;n>^Dj76>GeKmrLQkidU|!7rDEzMdESg5#^X4|zqDVHlG<0DMDoM`hQb%K!iX M07*qoM6N<$f&=i8xBvhE literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..07e95ef36794e993f4c6a29b98d7b9322dbe2f5b GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgetWt&hE&{odwVZ$vw?_fqSmwo zw;QK6JG@j~u&9Yq&s9XzQ@HVqOnlKfmYPTB`5!J*R8r#doI6QO*XxxHfBn_XS0^l3 za($9~LLKv&x`uwBiE!|MHDI;l;*KFFU=XL&u6i_@9S&vS{rGkUCFSKbLh*2~7a@(sbbf literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..108f15c317e18c50163754375ebb2f04aa5fc629 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=oC178T!Hj|$^b|Fr8b}`VkJR- z!3=CU$397&`+qk3xXbKYpVbc7y*oJTMy1N`6b1%Hbx#+^kP61PcaCm7;=sciICJLP zKhA#*_FTDO9d)I5!I|7F;{yx~p0l1-PE!+e2@F$DO;l7VEe%u`a}2&~BIX!UB}K7#JAmd%8G=R4~51%i4F?fyW_G zeQudd+K&IO(<5ixY|{N(-@N?-pQqR^R~HbN@^ra?U!|Izb^M}zqWbBDH+EiF&(+@) zR3Fl{d(#U0u9+3u*W;f)TI*FG+PS^ypH|2AFaAJ>6bJ(eEZ~ao?XSNU{92cr_0#{b z#MgsI3nx5T7RP(Vf6|RTD>|n|PMRfVddbMs$vMEdRguwP)j~JR7}=`<8>cN^o3$#m zZ`;b1W|p_sExUF3zSRwl9qd2;3xE3W|K@-4mH*;1|1WL%e{|0Or(6E>_Wsvh`rmi& z|720WXINYT6?!QyU#D->W;kny*QU~+*Zqr@KRbG%G|TC7(sQTVx2i80oOmnkYx`=$ zw|OSlie85$^Uq#m>w5diwYSIQzDHK~Nis&Kea8{3*saedlkNdy@?s9%p=PTa(+;>iabbGq` KxvXy=6Nb@kh(tAlqj1YKIO;+Xi7vJ=xgI4d|o;6)g50RHs{HFPuwLUrWC*5srU2$Z>IZ~zS%F| z9+D*S?0gf$-P4>kPfI5}nk6DDUpdwKz1x}}>^vW5T(D30!qUT`GQoj~6GYfEE$ZS- z+Pc}{Fh_@7*@d%$#fAcQNJf0cW%zUW_j!16MWIiYJ@!F+! zl>?_3^{XxW#rLqUj(D`>)a?biKUO;PGWUd@Kh$)=2g~>$zPW3K_%U6%Dp4uk5;N_=`RsZFttiRuN zEh|1QK}=sQQVi~3Ylrvx(|^|4p8w6=_nqGpEDiy8=%7}oU4&A9N#*zqL)3A3d>%m4I- zlmyN9+ria3J#^QnhCSTT$(0WGmL3&7@HY>)A=6oJ@^tlcS?83{1ONsicKHAR literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..e2b2f4a13e6c7f7928c1313f9f437b4343de153d GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=oC178T!Hj|$^b|Fr8b}`VkJR- z!3=CU$397&`+qk3xXbKYpVbc7y*oJTMy1N`6b1%HO-~ockP61PcUadQb`W5>ct9;V z?f(B2^8?=mMrFB%s#m1lu@w{)v<-iLdh3+ePv1P+dH3<+-)B?)hI|Zty0P!okCodP zO!qH1#uQTLc$7(`o{5D+K*6Dbff2$;Td?hQdqsxx{jHf7ELxXjo@soh>Y`iBW}>H< zEh)Ufv}Nsa$6SwW{^o5Hw#l-+Rm`>L(NbLdqxp~d%&&gA1vh@rm-srJ?{fF*|8Lv> z^Ukt!XkdYw46@?L>_7M054aq1f0=m&Xz))Z#fhIv&lq(%WUEA*E-<^aRp^4)OEb=l z{*v7+Axg0y*?#65{hxd5|Az1OhOhKx*~G*D-{$`>ZSrmUB}K7#J95d%8G=R4~51%ewBcfq?5p zv%=S$#&7Bu&zE$Oe0uWIUhNl}M^%1)GF1YBMcLEZC!}BZo^|)##kj8T(UaEi-_YMB z!n(9}rO$`o@^8IA&XQ5soS%A^cW%i2t-f!$ zB#vdMiyuG8Z}3%Z#r!=CpOYp{yUA{#tCls>hQZk&GO>W6M=i&OZ^dHH?yrdlvMyaa z+;DbDZad>{&)fXWO`hBgSK<}xj=b6*D3@}QU-e0|W!vRnoV>waHM6Ve))^3;)%V{*E(!IarxhCj`+Zy^Uzec{=h-$0tbag79kHHv5Rd{mt@jr zV<%76BO>ZI(z^R3It-ms`nxzfY|1z$N3i86hnN{9=u3RiV7}JGDEv}2l8wo4$pMab zhCN5Co9Dfg%}Ge@vQGZ@Gi3R{R{`$w&XX^@&OFKlHU1xOKtM=~w%C!>NU^8a#BE{| zS8GP>XUU3g?$k7Bex|jN_0{dmi**C;KgiE%{3Ym_!xh3mbIIYwAuc~>_!-xEyH4S? z+RA)p{;zIMl?e_^K;nQr;*uRHkB@5^4LQwBX2;^ndvm<>K%J`4;<22WQ% Jmvv4FO#oLPj+S8`yv+s@u8CUu z2YWV5O>dl}x?oWgV_ug=kkHbNIR?|`YG4!GO6>;^|v-V&cb z-K;7F(! nIQLIu(eK27-;Z~=xRhk@tG@T}wvy?c3zGMA^>bP0l+XkKE30?|yEHC^U7#NvYI0O_NK#VK=k4669GU2N=&4_clWOTjpnyyQ3HgCo~ zr)y^64c`Q|J$J12czt<+@)Ft13zC=4nXG8plEl90cFH^Jt^X6>*C$u!z0#x1|DJC1`Mj)Nc5>GB{TsZlzK(zS)ar}AZSmY+ z*AMOV3JL$?_;2=^`sLT;zx`8p`|sWU|7d9a?}zoxX;7!a+?@2GEUCg;n1N%N#{?gx hgC^20E-p=RjLo-7dbOpdT>%CwgQu&X%Q~loCIB3mUB}K7#J9*d%8G=R4~518{WrcDBv2n zfOp+F%Qy9lCx6bbtcciE&MFgR?P(_n2DU}dy#<{LE$4rFQ`P+~Y)|awn!ihHL!W7^ zc;g=0cK?5deb@6h4C249s#-hb?q9W;ndNur3BH7SCZJ=mf`7UUzPGa@2B* znad_`+s)YSX?>?5;Sv+W*YFPcjlc4zu+OZ~IGEsPHz&<$^8YD8_AApPTc=uLbpc4Q zA>Uc0nYXX7>yWNm{pSUDo_yZE=2UK2{pVG8UVJlWdl|@FKl$H=_SI^y`fu;J^@V+2 z&D&qf>HGNpF0_w7I7y7*$v4qQ?rZ)@KXp`-_cE9 + + diff --git a/app/src/main/res/drawable/round_align_horizontal_left_24.xml b/app/src/main/res/drawable/round_align_horizontal_left_24.xml new file mode 100644 index 0000000..5034ea2 --- /dev/null +++ b/app/src/main/res/drawable/round_align_horizontal_left_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/round_align_horizontal_right_24.xml b/app/src/main/res/drawable/round_align_horizontal_right_24.xml new file mode 100644 index 0000000..9092905 --- /dev/null +++ b/app/src/main/res/drawable/round_align_horizontal_right_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/layout/fragment_app_main.xml b/app/src/main/res/layout/fragment_app_main.xml index 3be5427..d02520c 100644 --- a/app/src/main/res/layout/fragment_app_main.xml +++ b/app/src/main/res/layout/fragment_app_main.xml @@ -96,6 +96,8 @@ android:orientation="vertical" android:id="@+id/widget" android:alpha="0" + android:paddingStart="8dp" + android:paddingEnd="8dp" android:animateLayoutChanges="true" android:gravity="center"> diff --git a/app/src/main/res/layout/fragment_tab_layout.xml b/app/src/main/res/layout/fragment_tab_layout.xml index 3492aec..2fd1cf5 100644 --- a/app/src/main/res/layout/fragment_tab_layout.xml +++ b/app/src/main/res/layout/fragment_tab_layout.xml @@ -128,7 +128,8 @@ android:layout_width="48dp" android:layout_height="48dp" android:padding="12dp" - android:src="@drawable/round_dashboard_24" + android:id="@+id/widget_align_icon" + android:src="@drawable/round_align_horizontal_center_24" app:tint="@color/colorPrimaryText"/> diff --git a/app/src/main/res/layout/left_aligned_widget_sans.xml b/app/src/main/res/layout/left_aligned_widget_sans.xml index 11fa721..e2f2311 100644 --- a/app/src/main/res/layout/left_aligned_widget_sans.xml +++ b/app/src/main/res/layout/left_aligned_widget_sans.xml @@ -73,28 +73,41 @@ + + + @@ -109,16 +122,18 @@ android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1" + android:background="@color/colorAccent" android:id="@+id/next_event_rect" /> @@ -143,6 +158,7 @@ @@ -155,6 +171,7 @@ - \ No newline at end of file diff --git a/app/src/main/res/layout/the_widget_sans.xml b/app/src/main/res/layout/the_widget_sans.xml index 75e8cda..34af404 100644 --- a/app/src/main/res/layout/the_widget_sans.xml +++ b/app/src/main/res/layout/the_widget_sans.xml @@ -74,26 +74,34 @@ - + android:paddingTop="4dp"> + +