From 0774c6bdbe4c97483586b7b8ff236a3a882e8f8e Mon Sep 17 00:00:00 2001
From: Lambada10 <62511588+Lambada10@users.noreply.github.com>
Date: Mon, 18 Jan 2021 12:12:58 +0100
Subject: [PATCH 1/6] Translations

---
 app/src/main/res/values-pl/strings.xml | 360 +++++++++++++++++++++++++
 1 file changed, 360 insertions(+)
 create mode 100644 app/src/main/res/values-pl/strings.xml

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
new file mode 100644
index 0000000..ba68982
--- /dev/null
+++ b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name" translatable="false">Another Widget</string>
+    <string name="add_widget">Dodaj Widget</string>
+
+    <!-- Display -->
+    <string name="settings_general_title">Wyświetlaj</string>
+    <string name="divider" translatable="false">|</string>
+    <string name="settings_font_color_title">Kolor tekstu</string>
+    <string name="settings_secondary_font_color_title">Kolor tekstu</string>
+    <string name="settings_background_color_title">Kolor tła</string>
+    <string name="title_main_text_size">Rozmiar tekstu</string>
+    <string name="title_second_text_size">Rozmiar tekstu</string>
+    <string name="title_text_shadow">Cirń tekstu</string>
+    <string name="settings_text_shadow_subtitle_none">Brak</string>
+    <string name="settings_text_shadow_subtitle_low">Mały</string>
+    <string name="settings_text_shadow_subtitle_high">Duży</string>
+    <string name="settings_custom_font_title">Czcionka widgetu</string>
+    <string name="custom_font_subtitle_0">Czcionka urządzenia</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
+    <string name="custom_date_format">Niestandardowy format daty</string>
+    <string name="alpha">Alpha</string>
+    <string name="transparent">Przezroczyste</string>
+    <string name="settings_show_dividers_title">Rozdzielenie tekstu</string>
+    <string name="first_row_header">Główny tekst</string>
+    <string name="second_row_header">Dodatkowy tekst</string>
+    <string name="global_style_header">Widget</string>
+    <string name="action_capitalize_the_date">Zapisz datę wielkimi literami</string>
+    <string name="settings_date_format_title">Format daty</string>
+    <string name="header_widget_background">Tło widgetu</string>
+    <string name="settings_secondary_row_top_margin_title">Oddzidlenie rzędów</string>
+    <string name="action_custom_font_to_search">Niestandardowa czcionka…</string>
+    <string name="font_family_settings_title">Rodzina czcionek</string>
+    
+    <string name="font_100" translatable="false">Thin</string>
+    <string name="font_200" translatable="false">Light</string>
+    <string name="font_300" translatable="false">Book</string>
+    <string name="font_400" translatable="false">Regular</string>
+    <string name="font_500" translatable="false">Medium</string>
+    <string name="font_600" translatable="false">Semi-bold</string>
+    <string name="font_700" translatable="false">Bold</string>
+    <string name="font_800" translatable="false">Black</string>
+    <string name="font_900" translatable="false">Heavy</string>.
+    <string name="font_italic" translatable="false">Italic</string>
+    <string name="font_100_italic" translatable="false">Thin Italic</string>
+    <string name="font_200_italic" translatable="false">Light Italic</string>
+    <string name="font_300_italic" translatable="false">Book Italic</string>
+    <string name="font_400_italic" translatable="false">Regular Italic</string>
+    <string name="font_500_italic" translatable="false">Medium Italic</string>
+    <string name="font_600_italic" translatable="false">Semi-bold Italic</string>
+    <string name="font_700_italic" translatable="false">Bold Italic</string>
+    <string name="font_800_italic" translatable="false">Black Italic</string>
+    <string name="font_900_italic" translatable="false">Heavy Italic</string>
+
+    <!-- Calendar -->
+    <string name="settings_calendar_title">Kalendarz</string>
+    <string name="title_permission_calendar">Pokaż moje wydarzenia</string>
+    <string name="description_permission_calendar">Przyznaj uprawnienie dostępu do kalendarza\naby zobaczyć wydarzenia na widgeci.</string>
+    <string name="settings_filter_calendar_title">Filtruj wydarzenia</string>
+    <string name="settings_filter_calendar_subtitle">Zmień widoczność kalendarza</string>
+    <string name="settings_all_day_title">Całodobowe wydarzenia</string>
+    <string name="main_calendar">Konto kalendarza</string>
+    <string name="calendar_settings_list_error">Błąd podczas ładowanka listy kalendarza.</string>
+    <string name="all_day">Całodobowe wydarzenie</string>
+    <string name="show_events_visible">Wydarzenia są widoczne</string>
+    <string name="show_events_not_visible">Wydarzenia są ukryte</string>
+    <string name="settings_show_until_subtitle_6">30 minut później</string>
+    <string name="settings_show_until_subtitle_7">1 godzinę później</string>
+    <string name="settings_show_until_subtitle_0">3 godziny później</string>
+    <string name="settings_show_until_subtitle_1">6 godzin później</string>
+    <string name="settings_show_until_subtitle_2">12 godzin później</string>
+    <string name="settings_show_until_subtitle_3">24 godziny później</string>
+    <string name="settings_show_until_subtitle_4">3 dni później</string>
+    <string name="settings_show_until_subtitle_5">7 dni później</string>
+    <string name="settings_show_until_title">Pokazuj wydarzenia co najmniej</string>
+    <string name="day_char">d</string>
+    <string name="settings_calendar_app_title">Kalendarz</string>
+    <string name="error_no_calendar">Nie znaleziono kalendarza.</string>
+    <string name="tomorrow">jutro</string>
+    <string name="today">dziś</string>
+    <string name="settings_event_app_title">Naciśnięcie na wydarzenie otwiera</string>
+    <string name="settings_second_row_info_title">Informacje o wydarzeniu</string>
+    <string name="settings_second_row_info_subtitle_1">Adres wydarzenia </string>
+    <string name="settings_second_row_info_subtitle_0">Czas wydarzenia</string>
+    <string name="settings_show_diff_time_title">Pozostały czas do wydarzenia</string>
+    <string name="settings_show_declined_events_title">Odrzucone wydarzenia</string>
+    <string name="default_event_app">Szczegóły wydarzenia</string>
+    <string name="default_calendar_app">Domyślna aplikacja kalendarza</string>
+    <string name="settings_show_multiple_events_title">Przełącznik kilku wydarzeń</string>
+    <string name="soon">wkrótce</string>
+    <string name="now">teraz</string>
+    <string name="settings_widget_update_frequency_title">Częstotliwość asktualizacji wydarzenia</string>
+    <string name="settings_widget_update_frequency_subtitle">Wysoka częstotliwość zużywa wiecej baterii.</string>
+    <string name="settings_widget_update_frequency_low">Niska</string>
+    <string name="settings_widget_update_frequency_default">Domyślna</string>
+    <string name="settings_widget_update_frequency_high">Wysoka</string>
+    <string name="filters_header">Filtry</string>
+    <string name="event_detail_header">Informacje o wydarzeniu</string>
+    <string name="settings_attendee_status_title"> Status uczestnika</string>
+    <string name="settings_attendee_status_subtitle">Filtruj zaakceptowane lub odrzucone wydarzenia</string>
+    <string name="settings_busy_events_title">Powiązane wydarzenia</string>
+    <string name="settings_busy_events_subtitle">Pokaż tylko wydarzenia, które są ustawione jako zajęty</string>
+    <string name="attendee_status_accepted">Zaakceptowane wydarzenia</string>
+    <string name="attendee_status_invited">Zaproszenia</string>
+    <string name="attendee_status_declined">Odrzucone wydarzenia</string>
+
+    <string name="calendar_sync_notification_channel_id" translatable="false">calendar-sync</string>
+    <string name="calendar_sync_notification_channel_name">Usługa synchronizacji wydarzeń</string>
+    <string name="calendar_sync_notification_channel_description">Usługa używana do synchronizacji wydarzeń w kalendarzu.</string>
+    <string name="calendar_sync_notification_title">Synchronizowanie wydarzeń w kalendarzu…</string>
+
+    <!-- Weather -->
+    <string name="settings_weather_title">Pogoda</string>
+    <string name="title_permission_location">Pokaż pogodę</string>
+    <string name="description_permission_location">Przyznaj dostęp do swojej lokalizacji\naby wyświetlać pogodę w swoim widgecie.</string>
+    <string name="settings_unit_title">Jednostka temperatury</string>
+    <string name="fahrenheit" translatable="false">°F - Fahrenheit</string>
+    <string name="celsius" translatable="false">°C - Celsius</string>
+    <string name="settings_weather_refresh_period_title">częstotliwość odświeżania</string>
+    <string name="settings_weather_refresh_period_subtitle_0">30 minut</string>
+    <string name="settings_weather_refresh_period_subtitle_1">1 godzina</string>
+    <string name="settings_weather_refresh_period_subtitle_2">3 godziny</string>
+    <string name="settings_weather_refresh_period_subtitle_3">6 godzin</string>
+    <string name="settings_weather_refresh_period_subtitle_4">12 godzin</string>
+    <string name="settings_weather_refresh_period_subtitle_5">24 godziny</string>
+    <string name="settings_custom_location_title">lokalizacja</string>
+    <string name="custom_location_gps">Geolokalizacja</string>
+    <string name="show_weather_visible">Informavje o pogodzie są widoczne</string>
+    <string name="show_weather_not_visible">Informacje o pogodzie są ukryte</string>
+    <string name="settings_weather_app_title">Pogoda</string>
+    <string name="settings_weather_provider_api_key_title">Klucz API dostawcy pogody</string>
+    <string name="settings_weather_provider_api_key_subtitle_all_set">Dostawca pogody jest poprawnie skonfigurowany.</string>
+    <string name="settings_weather_provider_api_key_subtitle_not_set"> Należy skonfigurować dostawcę pogody.</string>
+    <string name="api_key_hint">Klucz API OpenWeatherMap</string>
+    <string name="default_weather_app">Google Weather</string>
+    <string name="weather_warning">Google Awareness API został wycofany. Aby wyświetlać pogodę w widgecie, wymagane jest teraz posiadanie klucza API od zewnętrznego dostawcy.</string>
+    <string name="settings_weather_icon_pack_title">Paczka ikon</string>
+    <string name="settings_weather_icon_pack_default">Paczka ikon %d</string>
+    <string name="background_location_warning">Po wybraniu geolokalizacji zbieramy dane o lokalizacji, aby aktualizować informacje o pogodzie, nawet gdy aplikacja jest zamknięta lub nieużywana. \ NNie wykorzystamy tych danych w inny sposób.</string>
+    <string name="settings_weather_provider_api">Dostawca pogody</string>
+
+    <string name="settings_weather_provider_open_weather" translatable="false">OpenWeatherMap.org</string>
+    <string name="settings_weather_provider_weatherbit" translatable="false">Weatherbit.io</string>
+    <string name="settings_weather_provider_weather_api" translatable="false">WeatherAPI.com</string>
+    <string name="settings_weather_provider_here" translatable="false">HERE.com</string>
+    <string name="settings_weather_provider_accuweather" translatable="false">AccuWeather.com</string>
+    <string name="settings_weather_provider_weather_gov" translatable="false">Weather.gov (USA)\nby National Weather Services</string>
+    <string name="settings_weather_provider_yr" translatable="false">YR.no/Met.no\nby Meteorologisk Institutt</string>
+
+    <string name="weather_provider_info_open_weather_title">Ten dostawca pogody potrzebuje \nklucza API do poprawnego działania.</string>
+    <string name="weather_provider_info_weatherbit_title">Ten dostawca pogody potrzebuje \nklucza API do poprawnego działania.</string>
+    <string name="weather_provider_info_weatherapi_title">Ten dostawca pogody potrzebuje \nklucza API do poprawnego działania.</string>
+    <string name="weather_provider_info_here_title">Ten dostawca pogody potrzebuje \nklucza API do poprawnego działania.</string>
+    <string name="weather_provider_info_accuweather_title">Ten dostawca pogody potrzebuje \nklucza API do poprawnego działania.</string>
+    <string name="weather_provider_info_weather_gov_title">Ten dostawcs pogody działa tylko\ndla USA.</string>
+    <string name="weather_provider_info_yr_title">Ten dostawca pogody zezwala tylko\nna stopnie Celsjusza.</string>
+
+    <string name="weather_provider_info_open_weather_subtitle">Otwórz stronę dostawcy, stwórz konto i skopiuj domyślny klucz API tutaj.</string>
+    <string name="weather_provider_info_weatherbit_subtitle">Otwórz stronę dostawcy, stwórz konto i skopiuj domyślny klucz API tutaj.</string>
+    <string name="weather_provider_info_weatherapi_subtitle">Otwórz stronę dostawcy, stwórz konto i skopiuj domyślny klucz API tutaj.</string>
+    <string name="weather_provider_info_here_subtitle">Otwórz stronę dostawcy, stwórz konto i skopiuj domyślny klucz API tutaj.</string>
+    <string name="weather_provider_info_accuweather_subtitle">Otwórz stronę dostawcy, stwórz konto i skopiuj domyślny klucz API tutaj.</string>
+    <string name="weather_provider_info_weather_gov_subtitle">\n</string>
+    <string name="weather_provider_info_yr_subtitle">\n</string>
+
+    <string name="weather_provider_error_missing_key">The weather provider that you\'ve selected requires an API key.</string>
+    <string name="weather_provider_error_wrong_location">The current location is not supported.</string>
+    <string name="weather_provider_error_missing_location">Please select a valid location.</string>
+    <string name="weather_provider_error_expired_key">It seems that your API key has expired.</string>
+    <string name="weather_provider_error_invalid_key">API key not valid, or not yet activated.</string>
+    <string name="weather_provider_error_misconfigured">The weather provider is wrongly configured.</string>
+    <string name="weather_provider_error_connection">Connection error.</string>
+    <string name="weather_provider_error_generic">Something went wrong, check the weather provider config.</string>
+    <string name="api_key_required_message">Account required</string>
+    <string name="us_only_message">USA Only</string>
+    <string name="celsius_only_message">Metric Unit Only</string>
+    <string name="weather_select_a_provider">Select a provider</string>
+    <string name="weather_provider_activity_subtitle">Select a weather provider from the list.\nA few providers need a free personal account,\nbut they are usually more accurate.</string>
+
+    <string name="location_access_notification_channel_id" translatable="false">location-access</string>
+    <string name="location_access_notification_channel_name">Weather update service</string>
+    <string name="location_access_notification_channel_description">Service used to update the weather based on the current location of the user.</string>
+    <string name="location_access_notification_title">Updating the weather…</string>
+    <string name="location_access_notification_subtitle">We\'re updating the weather based on your current location.</string>
+
+    <!-- Clock -->
+    <string name="settings_clock_title">Clock</string>
+    <string name="settings_clock_app_title">Clock</string>
+    <string name="title_show_clock">Show Clock</string>
+    <string name="show_clock_visible">Clock is visible</string>
+    <string name="show_clock_not_visible">Clock is hidden</string>
+    <string name="settings_clock_text_size_title">Text size</string>
+    <string name="default_clock_app">Default clock app</string>
+    <string name="settings_clock_bottom_margin_title">Clock bottom margin</string>
+    <string name="settings_clock_bottom_margin_subtitle_none">None</string>
+    <string name="settings_clock_bottom_margin_subtitle_small">Small</string>
+    <string name="settings_clock_bottom_margin_subtitle_medium">Medium</string>
+    <string name="settings_clock_bottom_margin_subtitle_large">Large</string>
+    <string name="clock_warning">Due to technological limitations, the clock won\'t have the custom font and the text shadows selected in the Display section.</string>
+    <string name="settings_clock_text_color_title">Text color</string>
+    <string name="settings_ampm_indicator_title">Show AM/PM indicator</string>
+    <string name="clock_text_header">Clock text style</string>
+
+    <!-- Glance -->
+    <string name="settings_show_next_alarm_title">Next clock alarm</string>
+    <string name="settings_at_a_glance_title">At a glance</string>
+    <string name="settings_show_music_title">Current playing song</string>
+    <string name="settings_request_notification_access">We need the notification access permission to check the current playing song.</string>
+    <string name="settings_request_last_notification_access">We need the notification access permission to check your last notifications.</string>
+    <string name="settings_request_fitness_access">We need a few permissions to get your daily steps from Google Fit.</string>
+    <string name="title_show_glance">Show at a glance info</string>
+    <string name="description_show_glance_visible">Service enabled</string>
+    <string name="description_show_glance_not_visible">Service disabled</string>
+    <string name="settings_sort_glance_providers_title">Data source priority</string>
+    <string name="settings_sort_glance_providers_subtitle">Change the data provider priority by sorting the list below with the drag-and-drop icons.</string>
+    <string name="settings_custom_notes_title">Custom notes</string>
+    <string name="settings_daily_steps_title">Fitness</string>
+    <string name="daily_steps_counter">%d steps so far</string>
+    <string name="settings_low_battery_level_title">Battery</string>
+    <string name="battery_low_warning">Low battery level</string>
+    <string name="charging">Charging</string>
+    <string name="charged">Fully charged</string>
+    <string name="providers">Providers</string>
+    <string name="glance_info">Glance info will show up only when there are no events displayed and only when a few conditions are verified.</string>
+    <string name="settings_music_players_filter_title">Music Players</string>
+    <string name="settings_music_players_filter_subtitle">Choose your relevant music players</string>
+    <string name="settings_show_music_subtitle">We use the music players\' notification to show the current playing song.</string>
+    <string name="settings_low_battery_level_subtitle">Get advised when the device has the battery low or is charging.</string>
+    <string name="settings_daily_steps_subtitle">View your daily steps for a brief moment after finishing a walk or a run.</string>
+    <string name="settings_show_next_alarm_subtitle">View your next clock alarm.\nCheck if your default clock app is the only one setting alarms.</string>
+    <string name="settings_show_next_alarm_app_title">Alarm set by %s</string>
+    <string name="settings_show_next_alarm_app_subtitle_wrong">The next alarm clock seems to be wrong</string>
+    <string name="settings_show_next_alarm_app_subtitle_correct">The next alarm clock seems to be correct</string>
+    <string name="settings_show_notifications_title">Latest notifications</string>
+    <string name="settings_show_notifications_subtitle">Check out the latest notifications that showed up on your device.</string>
+    <string name="settings_show_greetings_title">Greetings</string>
+    <string name="settings_show_greetings_subtitle">View some cool phrase to lighten your day when you don\'t expect it.</string>
+    <string name="google_fit_account_connected">Account linked</string>
+    <string name="google_fit_account_not_connected">Account not linked</string>
+    <string name="google_fit">Google Fit</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_disconnect">Disconnect</string>
+    <string name="applications_filter_title">Applications</string>
+    <string name="applications_filter_subtitle">Choose which notifications to view</string>
+    <string-array name="morning_greetings" tools:ignore="InconsistentArrays">
+        <item>Good morning!</item>
+        <item>Have a good day!</item>
+        <item>Ready to go?</item>
+        <item>Rise and shine.</item>
+        <item>Don\'t forget your breakfast!</item>
+    </string-array>
+    <string-array name="evening_greetings" tools:ignore="InconsistentArrays">
+        <item>Good evening!</item>
+        <item>How did your day go?</item>
+        <item>Did you have a nice day?</item>
+        <item>After effort comes comfort.</item>
+        <item>Don\'t forget to have dinner!</item>
+    </string-array>
+    <string-array name="night_greetings" tools:ignore="InconsistentArrays">
+        <item>Good night!</item>
+        <item>Sleep well!</item>
+        <item>Sweet dreams till sunbeams find you!</item>
+        <item>See you tomorrow...</item>
+        <item>Don\'t stay up too late!</item>
+    </string-array>
+    <string name="glance_notification_hide_timeout_title">Hide the notification after</string>
+    <string-array name="glance_notifications_timeout">
+        <item>30 seconds</item>
+        <item>1 minute</item>
+        <item>5 minutes</item>
+        <item>10 minutes</item>
+        <item>15 minutes</item>
+        <item>Dismissal</item>
+    </string-array>
+    <string name="settings_show_events_as_glance_provider_title">Events</string>
+    <string name="settings_show_events_as_glance_provider_subtitle">View a sneak peek of your calendar events and always show the current date.</string>
+    <string name="settings_show_events_as_glance_provider_error">Please enable the show of the events in the calendar tab and grant the required permission.</string>
+    <string name="events_glance_provider_format">%1$s %2$s</string>
+
+    <!-- Settings -->
+    <string name="action_share">Share</string>
+    <string name="action_rate">Rate app</string>
+    <string name="action_support">Support me</string>
+    <string name="action_feedback">Feedback</string>
+    <string name="action_about">About</string>
+    <string name="action_refresh_widget">Refresh widget</string>
+    <string name="toolbar_transition_name" translatable="false">toolbar</string>
+    <string name="error_opening_uri">Error opening URL: Link copied to clipboard.</string>
+    <string name="loading_text">Loading Data...</string>
+    <string name="error_opening_app">Error opening app.</string>
+    <string name="default_name">Default app</string>
+    <string name="action_save">Save</string>
+    <string name="settings_visible">Visible</string>
+    <string name="settings_not_visible">Hidden</string>
+    <string name="support_translations_title">Help with translations</string>
+    <string name="support_translations_subtitle">Open a pull request on GitHub</string>
+    <string name="support_website_title">Check my other projects</string>
+    <string name="support_website_subtitle">Same developer, many possibilities</string>
+    <string name="error">Ooops, something went wrong!</string>
+    <string name="settings_theme_title">Theme</string>
+    <string name="support_main_subtitle">Devs always need a lot of coffee</string>
+    <string name="settings_subtitle_dark_theme_light">Light</string>
+    <string name="settings_subtitle_dark_theme_dark">Dark</string>
+    <string name="settings_subtitle_dark_theme_by_battery_saver">Set by battery saver</string>
+    <string name="settings_subtitle_dark_theme_follow_system">Follow the system theme</string>
+    <string name="settings_subtitle_dark_theme_default">Default</string>
+    <string name="search">Search</string>
+    <string name="settings_app_version_title">App version</string>
+    <string name="settings_title_show_wallpaper">Show wallpaper</string>
+    <string name="support_refresh_widget_subtitle">Force the restart of the widget service</string>
+    <string name="settings_feedback_subtitle">Feel free to help our project!</string>
+    <string name="settings_feedback_title">Feedback and feature requests</string>
+    <string name="xiaomi_manufacturer" translatable="false">xiaomi</string>
+    <string name="xiaomi_warning_title">Xiaomi Devices</string>
+    <string name="xiaomi_warning_message">Enable the permission to display pop-up windows when running in the background inside the "Other permission" section of the app settings. Otherwise, you will not able to open any applications tapping on the widget.</string>
+    <string name="action_ignore">Ignore</string>
+    <string name="action_grant_permission">Grant permission</string>
+    <string name="settings_title">Settings</string>
+    <string name="style_header">Style</string>
+    <string name="actions_header">Actions</string>
+    <string name="provider_header">Provider</string>
+    <string name="appearance_header">Appearance</string>
+    <string name="preferences_header">Preferences</string>
+    <string name="settings_privacy_policy_title"><![CDATA[Legal & Privacy]]></string>
+    <string name="settings_privacy_policy_subtitle">View the privacy policy of the app</string>
+    <string name="project_header">Open-source project</string>
+    <string name="information_header">Information</string>
+
+    <!-- Activities -->
+    <string name="action_choose_application">Choose application</string>
+    <string name="support_main_title">Support the developer</string>
+    <string name="thanks">Thanks for supporting me!</string>
+    <string name="donation_coffee">An italian coffee</string>
+    <string name="donation_donuts">Some glazed donuts</string>
+    <string name="donation_dinner">An expensive dinner</string>
+    <string name="donation_breakfast">An english breakfast</string>
+    <string name="donation_lunch">A quick lunch</string>
+    <string name="action_show_widget_preview">Show widget preview</string>
+    <string name="support_dev_subtitle">This is a single developer project,\nso thank you for the support!</string>
+    <string name="settings_title_integrations">Integrations</string>
+    <string name="label_count_installed_integrations">%d installed integrations</string>
+    <string name="nothing">Nothing</string>
+    <string name="action_dismiss">Dismiss</string>
+    <string name="action_accept">Accept</string>
+    <string name="gestures_do_nothing">None</string>
+    <string name="song_info_format_activity_title">Song info format</string>
+    <string name="song_info_format_activity_subtitle">Change the visible song info</string>
+
+    <!-- More -->
+    <string name="look_and_feel_header"><![CDATA[Look & feel]]></string>
+    <string name="typography_settings_title">Typography</string>
+    <string name="typography_settings_subtitle">Set text font, size and color</string>
+    <string name="layout_settings_title">Layout</string>
+    <string name="gestures_settings_subtitle">Actions, behaviour and shortcuts</string>
+    <string name="gestures_settings_title">Gestures</string>
+    <string name="gestures_amp_input_header"><![CDATA[Gestures & input]]></string>
+    <string name="clock_settings_subtitle">Set size, color and time zones</string>
+    <string name="layout_settings_subtitle">Widget spacing and tweaks</string>
+    <string name="smart_content_header">Smart content</string>
+</resources>

From 8234a87a2a53f488966fee1c534c464f37baaa69 Mon Sep 17 00:00:00 2001
From: Lambada10 <62511588+Lambada10@users.noreply.github.com>
Date: Mon, 18 Jan 2021 14:17:27 +0100
Subject: [PATCH 2/6] Translations

---
 app/src/main/res/values-pl/strings.xml | 336 ++++++++++++-------------
 1 file changed, 168 insertions(+), 168 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ba68982..a996d84 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -125,7 +125,7 @@
     <string name="settings_weather_refresh_period_subtitle_5">24 godziny</string>
     <string name="settings_custom_location_title">lokalizacja</string>
     <string name="custom_location_gps">Geolokalizacja</string>
-    <string name="show_weather_visible">Informavje o pogodzie są widoczne</string>
+    <string name="show_weather_visible">Informacje o pogodzie są widoczne</string>
     <string name="show_weather_not_visible">Informacje o pogodzie są ukryte</string>
     <string name="settings_weather_app_title">Pogoda</string>
     <string name="settings_weather_provider_api_key_title">Klucz API dostawcy pogody</string>
@@ -163,198 +163,198 @@
     <string name="weather_provider_info_weather_gov_subtitle">\n</string>
     <string name="weather_provider_info_yr_subtitle">\n</string>
 
-    <string name="weather_provider_error_missing_key">The weather provider that you\'ve selected requires an API key.</string>
-    <string name="weather_provider_error_wrong_location">The current location is not supported.</string>
-    <string name="weather_provider_error_missing_location">Please select a valid location.</string>
-    <string name="weather_provider_error_expired_key">It seems that your API key has expired.</string>
-    <string name="weather_provider_error_invalid_key">API key not valid, or not yet activated.</string>
-    <string name="weather_provider_error_misconfigured">The weather provider is wrongly configured.</string>
-    <string name="weather_provider_error_connection">Connection error.</string>
-    <string name="weather_provider_error_generic">Something went wrong, check the weather provider config.</string>
-    <string name="api_key_required_message">Account required</string>
-    <string name="us_only_message">USA Only</string>
-    <string name="celsius_only_message">Metric Unit Only</string>
-    <string name="weather_select_a_provider">Select a provider</string>
-    <string name="weather_provider_activity_subtitle">Select a weather provider from the list.\nA few providers need a free personal account,\nbut they are usually more accurate.</string>
+    <string name="weather_provider_error_missing_key">Dostawca pogody, którego wybrałeś wymaga klucza API.</string>
+    <string name="weather_provider_error_wrong_location">Aktualna lokalizacja nie jest wspierana.</string>
+    <string name="weather_provider_error_missing_location">Wybierz prawidłową lokalizację.</string>
+    <string name="weather_provider_error_expired_key">Wygląda na to że klucz API wygasł.</string>
+    <string name="weather_provider_error_invalid_key">Nieprawidłowy lub nieaktywowany klucz API.</string>
+    <string name="weather_provider_error_misconfigured">Dostawca pogody jest źle skonfigurowany.</string>
+    <string name="weather_provider_error_connection">Błąd połączenia.</string>
+    <string name="weather_provider_error_generic">Coś poszło nie tak, sprawdź konfigurację dostawcy pogody.</string>
+    <string name="api_key_required_message">Wymagane konto</string>
+    <string name="us_only_message">Tylko USA</string>
+    <string name="celsius_only_message">Tylko jednostki metryczne</string>
+    <string name="weather_select_a_provider">Wybierz dostawcę</string>
+    <string name="weather_provider_activity_subtitle">Wybierz dostawcę pogody z listy.\nNiektóre mogą wymagać darmowego konta,\nale zazwyczaj są dokładniejsze.</string>
 
     <string name="location_access_notification_channel_id" translatable="false">location-access</string>
-    <string name="location_access_notification_channel_name">Weather update service</string>
-    <string name="location_access_notification_channel_description">Service used to update the weather based on the current location of the user.</string>
-    <string name="location_access_notification_title">Updating the weather…</string>
-    <string name="location_access_notification_subtitle">We\'re updating the weather based on your current location.</string>
+    <string name="location_access_notification_channel_name">Usługa aktualizacji pogody</string>
+    <string name="location_access_notification_channel_description">Usługa używana do aktualizacji pogody opartej na lokalizacji użytkownika.</string>
+    <string name="location_access_notification_title">Aktualizowanie pogody…</string>
+    <string name="location_access_notification_subtitle">Aktualizujemy pogodę opierając się na twojeje lokalizacji.</string>
 
     <!-- Clock -->
-    <string name="settings_clock_title">Clock</string>
-    <string name="settings_clock_app_title">Clock</string>
-    <string name="title_show_clock">Show Clock</string>
-    <string name="show_clock_visible">Clock is visible</string>
-    <string name="show_clock_not_visible">Clock is hidden</string>
-    <string name="settings_clock_text_size_title">Text size</string>
-    <string name="default_clock_app">Default clock app</string>
-    <string name="settings_clock_bottom_margin_title">Clock bottom margin</string>
-    <string name="settings_clock_bottom_margin_subtitle_none">None</string>
-    <string name="settings_clock_bottom_margin_subtitle_small">Small</string>
-    <string name="settings_clock_bottom_margin_subtitle_medium">Medium</string>
-    <string name="settings_clock_bottom_margin_subtitle_large">Large</string>
-    <string name="clock_warning">Due to technological limitations, the clock won\'t have the custom font and the text shadows selected in the Display section.</string>
-    <string name="settings_clock_text_color_title">Text color</string>
-    <string name="settings_ampm_indicator_title">Show AM/PM indicator</string>
-    <string name="clock_text_header">Clock text style</string>
+    <string name="settings_clock_title">Zegar</string>
+    <string name="settings_clock_app_title">Zegar</string>
+    <string name="title_show_clock">Pokaż zegar</string>
+    <string name="show_clock_visible">Zegar jest widoczny</string>
+    <string name="show_clock_not_visible">Zegar jest ukryty</string>
+    <string name="settings_clock_text_size_title">Rozmiar tekstu</string>
+    <string name="default_clock_app">Domyślna aplikacja zegara</string>
+    <string name="settings_clock_bottom_margin_title">Dolny margines zegara</string>
+    <string name="settings_clock_bottom_margin_subtitle_none">Brak</string>
+    <string name="settings_clock_bottom_margin_subtitle_small">Mały</string>
+    <string name="settings_clock_bottom_margin_subtitle_medium">Średni</string>
+    <string name="settings_clock_bottom_margin_subtitle_large">Duży</string>
+    <string name="clock_warning">Z powodu ograniczeń technologicznych, zegar nie będzie miał niestandardowej czcionki i cienii tekstów wybranych w sekcji Wyświetlaj.</string>
+    <string name="settings_clock_text_color_title">Kolor tekstu</string>
+    <string name="settings_ampm_indicator_title">Pokaż wskaźnik AM/PM</string>
+    <string name="clock_text_header">Styl tekstu zegara</string>
 
     <!-- Glance -->
-    <string name="settings_show_next_alarm_title">Next clock alarm</string>
-    <string name="settings_at_a_glance_title">At a glance</string>
-    <string name="settings_show_music_title">Current playing song</string>
-    <string name="settings_request_notification_access">We need the notification access permission to check the current playing song.</string>
-    <string name="settings_request_last_notification_access">We need the notification access permission to check your last notifications.</string>
-    <string name="settings_request_fitness_access">We need a few permissions to get your daily steps from Google Fit.</string>
-    <string name="title_show_glance">Show at a glance info</string>
-    <string name="description_show_glance_visible">Service enabled</string>
-    <string name="description_show_glance_not_visible">Service disabled</string>
-    <string name="settings_sort_glance_providers_title">Data source priority</string>
-    <string name="settings_sort_glance_providers_subtitle">Change the data provider priority by sorting the list below with the drag-and-drop icons.</string>
-    <string name="settings_custom_notes_title">Custom notes</string>
+    <string name="settings_show_next_alarm_title">Następny alarm</string>
+    <string name="settings_at_a_glance_title">W skrócie</string>
+    <string name="settings_show_music_title">Aktualnie odtwarzany utwór</string>
+    <string name="settings_request_notification_access">Potrzebujemy uprawnienia dostępu do powiadomień, aby wyświetlić aktuanie odtwarzany utwór.</string>
+    <string name="settings_request_last_notification_access">Potrzebujemy uprawnienia dostępu do powiadomień, aby wyświetlić powiadomienia.</string>
+    <string name="settings_request_fitness_access">Potrzebujemy parę uprawnień aby wyświetlić kroki z Google Fit.</string>
+    <string name="title_show_glance">Pokaż informacje w skrócie</string>
+    <string name="description_show_glance_visible">Usłuja włączona</string>
+    <string name="description_show_glance_not_visible">Usługa wyłączona</string>
+    <string name="settings_sort_glance_providers_title">Priorytet wyświetlania</string>
+    <string name="settings_sort_glance_providers_subtitle">Zmień priorytet źródeł danych sortując tą listę (przeciągnij i upuść).</string>
+    <string name="settings_custom_notes_title">Niestandardowe notatki</string>
     <string name="settings_daily_steps_title">Fitness</string>
-    <string name="daily_steps_counter">%d steps so far</string>
-    <string name="settings_low_battery_level_title">Battery</string>
-    <string name="battery_low_warning">Low battery level</string>
-    <string name="charging">Charging</string>
-    <string name="charged">Fully charged</string>
-    <string name="providers">Providers</string>
-    <string name="glance_info">Glance info will show up only when there are no events displayed and only when a few conditions are verified.</string>
-    <string name="settings_music_players_filter_title">Music Players</string>
-    <string name="settings_music_players_filter_subtitle">Choose your relevant music players</string>
-    <string name="settings_show_music_subtitle">We use the music players\' notification to show the current playing song.</string>
-    <string name="settings_low_battery_level_subtitle">Get advised when the device has the battery low or is charging.</string>
-    <string name="settings_daily_steps_subtitle">View your daily steps for a brief moment after finishing a walk or a run.</string>
-    <string name="settings_show_next_alarm_subtitle">View your next clock alarm.\nCheck if your default clock app is the only one setting alarms.</string>
-    <string name="settings_show_next_alarm_app_title">Alarm set by %s</string>
-    <string name="settings_show_next_alarm_app_subtitle_wrong">The next alarm clock seems to be wrong</string>
-    <string name="settings_show_next_alarm_app_subtitle_correct">The next alarm clock seems to be correct</string>
-    <string name="settings_show_notifications_title">Latest notifications</string>
-    <string name="settings_show_notifications_subtitle">Check out the latest notifications that showed up on your device.</string>
-    <string name="settings_show_greetings_title">Greetings</string>
-    <string name="settings_show_greetings_subtitle">View some cool phrase to lighten your day when you don\'t expect it.</string>
-    <string name="google_fit_account_connected">Account linked</string>
-    <string name="google_fit_account_not_connected">Account not linked</string>
+    <string name="daily_steps_counter">%d kroków</string>
+    <string name="settings_low_battery_level_title">Bateria</string>
+    <string name="battery_low_warning">Niski poziom baterii</string>
+    <string name="charging">Ładowanie</string>
+    <string name="charged">Naładowano</string>
+    <string name="providers">Dostawcy</string>
+    <string name="glance_info">Informacje pokażą się tylko, jeśli nie wyświetlają się wydarzenia oraz spełnione jest kilka warunków.</string>
+    <string name="settings_music_players_filter_title">Odtwarzacze muzyki</string>
+    <string name="settings_music_players_filter_subtitle">Wybierz swoje odtwarzacze muzyki</string>
+    <string name="settings_show_music_subtitle">Używamy powiadomień odtwarzaczy, aby wyświetlić aktualnie odtwarzany utwór.</string>
+    <string name="settings_low_battery_level_subtitle">Zostań ponformowany, gdy urządzenie ma mało baterii lub się ładuje.</string>
+    <string name="settings_daily_steps_subtitle">Wyświetl swoje dzienne kroki na krótką chwilę po ukończeniu spaceru lub biegu.</string>
+    <string name="settings_show_next_alarm_subtitle">Zobacz swój następny alarm.\nSprawdź czy twoja domyślna aplikacja zegara jest jedyną, wktórej ustawiono alarmt.</string>
+    <string name="settings_show_next_alarm_app_title">Ustawiono alarm przez %s</string>
+    <string name="settings_show_next_alarm_app_subtitle_wrong">Następny alarm wygląda na nieprawidłowy</string>
+    <string name="settings_show_next_alarm_app_subtitle_correct">Następny alarm wygląda na prawidłowy</string>
+    <string name="settings_show_notifications_title">Ostatnie powiadomienie</string>
+    <string name="settings_show_notifications_subtitle">Zobacz swoje ostatnie powiadomienia.</string>
+    <string name="settings_show_greetings_title">Pozdrowienia</string>
+    <string name="settings_show_greetings_subtitle">Wyświetlaj ciekawe zdania, które umilą ci dziań gdy się tego nie spodziewasz.</string>
+    <string name="google_fit_account_connected">Połączono konto</string>
+    <string name="google_fit_account_not_connected">Nie połączono konta</string>
     <string name="google_fit">Google Fit</string>
-    <string name="action_connect">Connect</string>
-    <string name="action_disconnect">Disconnect</string>
-    <string name="applications_filter_title">Applications</string>
-    <string name="applications_filter_subtitle">Choose which notifications to view</string>
+    <string name="action_connect">Połącz</string>
+    <string name="action_disconnect">Rozłącz</string>
+    <string name="applications_filter_title">Aplikacje</string>
+    <string name="applications_filter_subtitle">Wybierz które powiadomienia wyświetlać</string>
     <string-array name="morning_greetings" tools:ignore="InconsistentArrays">
-        <item>Good morning!</item>
-        <item>Have a good day!</item>
-        <item>Ready to go?</item>
-        <item>Rise and shine.</item>
-        <item>Don\'t forget your breakfast!</item>
+        <item>Dzień dobry!</item>
+        <item>Miłego dnia!</item>
+        <item>Gotowy?</item>
+        <item>Wznoś się i świeć.</item>
+        <item>Nie zapomnij o śniadaniu!</item>
     </string-array>
     <string-array name="evening_greetings" tools:ignore="InconsistentArrays">
-        <item>Good evening!</item>
-        <item>How did your day go?</item>
-        <item>Did you have a nice day?</item>
-        <item>After effort comes comfort.</item>
-        <item>Don\'t forget to have dinner!</item>
+        <item>Dobry wieczór!</item>
+        <item>Jak ci minął dzień?</item>
+        <item>Czy miałeś miły dzień?</item>
+        <item>Po wysiłku przychodzi komfort.</item>
+        <item>Nie zapomnij o kolacji!</item>
     </string-array>
     <string-array name="night_greetings" tools:ignore="InconsistentArrays">
-        <item>Good night!</item>
-        <item>Sleep well!</item>
-        <item>Sweet dreams till sunbeams find you!</item>
-        <item>See you tomorrow...</item>
-        <item>Don\'t stay up too late!</item>
+        <item>Dobrej nocy!</item>
+        <item>Śpij dobrze!</item>
+        <item>Słodkich snów, dopóki nie znajdą cię promienie słońca!</item>
+        <item>Widzimy się jutro...</item>
+        <item>Nie siedź za długo!</item>
     </string-array>
-    <string name="glance_notification_hide_timeout_title">Hide the notification after</string>
+    <string name="glance_notification_hide_timeout_title">Ukryj powiadomienie po</string>
     <string-array name="glance_notifications_timeout">
-        <item>30 seconds</item>
-        <item>1 minute</item>
-        <item>5 minutes</item>
-        <item>10 minutes</item>
-        <item>15 minutes</item>
-        <item>Dismissal</item>
+        <item>30 sekund</item>
+        <item>1 minuta</item>
+        <item>5 minuty</item>
+        <item>10 minuty</item>
+        <item>15 minuty</item>
+        <item>Odrzuceniu</item>
     </string-array>
-    <string name="settings_show_events_as_glance_provider_title">Events</string>
-    <string name="settings_show_events_as_glance_provider_subtitle">View a sneak peek of your calendar events and always show the current date.</string>
-    <string name="settings_show_events_as_glance_provider_error">Please enable the show of the events in the calendar tab and grant the required permission.</string>
+    <string name="settings_show_events_as_glance_provider_title">Wydarzenia</string>
+    <string name="settings_show_events_as_glance_provider_subtitle">Wyświetl podgląd twoich wydarzeń i pokazuj aktualną datę.</string>
+    <string name="settings_show_events_as_glance_provider_error">Włącz, aby wyświetlić wydarzenia w kalendarzu i przyznać wymagane uprawnienia.</string>
     <string name="events_glance_provider_format">%1$s %2$s</string>
 
     <!-- Settings -->
-    <string name="action_share">Share</string>
-    <string name="action_rate">Rate app</string>
-    <string name="action_support">Support me</string>
+    <string name="action_share">Udostępnij</string>
+    <string name="action_rate">Oceń aplikację</string>
+    <string name="action_support">Wspomóż mnie</string>
     <string name="action_feedback">Feedback</string>
-    <string name="action_about">About</string>
-    <string name="action_refresh_widget">Refresh widget</string>
+    <string name="action_about">O aplikacji</string>
+    <string name="action_refresh_widget">Odśwież widget</string>
     <string name="toolbar_transition_name" translatable="false">toolbar</string>
-    <string name="error_opening_uri">Error opening URL: Link copied to clipboard.</string>
-    <string name="loading_text">Loading Data...</string>
-    <string name="error_opening_app">Error opening app.</string>
-    <string name="default_name">Default app</string>
-    <string name="action_save">Save</string>
-    <string name="settings_visible">Visible</string>
-    <string name="settings_not_visible">Hidden</string>
-    <string name="support_translations_title">Help with translations</string>
-    <string name="support_translations_subtitle">Open a pull request on GitHub</string>
-    <string name="support_website_title">Check my other projects</string>
-    <string name="support_website_subtitle">Same developer, many possibilities</string>
-    <string name="error">Ooops, something went wrong!</string>
-    <string name="settings_theme_title">Theme</string>
-    <string name="support_main_subtitle">Devs always need a lot of coffee</string>
-    <string name="settings_subtitle_dark_theme_light">Light</string>
-    <string name="settings_subtitle_dark_theme_dark">Dark</string>
-    <string name="settings_subtitle_dark_theme_by_battery_saver">Set by battery saver</string>
-    <string name="settings_subtitle_dark_theme_follow_system">Follow the system theme</string>
-    <string name="settings_subtitle_dark_theme_default">Default</string>
-    <string name="search">Search</string>
-    <string name="settings_app_version_title">App version</string>
-    <string name="settings_title_show_wallpaper">Show wallpaper</string>
-    <string name="support_refresh_widget_subtitle">Force the restart of the widget service</string>
-    <string name="settings_feedback_subtitle">Feel free to help our project!</string>
-    <string name="settings_feedback_title">Feedback and feature requests</string>
+    <string name="error_opening_uri">Błąd otwierania adresu URL: Link skopiowany do schowka.</string>
+    <string name="loading_text">Ładowanie danych...</string>
+    <string name="error_opening_app">Błąd otwierania aplikacji.</string>
+    <string name="default_name">Domyślna aplikacja</string>
+    <string name="action_save">Zapisz</string>
+    <string name="settings_visible">Widoczne</string>
+    <string name="settings_not_visible">Ukryte</string>
+    <string name="support_translations_title">Pomóż przetłumaczyć aplikację</string>
+    <string name="support_translations_subtitle">Otwórz pull request na GitHub</string>
+    <string name="support_website_title">Sprawdź moje inne projekty</string>
+    <string name="support_website_subtitle">Ten sam developer, dużo możliwości</string>
+    <string name="error">Ooops, coś poszło nie tak!</string>
+    <string name="settings_theme_title">Motyw</string>
+    <string name="support_main_subtitle">Deweloperzy zawsze potrzebują dużo kawy</string>
+    <string name="settings_subtitle_dark_theme_light">Jasny</string>
+    <string name="settings_subtitle_dark_theme_dark">Ciemny</string>
+    <string name="settings_subtitle_dark_theme_by_battery_saver">Zgodnie z oszczędzaniem bateriiSet by battery saver</string>
+    <string name="settings_subtitle_dark_theme_follow_system">Podążaj za systemem</string>
+    <string name="settings_subtitle_dark_theme_default">Domyślny</string>
+    <string name="search">Szukaj</string>
+    <string name="settings_app_version_title">Wersja aplikacji</string>
+    <string name="settings_title_show_wallpaper">Pokaż tapetę</string>
+    <string name="support_refresh_widget_subtitle">Wymuś zresetowanie usługi widgetu</string>
+    <string name="settings_feedback_subtitle">Zapraszam do pomocy w naszym projekcie!</string>
+    <string name="settings_feedback_title">Opinia i pomysły na funkcje</string>
     <string name="xiaomi_manufacturer" translatable="false">xiaomi</string>
-    <string name="xiaomi_warning_title">Xiaomi Devices</string>
-    <string name="xiaomi_warning_message">Enable the permission to display pop-up windows when running in the background inside the "Other permission" section of the app settings. Otherwise, you will not able to open any applications tapping on the widget.</string>
-    <string name="action_ignore">Ignore</string>
-    <string name="action_grant_permission">Grant permission</string>
-    <string name="settings_title">Settings</string>
-    <string name="style_header">Style</string>
-    <string name="actions_header">Actions</string>
-    <string name="provider_header">Provider</string>
-    <string name="appearance_header">Appearance</string>
-    <string name="preferences_header">Preferences</string>
+    <string name="xiaomi_warning_title">Urządzenia Xiaomi</string>
+    <string name="xiaomi_warning_message">Włącz uprawnienie aby wyświetlać pop-upu w tle ("Inne Ustawienia" w ustawieniach aplikacji). Inaczej nie będziesz mógł otworzyć aplikacji klikając w widget.</string>
+    <string name="action_ignore">Ignoruj</string>
+    <string name="action_grant_permission">Przyznaj uprawnienie</string>
+    <string name="settings_title">Ustawienia</string>
+    <string name="style_header">Styl</string>
+    <string name="actions_header">Akcje</string>
+    <string name="provider_header">Dostawca</string>
+    <string name="appearance_header">Wygląd</string>
+    <string name="preferences_header">Preferencje</string>
     <string name="settings_privacy_policy_title"><![CDATA[Legal & Privacy]]></string>
-    <string name="settings_privacy_policy_subtitle">View the privacy policy of the app</string>
-    <string name="project_header">Open-source project</string>
-    <string name="information_header">Information</string>
+    <string name="settings_privacy_policy_subtitle">Zobacz politykę prywatności aplikacji</string>
+    <string name="project_header">Projekt open-source</string>
+    <string name="information_header">Informacje</string>
 
     <!-- Activities -->
-    <string name="action_choose_application">Choose application</string>
-    <string name="support_main_title">Support the developer</string>
-    <string name="thanks">Thanks for supporting me!</string>
-    <string name="donation_coffee">An italian coffee</string>
-    <string name="donation_donuts">Some glazed donuts</string>
-    <string name="donation_dinner">An expensive dinner</string>
-    <string name="donation_breakfast">An english breakfast</string>
-    <string name="donation_lunch">A quick lunch</string>
-    <string name="action_show_widget_preview">Show widget preview</string>
-    <string name="support_dev_subtitle">This is a single developer project,\nso thank you for the support!</string>
-    <string name="settings_title_integrations">Integrations</string>
-    <string name="label_count_installed_integrations">%d installed integrations</string>
-    <string name="nothing">Nothing</string>
-    <string name="action_dismiss">Dismiss</string>
-    <string name="action_accept">Accept</string>
-    <string name="gestures_do_nothing">None</string>
-    <string name="song_info_format_activity_title">Song info format</string>
-    <string name="song_info_format_activity_subtitle">Change the visible song info</string>
+    <string name="action_choose_application">Wybierz aplikację</string>
+    <string name="support_main_title">Wspomóż dewelopera</string>
+    <string name="thanks">Dziękuję za wsparcie!</string>
+    <string name="donation_coffee">Włoska kawa</string>
+    <string name="donation_donuts">Kilka glazurowanych pączków</string>
+    <string name="donation_dinner">Droga kolacja</string>
+    <string name="donation_breakfast">Angielskie śniadanie</string>
+    <string name="donation_lunch">Szybki lunch</string>
+    <string name="action_show_widget_preview">Pokaż podgląd widgetu</string>
+    <string name="support_dev_subtitle">To jest projekt jednego dewelopera,\nwięc dziękuję za wsparcie!</string>
+    <string name="settings_title_integrations">Integracje</string>
+    <string name="label_count_installed_integrations">%d zainstalowanych integracji</string>
+    <string name="nothing">Nic</string>
+    <string name="action_dismiss">Odrzuć</string>
+    <string name="action_accept">Akceptuj</string>
+    <string name="gestures_do_nothing">Nic</string>
+    <string name="song_info_format_activity_title">Format informacji o utworze</string>
+    <string name="song_info_format_activity_subtitle">Zmień widoczne informacje o utworze</string>
 
     <!-- More -->
-    <string name="look_and_feel_header"><![CDATA[Look & feel]]></string>
-    <string name="typography_settings_title">Typography</string>
-    <string name="typography_settings_subtitle">Set text font, size and color</string>
-    <string name="layout_settings_title">Layout</string>
-    <string name="gestures_settings_subtitle">Actions, behaviour and shortcuts</string>
-    <string name="gestures_settings_title">Gestures</string>
-    <string name="gestures_amp_input_header"><![CDATA[Gestures & input]]></string>
-    <string name="clock_settings_subtitle">Set size, color and time zones</string>
-    <string name="layout_settings_subtitle">Widget spacing and tweaks</string>
-    <string name="smart_content_header">Smart content</string>
+    <string name="look_and_feel_header"><![CDATA[Wygląd & zachowanie]]></string>
+    <string name="typography_settings_title">Typografia</string>
+    <string name="typography_settings_subtitle">Zmień czcionkę, wielkość i kolor</string>
+    <string name="layout_settings_title">Układ</string>
+    <string name="gestures_settings_subtitle">Akcje, zachowanie i skróty</string>
+    <string name="gestures_settings_title">Gesty</string>
+    <string name="gestures_amp_input_header"><![CDATA[Gesty i wprowadzanie]]></string>
+    <string name="clock_settings_subtitle">Ustaw wielkość, kolor i strefę czasową</string>
+    <string name="layout_settings_subtitle">Odstępy w widgecie i poprawki</string>
+    <string name="smart_content_header">Inteligentna zawartość</string>
 </resources>

From 40644f365766edc509cfaa8f3dc8f263ac050d43 Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Mon, 3 May 2021 23:01:54 +0200
Subject: [PATCH 3/6] update widget

---
 .idea/caches/build_file_checksums.ser         | Bin 537 -> 537 bytes
 app/build.gradle                              |  32 +-
 .../components/GlanceSettingsDialog.kt        |   4 +-
 .../components/IconPackSelector.kt            |  15 +-
 .../anotherwidget/global/Constants.kt         |  24 +-
 .../anotherwidget/global/Preferences.kt       |  16 +-
 .../helpers/SettingsStringHelper.kt           |   6 +-
 .../anotherwidget/helpers/WeatherHelper.kt    | 152 ++-
 .../receivers/UpdatesReceiver.kt              |   7 +-
 .../tabs/WeatherProviderActivity.kt           |  18 +-
 .../ui/fragments/MainFragment.kt              |  30 +-
 .../ui/fragments/tabs/CalendarFragment.kt     |  22 +-
 .../ui/fragments/tabs/LayoutFragment.kt       |  71 +-
 .../ui/viewmodels/MainViewModel.kt            |   1 +
 .../anotherwidget/ui/widgets/ClockWidget.kt   |  75 ++
 .../ui/widgets/LeftAlignedWidget.kt           | 886 ++++++++++++++++
 .../anotherwidget/ui/widgets/MainWidget.kt    | 997 +-----------------
 .../ui/widgets/StandardWidget.kt              | 925 ++++++++++++++++
 .../main/res/layout/fragment_tab_layout.xml   |  37 +
 .../main/res/layout/left_aligned_widget.xml   | 212 ++++
 .../res/layout/left_aligned_widget_sans.xml   | 181 ++++
 .../main/res/layout/right_aligned_widget.xml  | 280 +++++
 .../res/layout/right_aligned_widget_sans.xml  | 173 +++
 app/src/main/res/layout/the_widget.xml        | 178 ++--
 app/src/main/res/layout/the_widget_sans.xml   |  72 +-
 app/src/main/res/values-it/strings.xml        |   4 +
 app/src/main/res/values/strings.xml           |   4 +
 build.gradle                                  |  10 +-
 28 files changed, 3101 insertions(+), 1331 deletions(-)
 create mode 100644 app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt
 create mode 100644 app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt
 create mode 100644 app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
 create mode 100644 app/src/main/res/layout/left_aligned_widget.xml
 create mode 100644 app/src/main/res/layout/left_aligned_widget_sans.xml
 create mode 100644 app/src/main/res/layout/right_aligned_widget.xml
 create mode 100644 app/src/main/res/layout/right_aligned_widget_sans.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9aff3fba66d182029c4e0dc0540d9e2e9cd28fc8..64d3a40ba2006e5a13b25073a36fd41c7968e269 100644
GIT binary patch
delta 54
zcmV-60LlNE1epYomj!tVE|Uk5oSzVn|GrGzyn!z;x;S>M(VIz=O98zRy-5N{W~mQ9
MyP?y9JSkm)cyy!}EC2ui

delta 54
zcmV-60LlNE1epYomj!n;DSSAQoSzVZDOmw+*K!*Zwe&=g2O&R`O98zR?Xb6Ce*W6t
MCX5*XrP0T|ctF(`X#fBK

diff --git a/app/build.gradle b/app/build.gradle
index ad1ed4b..89b5c2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,14 +65,14 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     // UI
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'com.google.android.material:material:1.3.0-beta01'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.browser:browser:1.3.0'
     implementation 'net.idik:slimadapter:2.1.2'
     implementation 'com.google.android:flexbox:2.0.1'
@@ -80,17 +80,17 @@ dependencies {
 
     // Lifecycle
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
-    implementation "androidx.work:work-runtime-ktx:2.4.0"
+    implementation "androidx.work:work-runtime-ktx:2.5.0"
 
     // EventBus
     implementation 'org.greenrobot:eventbus:3.2.0'
 
     // Navigation
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
 
     // Other
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -99,24 +99,24 @@ dependencies {
     implementation 'com.github.warkiz.widget:indicatorseekbar:2.1.2'
 
     //Glide
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
     // Fitness
     implementation 'com.google.android.gms:play-services-fitness:20.0.0'
-    implementation 'com.google.android.gms:play-services-auth:18.1.0'
+    implementation 'com.google.android.gms:play-services-auth:19.0.0'
 
     //Weather
     implementation 'com.github.KwabenBerko:OpenWeatherMap-Android-Library:2.0.2'
-    implementation 'com.google.android.gms:play-services-location:17.1.0'
+    implementation 'com.google.android.gms:play-services-location:18.0.0'
 
     // Billing
-    implementation 'com.android.billingclient:billing:3.0.2'
-    implementation 'com.android.billingclient:billing-ktx:3.0.2'
+    implementation 'com.android.billingclient:billing:3.0.3'
+    implementation 'com.android.billingclient:billing-ktx:3.0.3'
 
     // KTX
     implementation "androidx.core:core-ktx:1.3.2"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation 'androidx.core:core-ktx:1.3.2'
 
@@ -128,14 +128,14 @@ dependencies {
     implementation "com.github.haroldadmin:NetworkResponseAdapter:4.0.1"
 
     //Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
 
     // Add the Firebase SDK for Crashlytics.
-    implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.4.1'
 
     // Preferences
-    implementation 'com.chibatching.kotpref:kotpref:2.11.0'
-    implementation 'com.chibatching.kotpref:livedata-support:2.10.0'
+    implementation 'com.chibatching.kotpref:kotpref:2.13.1'
+    implementation 'com.chibatching.kotpref:livedata-support:2.13.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
     // Permissions
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceSettingsDialog.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceSettingsDialog.kt
index bde5deb..dc94327 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceSettingsDialog.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceSettingsDialog.kt
@@ -8,9 +8,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.view.LayoutInflater
-import android.view.View
 import androidx.core.view.isVisible
-import androidx.navigation.Navigation
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
@@ -119,7 +117,7 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
             binding.actionChangeNotificationTimer.setOnClickListener {
                 val dialog = BottomSheetMenu<Int>(context, header = context.getString(R.string.glance_notification_hide_timeout_title)).setSelectedValue(Preferences.hideNotificationAfter)
                 Constants.GlanceNotificationTimer.values().forEachIndexed { index, timeout ->
-                    dialog.addItem(stringArray[index], timeout.value)
+                    dialog.addItem(stringArray[index], timeout.rawValue)
                 }
                 dialog.addOnSelectItemListener { value ->
                     Preferences.hideNotificationAfter = value
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/components/IconPackSelector.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/IconPackSelector.kt
index adbf455..476cc0c 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/components/IconPackSelector.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/IconPackSelector.kt
@@ -2,7 +2,6 @@ package com.tommasoberlose.anotherwidget.components
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
@@ -28,13 +27,13 @@ class IconPackSelector(context: Context, private val header: String? = null) : B
         // Menu
         for (item in Constants.WeatherIconPack.values()) {
             val itemBinding = IconPackMenuItemBinding.inflate(LayoutInflater.from(context))
-            itemBinding.label.text = context.getString(R.string.settings_weather_icon_pack_default).format(item.value + 1)
-            itemBinding.root.isSelected = item.value == Preferences.weatherIconPack
+            itemBinding.label.text = context.getString(R.string.settings_weather_icon_pack_default).format(item.rawValue + 1)
+            itemBinding.root.isSelected = item.rawValue == Preferences.weatherIconPack
 
-            itemBinding.icon1.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "01d", item.value)))
-            itemBinding.icon2.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "01n", item.value)))
-            itemBinding.icon3.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "10d", item.value)))
-            itemBinding.icon4.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "09n", item.value)))
+            itemBinding.icon1.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "01d", item.rawValue)))
+            itemBinding.icon2.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "01n", item.rawValue)))
+            itemBinding.icon3.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "10d", item.rawValue)))
+            itemBinding.icon4.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "09n", item.rawValue)))
 
             listOf<ImageView>(itemBinding.icon1, itemBinding.icon2, itemBinding.icon3, itemBinding.icon4).forEach {
                 if (item == Constants.WeatherIconPack.MINIMAL) {
@@ -45,7 +44,7 @@ class IconPackSelector(context: Context, private val header: String? = null) : B
             }
 
             itemBinding.root.setOnClickListener {
-                Preferences.weatherIconPack = item.value
+                Preferences.weatherIconPack = item.rawValue
                 this.dismiss()
             }
             binding.menu.addView(itemBinding.root)
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 8bc81ab..a4eab88 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt
@@ -1,7 +1,5 @@
 package com.tommasoberlose.anotherwidget.global
 
-import java.text.SimpleDateFormat
-
 object Constants {
     const val RESULT_CODE_CUSTOM_LOCATION = 45
     const val RESULT_APP_NAME = "RESULT_APP_NAME"
@@ -11,14 +9,14 @@ object Constants {
     const val CUSTOM_FONT_DOWNLOADED = 2
     const val CUSTOM_FONT_DOWNLOAD_NEW = 3
 
-    enum class ClockBottomMargin(val value: Int) {
+    enum class ClockBottomMargin(val rawValue: Int) {
         NONE(0),
         SMALL(1),
         MEDIUM(2),
         LARGE(3)
     }
 
-    enum class SecondRowTopMargin(val value: Int) {
+    enum class SecondRowTopMargin(val rawValue: Int) {
         NONE(0),
         SMALL(1),
         MEDIUM(2),
@@ -41,13 +39,13 @@ object Constants {
         }
     }
 
-    enum class WidgetUpdateFrequency(val value: Int) {
+    enum class WidgetUpdateFrequency(val rawValue: Int) {
         LOW(0),
         DEFAULT(1),
         HIGH(2)
     }
 
-    enum class WeatherProvider(val value: Int) {
+    enum class WeatherProvider(val rawValue: Int) {
         OPEN_WEATHER(0),
         WEATHER_BIT(1),
         WEATHER_API(2),
@@ -57,12 +55,12 @@ object Constants {
         YR(6);
 
         companion object {
-            private val map = WeatherProvider.values().associateBy(WeatherProvider::value)
+            private val map = WeatherProvider.values().associateBy(WeatherProvider::rawValue)
             fun fromInt(type: Int) = map[type]
         }
     }
 
-    enum class GlanceNotificationTimer(val value: Int) {
+    enum class GlanceNotificationTimer(val rawValue: Int) {
         HALF_MINUTE(0),
         ONE_MINUTE(1),
         FIVE_MINUTES(2),
@@ -71,15 +69,21 @@ object Constants {
         WHEN_DISMISSED(5);
 
         companion object {
-            private val map = values().associateBy(GlanceNotificationTimer::value)
+            private val map = values().associateBy(GlanceNotificationTimer::rawValue)
             fun fromInt(type: Int) = map[type]
         }
     }
 
-    enum class WeatherIconPack(val value: Int) {
+    enum class WeatherIconPack(val rawValue: Int) {
         DEFAULT(0),
         MINIMAL(1),
         COOL(2),
         GOOGLE_NEWS(3)
     }
+
+    enum class WidgetAlign(val rawValue: Int) {
+        LEFT(0),
+        RIGHT(1),
+        CENTER(2)
+    }
 }
\ 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 289b9d4..ac21240 100755
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
@@ -1,13 +1,11 @@
 package com.tommasoberlose.anotherwidget.global
 
-import android.os.Build
 import androidx.appcompat.app.AppCompatDelegate.*
 import androidx.core.os.ConfigurationCompat
 import com.chibatching.kotpref.KotprefModel
 import com.tommasoberlose.anotherwidget.helpers.IntentHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.utils.isMetric
-import java.util.*
 
 object Preferences : KotprefModel() {
     override val commitAllPropertiesByDefault: Boolean = true
@@ -48,14 +46,14 @@ object Preferences : KotprefModel() {
     var weatherProviderApiWeatherApi by stringPref(default = "")
     var weatherProviderApiWeatherBit by stringPref(default = "")
     var weatherProviderApiAccuweather by stringPref(default = "")
-    var weatherProvider by intPref(default = if (ConfigurationCompat.getLocales(context.resources.configuration)[0].isMetric()) Constants.WeatherProvider.YR.value else Constants.WeatherProvider.WEATHER_GOV.value)
+    var weatherProvider by intPref(default = if (ConfigurationCompat.getLocales(context.resources.configuration)[0].isMetric()) Constants.WeatherProvider.YR.rawValue else Constants.WeatherProvider.WEATHER_GOV.rawValue)
     var weatherProviderError by stringPref(default = "")
     var weatherProviderLocationError by stringPref(default = "")
     var eventAppName by stringPref(key = "PREF_EVENT_APP_NAME", default = "")
     var eventAppPackage by stringPref(key = "PREF_EVENT_APP_PACKAGE", default = "")
     var openEventDetails by booleanPref(default = true)
 
-    var widgetUpdateFrequency by intPref(default = Constants.WidgetUpdateFrequency.DEFAULT.value)
+    var widgetUpdateFrequency by intPref(default = Constants.WidgetUpdateFrequency.DEFAULT.rawValue)
 
     var textGlobalColor by stringPref(key = "PREF_TEXT_COLOR", default = "#FFFFFF")
     var textGlobalAlpha by stringPref(default = "FF")
@@ -84,14 +82,14 @@ object Preferences : KotprefModel() {
 
     var showAMPMIndicator by booleanPref(default = true)
 
-    var weatherIconPack by intPref(default = Constants.WeatherIconPack.DEFAULT.value)
+    var weatherIconPack by intPref(default = Constants.WeatherIconPack.DEFAULT.rawValue)
 
     // Global
     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 secondRowTopMargin by intPref(default = Constants.SecondRowTopMargin.NONE.value)
+    var clockBottomMargin by intPref(default = Constants.ClockBottomMargin.MEDIUM.rawValue)
+    var secondRowTopMargin by intPref(default = Constants.SecondRowTopMargin.NONE.rawValue)
     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 = "")
@@ -111,6 +109,8 @@ object Preferences : KotprefModel() {
 
     var showDividers by booleanPref(default = true)
 
+    var widgetAlign by intPref(default = Constants.WidgetAlign.CENTER.rawValue)
+
     // Settings
     var showWallpaper by booleanPref(default = true)
     var showPreview by booleanPref(default = true)
@@ -127,7 +127,7 @@ object Preferences : KotprefModel() {
     var showDailySteps by booleanPref(default = false)
     var showGreetings by booleanPref(default = false)
     var showNotifications by booleanPref(default = false)
-    var hideNotificationAfter by intPref(default = Constants.GlanceNotificationTimer.ONE_MINUTE.value)
+    var hideNotificationAfter by intPref(default = Constants.GlanceNotificationTimer.ONE_MINUTE.rawValue)
 
     var lastNotificationId by intPref(default = -1)
     var lastNotificationTitle by stringPref(default = "")
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt
index f80505c..5e38c04 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt
@@ -96,13 +96,13 @@ object SettingsStringHelper {
             difference <= 0 -> {
                 return ""
             }
-            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.HIGH.value && TimeUnit.MILLISECONDS.toMinutes(difference) > 5 -> {
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.HIGH.rawValue && TimeUnit.MILLISECONDS.toMinutes(difference) > 5 -> {
                 return DateUtils.getRelativeTimeSpanString(start, start - 1000 * 60 * (TimeUnit.MILLISECONDS.toMinutes(difference) - 1 - (TimeUnit.MILLISECONDS.toMinutes(difference) - 1) % 5), DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString()
             }
-            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.DEFAULT.value && TimeUnit.MILLISECONDS.toMinutes(difference) > 5 -> {
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.DEFAULT.rawValue && TimeUnit.MILLISECONDS.toMinutes(difference) > 5 -> {
                 return DateUtils.getRelativeTimeSpanString(start, start - 1000 * 60 * (TimeUnit.MILLISECONDS.toMinutes(difference) - 1 - (TimeUnit.MILLISECONDS.toMinutes(difference) - 1) % 15), DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString()
             }
-            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.LOW.value -> {
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.LOW.rawValue -> {
                 return context.getString(R.string.soon)
             }
             TimeUnit.MILLISECONDS.toHours(difference) < 1 -> {
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
index 59241ba..26b3ce7 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
@@ -2,23 +2,15 @@ package com.tommasoberlose.anotherwidget.helpers
 
 import android.Manifest
 import android.content.Context
-import android.os.Build
-import android.util.Log
 import com.chibatching.kotpref.Kotpref
-import com.google.android.gms.location.LocationServices
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
 import com.tommasoberlose.anotherwidget.services.LocationService
-import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.isDarkTheme
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.greenrobot.eventbus.EventBus
 
 
 /**
@@ -122,97 +114,97 @@ object WeatherHelper {
         return when (icon) {
             "01d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.clear_day_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_day_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.clear_day_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.clear_day_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.clear_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.clear_day_4
                     else -> if (context.isDarkTheme()) R.drawable.clear_day_5 else R.drawable.clear_day_5_light
                 }
             }
             "02d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.partly_cloudy_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.partly_cloudy_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.partly_cloudy_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.partly_cloudy_4
                     else -> if (context.isDarkTheme()) R.drawable.partly_cloudy_5 else R.drawable.partly_cloudy_5_light
                 }
             }
             "03d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.mostly_cloudy_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.mostly_cloudy_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.mostly_cloudy_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.mostly_cloudy_4
                     else -> if (context.isDarkTheme()) R.drawable.mostly_cloudy_5 else R.drawable.mostly_cloudy_5_light
                 }
             }
             "04d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.cloudy_weather_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.cloudy_weather_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.cloudy_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.cloudy_weather_4
                     else -> if (context.isDarkTheme()) R.drawable.cloudy_weather_5 else R.drawable.cloudy_weather_5_light
                 }
             }
             "09d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_day_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_day_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.storm_weather_day_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.storm_weather_day_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.storm_weather_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.storm_weather_day_4
                     else -> if (context.isDarkTheme()) R.drawable.storm_weather_day_5 else R.drawable.storm_weather_day_5_light
                 }
             }
             "10d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_day_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_day_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rainy_day_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.rainy_day_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.rainy_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.rainy_day_4
                     else -> if (context.isDarkTheme()) R.drawable.rainy_day_5 else R.drawable.rainy_day_5_light
                 }
             }
             "11d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_day_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_day_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.thunder_day_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.thunder_day_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.thunder_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.thunder_day_4
                     else -> if (context.isDarkTheme()) R.drawable.thunder_day_5 else R.drawable.thunder_day_5_light
                 }
             }
             "13d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.snow_day_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_day_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.snow_day_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.snow_day_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.snow_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.snow_day_4
                     else -> if (context.isDarkTheme()) R.drawable.snow_day_5 else R.drawable.snow_day_5_light
                 }
             }
             "50d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_day_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_day_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_day_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.haze_day_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.haze_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.haze_day_4
                     else -> if (context.isDarkTheme()) R.drawable.haze_day_5 else R.drawable.haze_day_5_light
                 }
             }
             "80d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.windy_day_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_day_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.windy_day_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.windy_day_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.windy_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.windy_day_4
                     else -> if (context.isDarkTheme()) R.drawable.windy_day_5 else R.drawable.windy_day_5_light
                 }
             }
             "81d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_day_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_day_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rain_snow_day_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.rain_snow_day_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.rain_snow_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.rain_snow_day_4
                     else -> if (context.isDarkTheme()) R.drawable.rain_snow_day_5 else R.drawable.rain_snow_day_5_light
                 }
             }
             "82d" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_weather_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.haze_weather_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.haze_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.haze_weather_4
                     else -> if (context.isDarkTheme()) R.drawable.haze_weather_5 else R.drawable.haze_weather_5_light
                 }
             }
@@ -221,97 +213,97 @@ object WeatherHelper {
 
             "01n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.clear_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.clear_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.clear_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.clear_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.clear_night_4
                     else -> if (context.isDarkTheme()) R.drawable.clear_night_5 else R.drawable.clear_night_5_light
                 }
             }
             "02n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.partly_cloudy_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.partly_cloudy_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.partly_cloudy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.partly_cloudy_night_4
                     else -> if (context.isDarkTheme()) R.drawable.partly_cloudy_night_5 else R.drawable.partly_cloudy_night_5_light
                 }
             }
             "03n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.mostly_cloudy_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.mostly_cloudy_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.mostly_cloudy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.mostly_cloudy_night_4
                     else -> if (context.isDarkTheme()) R.drawable.mostly_cloudy_night_5 else R.drawable.mostly_cloudy_night_5_light
                 }
             }
             "04n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.cloudy_weather_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.cloudy_weather_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.cloudy_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.cloudy_weather_4
                     else -> if (context.isDarkTheme()) R.drawable.cloudy_weather_5 else R.drawable.cloudy_weather_5_light
                 }
             }
             "09n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.storm_weather_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.storm_weather_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.storm_weather_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.storm_weather_night_4
                     else -> if (context.isDarkTheme()) R.drawable.storm_weather_night_5 else R.drawable.storm_weather_night_5_light
                 }
             }
             "10n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rainy_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.rainy_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.rainy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.rainy_night_4
                     else -> if (context.isDarkTheme()) R.drawable.rainy_night_5 else R.drawable.rainy_night_5_light
                 }
             }
             "11n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.thunder_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.thunder_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.thunder_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.thunder_night_4
                     else -> if (context.isDarkTheme()) R.drawable.thunder_night_5 else R.drawable.thunder_night_5_light
                 }
             }
             "13n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.snow_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.snow_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.snow_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.snow_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.snow_night_4
                     else -> if (context.isDarkTheme()) R.drawable.snow_night_5 else R.drawable.snow_night_5_light
                 }
             }
             "50n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.haze_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.haze_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.haze_night_4
                     else -> if (context.isDarkTheme()) R.drawable.haze_night_5 else R.drawable.haze_night_5_light
                 }
             }
             "80n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.windy_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.windy_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.windy_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.windy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.windy_night_4
                     else -> if (context.isDarkTheme()) R.drawable.windy_night_5 else R.drawable.windy_night_5_light
                 }
             }
             "81n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_night_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_night_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rain_snow_night_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.rain_snow_night_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.rain_snow_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.rain_snow_night_4
                     else -> if (context.isDarkTheme()) R.drawable.rain_snow_night_5 else R.drawable.rain_snow_night_5_light
                 }
             }
             "82n" -> {
                 when (style) {
-                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3
-                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2
-                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_weather_4
+                    Constants.WeatherIconPack.COOL.rawValue -> R.drawable.haze_weather_3
+                    Constants.WeatherIconPack.MINIMAL.rawValue -> R.drawable.haze_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.rawValue -> R.drawable.haze_weather_4
                     else -> if (context.isDarkTheme()) R.drawable.haze_weather_5 else R.drawable.haze_weather_5_light
                 }
             }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
index 73c458d..36330f4 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
@@ -5,9 +5,6 @@ import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.util.Log
-import androidx.core.app.AlarmManagerCompat
-import androidx.core.content.ContextCompat.getSystemService
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
@@ -110,7 +107,7 @@ class UpdatesReceiver : BroadcastReceiver() {
                         if (diff.hours == 0) {
                             var minutes = 0
                             when (Preferences.widgetUpdateFrequency) {
-                                Constants.WidgetUpdateFrequency.DEFAULT.value -> {
+                                Constants.WidgetUpdateFrequency.DEFAULT.rawValue -> {
                                     minutes = when {
                                         diff.minutes > 50 -> 50
                                         diff.minutes > 30 -> 30
@@ -118,7 +115,7 @@ class UpdatesReceiver : BroadcastReceiver() {
                                         else -> 0
                                     }
                                 }
-                                Constants.WidgetUpdateFrequency.HIGH.value -> {
+                                Constants.WidgetUpdateFrequency.HIGH.rawValue -> {
                                     minutes = diff.minutes - (diff.minutes % 5)
                                 }
                             }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/WeatherProviderActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/WeatherProviderActivity.kt
index 544334f..ec5297a 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/WeatherProviderActivity.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/WeatherProviderActivity.kt
@@ -47,12 +47,12 @@ class WeatherProviderActivity : AppCompatActivity() {
                 injector
                     .text(R.id.text, WeatherHelper.getProviderName(this, provider))
                     .clicked(R.id.item) {
-                        if (Preferences.weatherProvider != provider.value) {
+                        if (Preferences.weatherProvider != provider.rawValue) {
                             Preferences.weatherProviderError = "-"
                             Preferences.weatherProviderLocationError = ""
                         }
                         val oldValue = Preferences.weatherProvider
-                        Preferences.weatherProvider = provider.value
+                        Preferences.weatherProvider = provider.rawValue
                         updateListItem(oldValue)
                         updateListItem()
                         binding.loader.isVisible = true
@@ -62,12 +62,12 @@ class WeatherProviderActivity : AppCompatActivity() {
                         }
                     }
                     .clicked(R.id.radioButton) {
-                        if (Preferences.weatherProvider != provider.value) {
+                        if (Preferences.weatherProvider != provider.rawValue) {
                             Preferences.weatherProviderError = "-"
                             Preferences.weatherProviderLocationError = ""
                         }
                         val oldValue = Preferences.weatherProvider
-                        Preferences.weatherProvider = provider.value
+                        Preferences.weatherProvider = provider.rawValue
                         updateListItem(oldValue)
                         updateListItem()
                         binding.loader.isVisible = true
@@ -76,7 +76,7 @@ class WeatherProviderActivity : AppCompatActivity() {
                             WeatherHelper.updateWeather(this@WeatherProviderActivity)
                         }
                     }
-                    .checked(R.id.radioButton, provider.value == Preferences.weatherProvider)
+                    .checked(R.id.radioButton, provider.rawValue == Preferences.weatherProvider)
                     .with<TextView>(R.id.text2) {
                         if (WeatherHelper.isKeyRequired(provider)) {
                             it.text = getString(R.string.api_key_required_message)
@@ -98,14 +98,14 @@ class WeatherProviderActivity : AppCompatActivity() {
                             }
                         }.show()
                     }
-                    .visibility(R.id.action_configure, if (/*WeatherHelper.isKeyRequired(provider) && */provider.value == Preferences.weatherProvider) View.VISIBLE else View.GONE)
+                    .visibility(R.id.action_configure, if (/*WeatherHelper.isKeyRequired(provider) && */provider.rawValue == Preferences.weatherProvider) View.VISIBLE else View.GONE)
                     .with<TextView>(R.id.provider_error) {
                         if (Preferences.weatherProviderError != "" && Preferences.weatherProviderError != "-") {
                             it.text = Preferences.weatherProviderError
-                            it.isVisible = provider.value == Preferences.weatherProvider
+                            it.isVisible = provider.rawValue == Preferences.weatherProvider
                         } else if (Preferences.weatherProviderLocationError != "") {
                             it.text = Preferences.weatherProviderLocationError
-                            it.isVisible = provider.value == Preferences.weatherProvider
+                            it.isVisible = provider.rawValue == Preferences.weatherProvider
                         } else {
                             it.isVisible = false
                         }
@@ -137,7 +137,7 @@ class WeatherProviderActivity : AppCompatActivity() {
 
     private fun updateListItem(provider: Int = Preferences.weatherProvider) {
         (adapter.data).forEachIndexed { index, item ->
-            if (item is Constants.WeatherProvider && item.value == provider) {
+            if (item is Constants.WeatherProvider && item.rawValue == provider) {
                 adapter.notifyItemChanged(index)
             }
         }
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 0bae616..048acf8 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
@@ -1,9 +1,7 @@
 package com.tommasoberlose.anotherwidget.ui.fragments
 
-import android.Manifest
 import android.animation.ValueAnimator
 import android.content.Intent
-import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -14,23 +12,14 @@ import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import android.widget.RelativeLayout
-import androidx.core.animation.addListener
-import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavController
 import androidx.navigation.Navigation
-import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.NavHostFragment
-import com.google.android.material.badge.BadgeDrawable
-import com.google.android.material.card.MaterialCardView
-import com.google.android.material.tabs.TabLayoutMediator
 import com.google.android.material.transition.MaterialSharedAxis
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.MaterialBottomSheetDialog
@@ -39,11 +28,10 @@ import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.*
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.isColorDark
-import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
-import com.tommasoberlose.anotherwidget.ui.adapters.ViewPagerAdapter
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.ui.widgets.StandardWidget
 import com.tommasoberlose.anotherwidget.utils.*
 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
@@ -54,7 +42,7 @@ class MainFragment : Fragment() {
 
     companion object {
         fun newInstance() = MainFragment()
-        private const val PREVIEW_BASE_HEIGHT = 120
+        private var PREVIEW_BASE_HEIGHT: Int = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) 120 else 200
     }
 
     private lateinit var viewModel: MainViewModel
@@ -164,6 +152,10 @@ class MainFragment : Fragment() {
             binding.toolbar.cardElevation = if (it > 0) 24f else 0f
         }
 
+        viewModel.widgetAlign.observe(viewLifecycleOwner) {
+            updatePreviewVisibility()
+        }
+
         viewModel.showPreview.observe(viewLifecycleOwner) {
             updatePreviewVisibility()
         }
@@ -209,7 +201,7 @@ class MainFragment : Fragment() {
 
             WidgetHelper.runWithCustomTypeface(requireContext()) { typeface ->
                 uiJob = lifecycleScope.launch(Dispatchers.IO) {
-                    val generatedView = MainWidget.generateWidgetView(requireContext(), typeface).root
+                    val generatedView = MainWidget.getWidgetView(requireContext(), typeface).root
 
                     withContext(Dispatchers.Main) {
                         generatedView.measure(0, 0)
@@ -252,13 +244,13 @@ class MainFragment : Fragment() {
 
         // Clock bottom margin
         binding.widgetDetail.clockBottomMarginNone.isVisible =
-            Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.value
+            Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.rawValue
         binding.widgetDetail.clockBottomMarginSmall.isVisible =
-            Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.value
+            Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.rawValue
         binding.widgetDetail.clockBottomMarginMedium.isVisible =
-            Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.value
+            Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.rawValue
         binding.widgetDetail.clockBottomMarginLarge.isVisible =
-            Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.value
+            Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.rawValue
 
     }
 
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/CalendarFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/CalendarFragment.kt
index 3b23956..1b0ac73 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/CalendarFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/CalendarFragment.kt
@@ -1,19 +1,14 @@
 package com.tommasoberlose.anotherwidget.ui.fragments.tabs
 
 import android.Manifest
-import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.provider.CalendarContract
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import com.chibatching.kotpref.bulk
 import com.google.android.material.transition.MaterialSharedAxis
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
@@ -21,20 +16,15 @@ import com.tommasoberlose.anotherwidget.models.CalendarSelector
 import com.tommasoberlose.anotherwidget.databinding.FragmentTabCalendarBinding
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
-import com.tommasoberlose.anotherwidget.global.RequestCode
-import com.tommasoberlose.anotherwidget.ui.activities.tabs.ChooseApplicationActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
-import com.tommasoberlose.anotherwidget.helpers.IntentHelper
 import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
-import com.tommasoberlose.anotherwidget.utils.isDefaultSet
 import com.tommasoberlose.anotherwidget.utils.toast
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlin.Comparator
 
 class CalendarFragment : Fragment() {
 
@@ -110,9 +100,9 @@ class CalendarFragment : Fragment() {
         viewModel.widgetUpdateFrequency.observe(viewLifecycleOwner) {
             maintainScrollPosition {
                 binding.widgetUpdateFrequencyLabel.text = when (it) {
-                    Constants.WidgetUpdateFrequency.HIGH.value -> getString(R.string.settings_widget_update_frequency_high)
-                    Constants.WidgetUpdateFrequency.DEFAULT.value -> getString(R.string.settings_widget_update_frequency_default)
-                    Constants.WidgetUpdateFrequency.LOW.value -> getString(R.string.settings_widget_update_frequency_low)
+                    Constants.WidgetUpdateFrequency.HIGH.rawValue -> getString(R.string.settings_widget_update_frequency_high)
+                    Constants.WidgetUpdateFrequency.DEFAULT.rawValue -> getString(R.string.settings_widget_update_frequency_default)
+                    Constants.WidgetUpdateFrequency.LOW.rawValue -> getString(R.string.settings_widget_update_frequency_low)
                     else -> ""
                 }
             }
@@ -244,9 +234,9 @@ class CalendarFragment : Fragment() {
         binding.actionWidgetUpdateFrequency.setOnClickListener {
             if (Preferences.showEvents && Preferences.showDiffTime) {
                 BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_widget_update_frequency_title), message = getString(R.string.settings_widget_update_frequency_subtitle)).setSelectedValue(Preferences.widgetUpdateFrequency)
-                    .addItem(getString(R.string.settings_widget_update_frequency_high), Constants.WidgetUpdateFrequency.HIGH.value)
-                    .addItem(getString(R.string.settings_widget_update_frequency_default), Constants.WidgetUpdateFrequency.DEFAULT.value)
-                    .addItem(getString(R.string.settings_widget_update_frequency_low), Constants.WidgetUpdateFrequency.LOW.value)
+                    .addItem(getString(R.string.settings_widget_update_frequency_high), Constants.WidgetUpdateFrequency.HIGH.rawValue)
+                    .addItem(getString(R.string.settings_widget_update_frequency_default), Constants.WidgetUpdateFrequency.DEFAULT.rawValue)
+                    .addItem(getString(R.string.settings_widget_update_frequency_low), Constants.WidgetUpdateFrequency.LOW.rawValue)
                     .addOnSelectItemListener { value ->
                         Preferences.widgetUpdateFrequency = value
                     }.show()
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 c19a10d..8df929f 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
@@ -1,17 +1,14 @@
 package com.tommasoberlose.anotherwidget.ui.fragments.tabs
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import com.chibatching.kotpref.blockingBulk
 import com.google.android.material.transition.MaterialSharedAxis
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetColorPicker
@@ -22,8 +19,6 @@ import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toHexValue
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
-import com.tommasoberlose.anotherwidget.helpers.DateHelper
-import com.tommasoberlose.anotherwidget.ui.activities.tabs.CustomDateActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.utils.isDarkTheme
@@ -31,7 +26,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.util.*
 
 
 class LayoutFragment : Fragment() {
@@ -94,20 +88,31 @@ class LayoutFragment : Fragment() {
         viewModel.secondRowTopMargin.observe(viewLifecycleOwner) {
             maintainScrollPosition {
                 binding.secondRowTopMarginLabel.text = when (it) {
-                    Constants.SecondRowTopMargin.NONE.value -> getString(R.string.settings_clock_bottom_margin_subtitle_none)
-                    Constants.SecondRowTopMargin.SMALL.value -> getString(R.string.settings_clock_bottom_margin_subtitle_small)
-                    Constants.SecondRowTopMargin.LARGE.value -> getString(R.string.settings_clock_bottom_margin_subtitle_large)
+                    Constants.SecondRowTopMargin.NONE.rawValue -> getString(R.string.settings_clock_bottom_margin_subtitle_none)
+                    Constants.SecondRowTopMargin.SMALL.rawValue -> getString(R.string.settings_clock_bottom_margin_subtitle_small)
+                    Constants.SecondRowTopMargin.LARGE.rawValue -> getString(R.string.settings_clock_bottom_margin_subtitle_large)
                     else -> getString(R.string.settings_clock_bottom_margin_subtitle_medium)
                 }
             }
         }
 
+        viewModel.widgetAlign.observe(viewLifecycleOwner) {
+            maintainScrollPosition {
+                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)
+                }
+            }
+        }
+
         viewModel.clockBottomMargin.observe(viewLifecycleOwner) {
             maintainScrollPosition {
                 binding.clockBottomMarginLabel.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)
+                    Constants.ClockBottomMargin.NONE.rawValue -> getString(R.string.settings_clock_bottom_margin_subtitle_none)
+                    Constants.ClockBottomMargin.SMALL.rawValue -> getString(R.string.settings_clock_bottom_margin_subtitle_small)
+                    Constants.ClockBottomMargin.LARGE.rawValue -> getString(R.string.settings_clock_bottom_margin_subtitle_large)
                     else -> getString(R.string.settings_clock_bottom_margin_subtitle_medium)
                 }
             }
@@ -115,7 +120,7 @@ class LayoutFragment : Fragment() {
 
         viewModel.backgroundCardColor.observe(viewLifecycleOwner) {
             maintainScrollPosition {
-                if (Preferences.backgroundCardAlpha == "00") {
+                if (ColorHelper.getBackgroundAlpha(requireActivity().isDarkTheme()) == 0) {
                     binding.backgroundColorLabel.text = getString(R.string.transparent)
                 } else {
                     binding.backgroundColorLabel.text =
@@ -141,19 +146,19 @@ class LayoutFragment : Fragment() {
             ).setSelectedValue(Preferences.secondRowTopMargin)
                 .addItem(
                     getString(R.string.settings_clock_bottom_margin_subtitle_none),
-                    Constants.SecondRowTopMargin.NONE.value
+                    Constants.SecondRowTopMargin.NONE.rawValue
                 )
                 .addItem(
                     getString(R.string.settings_clock_bottom_margin_subtitle_small),
-                    Constants.SecondRowTopMargin.SMALL.value
+                    Constants.SecondRowTopMargin.SMALL.rawValue
                 )
                 .addItem(
                     getString(R.string.settings_clock_bottom_margin_subtitle_medium),
-                    Constants.SecondRowTopMargin.MEDIUM.value
+                    Constants.SecondRowTopMargin.MEDIUM.rawValue
                 )
                 .addItem(
                     getString(R.string.settings_clock_bottom_margin_subtitle_large),
-                    Constants.SecondRowTopMargin.LARGE.value
+                    Constants.SecondRowTopMargin.LARGE.rawValue
                 )
                 .addOnSelectItemListener { value ->
                     Preferences.secondRowTopMargin = value
@@ -167,25 +172,47 @@ class LayoutFragment : Fragment() {
             ).setSelectedValue(Preferences.clockBottomMargin)
                 .addItem(
                     getString(R.string.settings_clock_bottom_margin_subtitle_none),
-                    Constants.ClockBottomMargin.NONE.value
+                    Constants.ClockBottomMargin.NONE.rawValue
                 )
                 .addItem(
                     getString(R.string.settings_clock_bottom_margin_subtitle_small),
-                    Constants.ClockBottomMargin.SMALL.value
+                    Constants.ClockBottomMargin.SMALL.rawValue
                 )
                 .addItem(
                     getString(R.string.settings_clock_bottom_margin_subtitle_medium),
-                    Constants.ClockBottomMargin.MEDIUM.value
+                    Constants.ClockBottomMargin.MEDIUM.rawValue
                 )
                 .addItem(
                     getString(R.string.settings_clock_bottom_margin_subtitle_large),
-                    Constants.ClockBottomMargin.LARGE.value
+                    Constants.ClockBottomMargin.LARGE.rawValue
                 )
                 .addOnSelectItemListener { value ->
                     Preferences.clockBottomMargin = value
                 }.show()
         }
 
+        binding.actionWidgetAlign.setOnClickListener {
+            BottomSheetMenu<Int>(
+                requireContext(),
+                header = getString(R.string.settings_widget_align_title)
+            ).setSelectedValue(Preferences.widgetAlign)
+                .addItem(
+                    getString(R.string.settings_widget_align_center_subtitle),
+                    Constants.WidgetAlign.CENTER.rawValue
+                )
+                .addItem(
+                    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()
+        }
+
         binding.actionBackgroundColor.setOnClickListener {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,
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 42dab9d..915f85a 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
@@ -49,6 +49,7 @@ class MainViewModel(context: Application) : AndroidViewModel(context) {
     val secondRowInformation = Preferences.asLiveData(Preferences::secondRowInformation)
     val showDividers = Preferences.asLiveData(Preferences::showDividers)
     val secondRowTopMargin = Preferences.asLiveData(Preferences::secondRowTopMargin)
+    val widgetAlign = Preferences.asLiveData(Preferences::widgetAlign)
 
     // Calendar Settings
     val showEvents = Preferences.asLiveData(Preferences::showEvents)
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt
new file mode 100644
index 0000000..6433989
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt
@@ -0,0 +1,75 @@
+package com.tommasoberlose.anotherwidget.ui.widgets
+
+import android.app.PendingIntent
+import android.content.Context
+import android.util.TypedValue
+import android.view.View
+import android.widget.RemoteViews
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper
+import com.tommasoberlose.anotherwidget.helpers.IntentHelper
+import com.tommasoberlose.anotherwidget.receivers.CrashlyticsReceiver
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
+import com.tommasoberlose.anotherwidget.utils.toPixel
+
+class ClockWidget(val context: Context) {
+    fun updateClockView(views: RemoteViews, widgetID: Int): RemoteViews {
+        try {
+            if (!Preferences.showClock) {
+                views.setViewVisibility(R.id.time, View.GONE)
+                views.setViewVisibility(R.id.time_am_pm, 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.getClockFontColor(context.isDarkTheme()))
+                views.setTextColor(R.id.time_am_pm, ColorHelper.getClockFontColor(context.isDarkTheme()))
+                views.setTextViewTextSize(
+                    R.id.time,
+                    TypedValue.COMPLEX_UNIT_SP,
+                    Preferences.clockTextSize.toPixel(context)
+                )
+                views.setTextViewTextSize(
+                    R.id.time_am_pm,
+                    TypedValue.COMPLEX_UNIT_SP,
+                    Preferences.clockTextSize.toPixel(context) / 5 * 2
+                )
+                val clockPIntent = PendingIntent.getActivity(
+                    context,
+                    widgetID,
+                    IntentHelper.getClockIntent(context),
+                    0
+                )
+                views.setOnClickPendingIntent(R.id.time, clockPIntent)
+                views.setOnClickPendingIntent(R.id.time_am_pm, clockPIntent)
+                views.setViewVisibility(R.id.time, View.VISIBLE)
+                views.setViewVisibility(R.id.time_am_pm, if (Preferences.showAMPMIndicator) View.VISIBLE else View.GONE)
+
+                views.setViewVisibility(
+                    R.id.clock_bottom_margin_none,
+                    if (Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.rawValue) View.VISIBLE else View.GONE
+                )
+                views.setViewVisibility(
+                    R.id.clock_bottom_margin_small,
+                    if (Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.rawValue) View.VISIBLE else View.GONE
+                )
+                views.setViewVisibility(
+                    R.id.clock_bottom_margin_medium,
+                    if (Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.rawValue) View.VISIBLE else View.GONE
+                )
+                views.setViewVisibility(
+                    R.id.clock_bottom_margin_large,
+                    if (Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.rawValue) View.VISIBLE else View.GONE
+                )
+            }
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+            CrashlyticsReceiver.sendCrash(context, ex)
+        }
+
+        return views
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..7a28fc2
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt
@@ -0,0 +1,886 @@
+package com.tommasoberlose.anotherwidget.ui.widgets
+
+import android.Manifest
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.Typeface
+import android.text.format.DateUtils
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.RemoteViews
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.databinding.LeftAlignedWidgetBinding
+import com.tommasoberlose.anotherwidget.db.EventRepository
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.*
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
+import com.tommasoberlose.anotherwidget.helpers.ImageHelper.applyShadow
+import com.tommasoberlose.anotherwidget.receivers.CrashlyticsReceiver
+import com.tommasoberlose.anotherwidget.receivers.NewCalendarEventReceiver
+import com.tommasoberlose.anotherwidget.receivers.WidgetClickListenerReceiver
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.convertDpToPixel
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
+import java.text.DateFormat
+import java.util.*
+import java.util.concurrent.TimeUnit
+import kotlin.math.roundToInt
+
+class LeftAlignedWidget(val context: Context) {
+    fun generateWidget(appWidgetId: Int, w: Int, typeface: Typeface? = null): RemoteViews {
+
+        var views = RemoteViews(context.packageName, R.layout.left_aligned_widget_sans)
+
+        try {
+            // Background
+            views.setInt(
+                R.id.widget_shape_background,
+                "setColorFilter",
+                ColorHelper.getBackgroundColorRgb(context.isDarkTheme())
+            )
+            views.setInt(
+                R.id.widget_shape_background,
+                "setImageAlpha",
+                ColorHelper.getBackgroundAlpha(context.isDarkTheme())
+            )
+            val refreshIntent = PendingIntent.getActivity(
+                context,
+                appWidgetId,
+                IntentHelper.getWidgetUpdateIntent(context),
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            views.setOnClickPendingIntent(R.id.widget_shape_background, refreshIntent)
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+            CrashlyticsReceiver.sendCrash(context, ex)
+        }
+
+        // Clock
+        views = ClockWidget(context).updateClockView(views, appWidgetId)
+
+        // Setup listener
+        try {
+            val generatedBinding = generateWidgetView(typeface)
+            views.setImageViewBitmap(
+                R.id.bitmap_container,
+                BitmapHelper.getBitmapFromView(generatedBinding.root, width = w)
+            )
+            views = updateGridView(generatedBinding, views, appWidgetId)
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+            CrashlyticsReceiver.sendCrash(context, ex)
+        }
+
+        return views
+    }
+
+    private fun updateGridView(bindingView: LeftAlignedWidgetBinding, views: RemoteViews, widgetID: Int): RemoteViews {
+        val eventRepository = EventRepository(context)
+        try {
+            // Weather
+            if (Preferences.showWeather && Preferences.weatherIcon != "") {
+                views.setViewVisibility(R.id.weather_rect, View.VISIBLE)
+                views.setViewVisibility(R.id.weather_sub_line, View.GONE)
+
+                val i = Intent(context, WidgetClickListenerReceiver::class.java)
+                i.action = Actions.ACTION_OPEN_WEATHER_INTENT
+                val weatherPIntent = PendingIntent.getBroadcast(context, widgetID, i, 0)
+
+                views.setOnClickPendingIntent(R.id.weather_rect, weatherPIntent)
+                views.setOnClickPendingIntent(R.id.weather_sub_line_rect, weatherPIntent)
+
+                views.setImageViewBitmap(
+                    R.id.weather_rect,
+                    BitmapHelper.getBitmapFromView(bindingView.weatherDateLine, draw = false)
+                )
+
+                views.setImageViewBitmap(
+                    R.id.weather_sub_line_rect,
+                    BitmapHelper.getBitmapFromView(bindingView.weatherSubLine, draw = false)
+                )
+            } else {
+                views.setViewVisibility(R.id.weather_rect, View.GONE)
+                views.setViewVisibility(R.id.weather_sub_line, View.GONE)
+            }
+
+
+            // Calendar
+            views.setImageViewBitmap(
+                R.id.date_rect,
+                BitmapHelper.getBitmapFromView(bindingView.date, draw = false)
+            )
+
+            val calPIntent = PendingIntent.getActivity(
+                context,
+                widgetID,
+                IntentHelper.getCalendarIntent(context),
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            views.setOnClickPendingIntent(R.id.date_rect, calPIntent)
+            views.setViewVisibility(R.id.date_layout, View.VISIBLE)
+
+            val nextEvent = eventRepository.getNextEvent()
+            val nextAlarm = AlarmHelper.getNextAlarm(context)
+
+            // Spacing
+            views.setViewVisibility(
+                R.id.sub_line_top_margin_small_sans,
+                if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.rawValue) View.VISIBLE else View.GONE
+            )
+            views.setViewVisibility(
+                R.id.sub_line_top_margin_medium_sans,
+                if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.rawValue) View.VISIBLE else View.GONE
+            )
+            views.setViewVisibility(
+                R.id.sub_line_top_margin_large_sans,
+                if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.rawValue) View.VISIBLE else View.GONE
+            )
+
+            if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) {
+                if (Preferences.showNextEvent && eventRepository.getEventsCount() > 1) {
+
+                    // Action next event
+                    views.setImageViewBitmap(
+                        R.id.action_next_rect,
+                        BitmapHelper.getBitmapFromView(bindingView.actionNext, draw = false)
+                    )
+                    views.setViewVisibility(R.id.action_next_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(
+                        R.id.action_next_rect,
+                        PendingIntent.getBroadcast(
+                            context,
+                            widgetID,
+                            Intent(
+                                context,
+                                NewCalendarEventReceiver::class.java
+                            ).apply { action = Actions.ACTION_GO_TO_NEXT_EVENT },
+                            PendingIntent.FLAG_UPDATE_CURRENT
+                        )
+                    )
+
+                    views.setViewVisibility(R.id.action_next_rect, View.VISIBLE)
+                } else {
+                    views.setViewVisibility(R.id.action_next_rect, View.GONE)
+                }
+
+                // Event intent
+                val eventIntent = PendingIntent.getActivity(
+                    context,
+                    widgetID,
+                    IntentHelper.getEventIntent(context, nextEvent),
+                    PendingIntent.FLAG_UPDATE_CURRENT
+                )
+                views.setOnClickPendingIntent(R.id.next_event_rect, eventIntent)
+                views.setViewVisibility(R.id.next_event_rect, View.VISIBLE)
+
+                // Event time difference
+                if (Preferences.showDiffTime && Calendar.getInstance().timeInMillis < (nextEvent.startDate - 1000 * 60 * 60)) {
+                    views.setImageViewBitmap(
+                        R.id.next_event_difference_time_rect,
+                        BitmapHelper.getBitmapFromView(
+                            bindingView.nextEventDifferenceTime,
+                            draw = false
+                        )
+                    )
+                    views.setViewVisibility(R.id.next_event_difference_time_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(R.id.next_event_difference_time_rect, eventIntent)
+                } else {
+                    views.setViewVisibility(R.id.next_event_difference_time_rect, View.GONE)
+                }
+
+                // Event information
+                if (nextEvent.address != "" && Preferences.secondRowInformation == 1) {
+                    val mapIntent = PendingIntent.getActivity(
+                        context,
+                        widgetID,
+                        IntentHelper.getGoogleMapsIntentFromAddress(context, nextEvent.address),
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                    )
+                    views.setOnClickPendingIntent(R.id.sub_line_rect, mapIntent)
+                } else {
+                    val pIntentDetail = PendingIntent.getActivity(
+                        context,
+                        widgetID,
+                        IntentHelper.getEventIntent(
+                            context,
+                            nextEvent,
+                            forceEventDetails = true
+                        ),
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                    )
+                    views.setOnClickPendingIntent(R.id.sub_line_rect, pIntentDetail)
+                }
+
+                views.setImageViewBitmap(
+                    R.id.next_event_rect,
+                    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)
+            } else if (GlanceProviderHelper.showGlanceProviders(context) && bindingView.calendarLayout.isVisible) {
+                var showSomething = false
+                loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
+                    when (provider) {
+                        Constants.GlanceProviderId.PLAYING_SONG -> {
+                            if (MediaPlayerHelper.isSomeonePlaying(context)) {
+                                val musicIntent = PendingIntent.getActivity(
+                                    context,
+                                    widgetID,
+                                    IntentHelper.getMusicIntent(context),
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                                views.setOnClickPendingIntent(R.id.sub_line_rect, musicIntent)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
+                            if (Preferences.showNextAlarm && nextAlarm != "") {
+                                val alarmIntent = PendingIntent.getActivity(
+                                    context,
+                                    widgetID,
+                                    IntentHelper.getClockIntent(context),
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                                views.setOnClickPendingIntent(R.id.sub_line_rect, alarmIntent)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                            if (Preferences.showBatteryCharging) {
+                                BatteryHelper.updateBatteryInfo(context)
+                                if (Preferences.isCharging || Preferences.isBatteryLevelLow) {
+                                    val batteryIntent = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getBatteryIntent(),
+                                        PendingIntent.FLAG_UPDATE_CURRENT
+                                    )
+                                    views.setOnClickPendingIntent(R.id.sub_line_rect, batteryIntent)
+                                    showSomething = true
+                                    break@loop
+                                }
+                            }
+                        }
+                        Constants.GlanceProviderId.CUSTOM_INFO -> {
+                            if (Preferences.customNotes.isNotEmpty()) {
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                            if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                                val fitIntent = PendingIntent.getActivity(
+                                    context,
+                                    widgetID,
+                                    IntentHelper.getFitIntent(context),
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                                views.setOnClickPendingIntent(R.id.sub_line_rect, fitIntent)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.NOTIFICATIONS -> {
+                            if (Preferences.showNotifications && ActiveNotificationsHelper.showLastNotification()) {
+                                try {
+                                    if (Preferences.lastNotificationIcon != 0) {
+                                        val remotePackageContext = context.createPackageContext(
+                                            Preferences.lastNotificationPackage, 0)
+                                        ContextCompat.getDrawable(
+                                            remotePackageContext,
+                                            Preferences.lastNotificationIcon)
+                                    }
+                                    val notificationIntent = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getNotificationIntent(context),
+                                        PendingIntent.FLAG_UPDATE_CURRENT
+                                    )
+                                    views.setOnClickPendingIntent(
+                                        R.id.sub_line_rect,
+                                        notificationIntent
+                                    )
+                                    showSomething = true
+                                    break@loop
+                                } catch (ex: Exception) {}
+                            }
+                        }
+                        Constants.GlanceProviderId.GREETINGS -> {
+                            if (Preferences.showGreetings && GreetingsHelper.showGreetings() && GreetingsHelper.getRandomString(context).isNotBlank()) {
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.EVENTS -> {
+                            if (Preferences.showEventsAsGlanceProvider&& Preferences.showEvents && context.checkGrantedPermission(
+                                    Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                                val pIntentDetail = PendingIntent.getActivity(
+                                    context,
+                                    widgetID,
+                                    IntentHelper.getEventIntent(
+                                        context,
+                                        nextEvent,
+                                        forceEventDetails = true
+                                    ),
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                                views.setOnClickPendingIntent(
+                                    R.id.sub_line_rect,
+                                    pIntentDetail
+                                )
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                    }
+                }
+
+
+                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.sub_line_rect, View.VISIBLE)
+
+                    views.setViewVisibility(R.id.weather_sub_line_rect, View.GONE)
+                } else {
+                    // Spacing
+                    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)
+                }
+            }
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+            CrashlyticsReceiver.sendCrash(context, ex)
+        } finally {
+            eventRepository.close()
+        }
+
+        return views
+    }
+
+
+    // Generates the widget bitmap from the view
+    fun generateWidgetView(typeface: Typeface? = null): LeftAlignedWidgetBinding {
+        val eventRepository = EventRepository(context)
+        val bindingView = LeftAlignedWidgetBinding.inflate(LayoutInflater.from(context))
+
+        bindingView.loader.isVisible = false
+
+        // Weather
+        if (Preferences.showWeather && Preferences.weatherIcon != "") {
+            bindingView.weatherDateLine.isVisible = true
+            val currentTemp = String.format(
+                Locale.getDefault(),
+                "%d °%s",
+                Preferences.weatherTemp.roundToInt(),
+                Preferences.weatherRealTempUnit
+            )
+
+            val icon: String = Preferences.weatherIcon
+            if (icon == "") {
+                bindingView.weatherSubLineWeatherIcon.isVisible = false
+                bindingView.weatherDateLineWeatherIcon.isVisible = false
+            } else {
+                bindingView.weatherSubLineWeatherIcon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
+                bindingView.weatherDateLineWeatherIcon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
+                bindingView.weatherSubLineWeatherIcon.isVisible = true
+                bindingView.weatherDateLineWeatherIcon.isVisible = true
+            }
+
+            bindingView.weatherDateLineTemperature.text = currentTemp
+            bindingView.weatherSubLineTemperature.text = currentTemp
+
+            if (GlanceProviderHelper.showGlanceProviders(context)) {
+                bindingView.weatherSubLine.isVisible = false
+            }
+        } else {
+            bindingView.weatherDateLine.isVisible = false
+            bindingView.weatherSubLine.isVisible = false
+        }
+
+        val now = Calendar.getInstance().apply {
+            set(Calendar.SECOND, 0)
+            set(Calendar.MILLISECOND, 0)
+        }
+
+        bindingView.dateLayout.isVisible = true
+        bindingView.calendarLayout.isVisible = false
+        bindingView.nextEventDifferenceTime.isVisible = false
+        bindingView.actionNext.isVisible = false
+
+        bindingView.date.text = DateHelper.getDateText(context, now)
+
+        val nextEvent = eventRepository.getNextEvent()
+        val nextAlarm = AlarmHelper.getNextAlarm(context)
+
+        if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) {
+            // Multiple counter
+            bindingView.actionNext.isVisible =
+                Preferences.showNextEvent && eventRepository.getEventsCount() > 1
+
+            bindingView.nextEvent.text = nextEvent.title
+
+            if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
+                bindingView.nextEventDifferenceTime.text = if (!nextEvent.allDay) {
+                    SettingsStringHelper.getDifferenceText(
+                        context,
+                        now.timeInMillis,
+                        nextEvent.startDate
+                    )
+                        .toLowerCase(Locale.getDefault())
+                } else {
+                    SettingsStringHelper.getAllDayEventDifferenceText(
+                        context,
+                        now.timeInMillis,
+                        nextEvent.startDate
+                    ).toLowerCase(Locale.getDefault())
+                }
+                bindingView.nextEventDifferenceTime.isVisible = true
+            } else {
+                bindingView.nextEventDifferenceTime.isVisible = false
+            }
+
+            if (nextEvent.address != "" && Preferences.secondRowInformation == 1) {
+                bindingView.subLineIcon.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        context,
+                        R.drawable.round_place_24
+                    )
+                )
+                bindingView.subLineText.text = nextEvent.address
+            } else {
+                bindingView.subLineIcon.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        context,
+                        R.drawable.round_today_24
+                    )
+                )
+                if (!nextEvent.allDay) {
+                    val startHour =
+                        DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault())
+                            .format(nextEvent.startDate)
+                    val endHour =
+                        DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault())
+                            .format(nextEvent.endDate)
+
+                    var dayDiff =
+                        TimeUnit.MILLISECONDS.toDays(nextEvent.endDate - nextEvent.startDate)
+
+                    val startCal = Calendar.getInstance()
+                    startCal.timeInMillis = nextEvent.startDate
+
+                    val endCal = Calendar.getInstance()
+                    endCal.timeInMillis = nextEvent.endDate
+
+                    if (startCal.get(Calendar.HOUR_OF_DAY) > endCal.get(Calendar.HOUR_OF_DAY)) {
+                        dayDiff++
+                    } else if (startCal.get(Calendar.HOUR_OF_DAY) == endCal.get(Calendar.HOUR_OF_DAY) && startCal.get(
+                            Calendar.MINUTE
+                        ) > endCal.get(Calendar.MINUTE)
+                    ) {
+                        dayDiff++
+                    }
+                    var multipleDay = ""
+                    if (dayDiff > 0) {
+                        multipleDay = String.format(
+                            " (+%s%s)",
+                            dayDiff,
+                            context.getString(R.string.day_char)
+                        )
+                    }
+
+                    if (nextEvent.startDate != nextEvent.endDate) {
+                        bindingView.subLineText.text =
+                            String.format("%s - %s%s", startHour, endHour, multipleDay)
+                    } else {
+                        bindingView.subLineText.text =
+                            String.format("%s", startHour)
+                    }
+
+                } else {
+                    val flags: Int =
+                        DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
+                    val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
+
+                    bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get(
+                            Calendar.DAY_OF_YEAR)) {
+                        DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                    } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get(
+                            Calendar.YEAR) > start.get(Calendar.YEAR)) {
+                        DateUtils.formatDateTime(context, now.timeInMillis, flags)
+                    } else {
+                        DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                    }
+                }
+            }
+
+            bindingView.dateLayout.isVisible = false
+            bindingView.calendarLayout.isVisible = true
+            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
+        } else if (GlanceProviderHelper.showGlanceProviders(context)) {
+            bindingView.subLineIcon.isVisible = true
+            var showSomething = false
+            loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(
+                context
+            )) {
+                when (provider) {
+                    Constants.GlanceProviderId.PLAYING_SONG -> {
+                        if (MediaPlayerHelper.isSomeonePlaying(context)) {
+                            bindingView.subLineIcon.setImageDrawable(
+                                ContextCompat.getDrawable(
+                                    context,
+                                    R.drawable.round_music_note_24
+                                )
+                            )
+                            bindingView.subLineText.text = MediaPlayerHelper.getMediaInfo()
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
+                        if (Preferences.showNextAlarm && nextAlarm != "") {
+                            bindingView.subLineIcon.setImageDrawable(
+                                ContextCompat.getDrawable(
+                                    context,
+                                    R.drawable.round_alarm_24
+                                )
+                            )
+                            bindingView.subLineText.text = AlarmHelper.getNextAlarm(context)
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                        if (Preferences.showBatteryCharging) {
+                            BatteryHelper.updateBatteryInfo(context)
+                            if (Preferences.isCharging) {
+                                bindingView.subLineIcon.isVisible = false
+                                val batteryLevel = BatteryHelper.getBatteryLevel(context)
+                                if (batteryLevel != 100) {
+                                    bindingView.subLineText.text = context.getString(R.string.charging)
+                                } else {
+                                    bindingView.subLineText.text =
+                                        context.getString(R.string.charged)
+                                }
+                                showSomething = true
+                                break@loop
+                            } else if (Preferences.isBatteryLevelLow) {
+                                bindingView.subLineIcon.isVisible = false
+                                bindingView.subLineText.text =
+                                    context.getString(R.string.battery_low_warning)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                    }
+                    Constants.GlanceProviderId.CUSTOM_INFO -> {
+                        if (Preferences.customNotes.isNotEmpty()) {
+                            bindingView.subLineIcon.isVisible = false
+                            bindingView.subLineText.text = Preferences.customNotes
+                            bindingView.subLineText.maxLines = 2
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                        if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                            bindingView.subLineIcon.isVisible = false
+                            bindingView.subLineText.text =
+                                context.getString(R.string.daily_steps_counter)
+                                    .format(Preferences.googleFitSteps)
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.NOTIFICATIONS -> {
+                        if (Preferences.showNotifications && ActiveNotificationsHelper.showLastNotification()) {
+                            try {
+                                if (Preferences.lastNotificationIcon != 0) {
+                                    val remotePackageContext = context.createPackageContext(
+                                        Preferences.lastNotificationPackage, 0)
+                                    val icon = ContextCompat.getDrawable(remotePackageContext,
+                                        Preferences.lastNotificationIcon)
+                                    bindingView.subLineIcon.isVisible = true
+                                    bindingView.subLineIcon.setImageDrawable(icon)
+                                } else {
+                                    bindingView.subLineIcon.isVisible = false
+                                }
+                                bindingView.subLineText.text = Preferences.lastNotificationTitle
+                                showSomething = true
+                                break@loop
+                            } catch (ex: Exception) {}
+                        }
+                    }
+                    Constants.GlanceProviderId.GREETINGS -> {
+                        val greetingsText = GreetingsHelper.getRandomString(context)
+                        if (Preferences.showGreetings && GreetingsHelper.showGreetings() && greetingsText.isNotBlank()) {
+                            bindingView.subLineText.text = greetingsText
+                            bindingView.subLineText.maxLines = 2
+                            bindingView.subLineIcon.isVisible = false
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.EVENTS -> {
+                        if (Preferences.showEventsAsGlanceProvider && Preferences.showEvents && context.checkGrantedPermission(
+                                Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                            bindingView.subLineText.text = context.getString(R.string.events_glance_provider_format).format(nextEvent.title, if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
+                                if (!nextEvent.allDay) {
+                                    SettingsStringHelper.getDifferenceText(
+                                        context,
+                                        now.timeInMillis,
+                                        nextEvent.startDate
+                                    )
+                                        .toLowerCase(Locale.getDefault())
+                                } else {
+                                    SettingsStringHelper.getAllDayEventDifferenceText(
+                                        context,
+                                        now.timeInMillis,
+                                        nextEvent.startDate
+                                    ).toLowerCase(Locale.getDefault())
+                                }
+                            } else "").trimEnd()
+                            bindingView.subLineIcon.isVisible = true
+                            bindingView.subLineIcon.setImageDrawable(
+                                ContextCompat.getDrawable(
+                                    context,
+                                    R.drawable.round_today_24
+                                )
+                            )
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                }
+            }
+
+            if (showSomething) {
+                bindingView.dateLayout.isVisible = true
+                bindingView.calendarLayout.isVisible = false
+                bindingView.subLine.isVisible = true
+                bindingView.weatherSubLine.isVisible = false
+
+                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
+            } else {
+                bindingView.subLineIcon.isVisible = false
+            }
+        }
+
+
+        // Color
+        listOf<TextView>(
+            bindingView.date,
+            bindingView.weatherDateLineTemperature,
+            bindingView.nextEvent,
+            bindingView.nextEventDifferenceTime,
+        ).forEach {
+            it.setTextColor(ColorHelper.getFontColor(context.applicationContext.isDarkTheme()))
+        }
+
+        if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.rawValue) {
+            listOf<ImageView>(bindingView.actionNext)
+        } else {
+            listOf<ImageView>(
+                bindingView.actionNext,
+                bindingView.weatherDateLineWeatherIcon,
+                bindingView.weatherSubLineWeatherIcon
+            )
+        }.forEach {
+            it.setColorFilter(ColorHelper.getFontColorRgb(context.applicationContext.isDarkTheme()))
+            it.alpha =
+                (if (context.isDarkTheme()) Preferences.textGlobalAlphaDark.toIntValue()
+                    .toFloat() else Preferences.textGlobalAlpha.toIntValue()
+                    .toFloat()) / 100
+        }
+
+        listOf<TextView>(bindingView.subLineText, bindingView.weatherSubLineDivider, bindingView.weatherSubLineTemperature).forEach {
+            it.setTextColor(ColorHelper.getSecondaryFontColor(context.applicationContext.isDarkTheme()))
+        }
+
+        if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.rawValue) {
+            listOf<ImageView>(bindingView.subLineIcon, bindingView.subLineIconShadow)
+        } else {
+            listOf<ImageView>(bindingView.subLineIcon, bindingView.weatherSubLineWeatherIcon, bindingView.subLineIconShadow)
+        }.forEach {
+            it.setColorFilter(ColorHelper.getSecondaryFontColorRgb(context.applicationContext.isDarkTheme()))
+            it.alpha =
+                (if (context.isDarkTheme()) Preferences.textSecondaryAlphaDark.toIntValue()
+                    .toFloat() else Preferences.textSecondaryAlpha.toIntValue()
+                    .toFloat()) / 100
+        }
+
+        // Text Size
+        listOf<Pair<TextView, Float>>(
+            bindingView.date to Preferences.textMainSize,
+            bindingView.weatherDateLineTemperature to ((Preferences.textMainSize + Preferences.textSecondSize) / 2),
+            bindingView.nextEvent to Preferences.textMainSize,
+            bindingView.nextEventDifferenceTime to Preferences.textMainSize,
+            bindingView.subLineText to Preferences.textSecondSize,
+            bindingView.weatherSubLineDivider to (Preferences.textSecondSize - 2),
+            bindingView.weatherSubLineTemperature to Preferences.textSecondSize,
+        ).forEach {
+            it.first.setTextSize(TypedValue.COMPLEX_UNIT_SP, it.second)
+        }
+
+        // Icons scale
+        bindingView.subLineIcon.scaleX = Preferences.textSecondSize / 18f
+        bindingView.subLineIcon.scaleY = Preferences.textSecondSize / 18f
+
+        bindingView.weatherSubLineWeatherIcon.scaleX = Preferences.textSecondSize / 18f
+        bindingView.weatherSubLineWeatherIcon.scaleY = Preferences.textSecondSize / 18f
+
+        bindingView.weatherDateLineWeatherIcon.scaleX = ((Preferences.textMainSize + Preferences.textSecondSize) / 2) / 20f
+        bindingView.weatherDateLineWeatherIcon.scaleY = ((Preferences.textMainSize + Preferences.textSecondSize) / 2) / 20f
+
+        bindingView.actionNext.scaleX = Preferences.textMainSize / 28f
+        bindingView.actionNext.scaleY = Preferences.textMainSize / 28f
+
+
+        // Shadows
+        val shadowRadius =
+            when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
+                0 -> 0f
+                1 -> 5f
+                2 -> 5f
+                else -> 5f
+            }
+        val shadowColor =
+            when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
+                0 -> Color.TRANSPARENT
+                1 -> R.color.black_50
+                2 -> Color.BLACK
+                else -> R.color.black_50
+            }
+        val shadowDy =
+            when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
+                0 -> 0f
+                1 -> 0f
+                2 -> 1f
+                else -> 0f
+            }
+
+        listOf<TextView>(
+            bindingView.date,
+            bindingView.weatherDateLineTemperature,
+            bindingView.nextEvent,
+            bindingView.nextEventDifferenceTime,
+            bindingView.subLineText,
+            bindingView.weatherSubLineDivider,
+            bindingView.weatherSubLineTemperature,
+        ).forEach {
+            it.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
+        }
+
+        // Icons shadow
+
+        listOf(
+            Pair(bindingView.subLineIcon, bindingView.subLineIconShadow),
+        ).forEach {
+            if ((if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) == 0) {
+                it.second.isVisible = false
+            } else {
+                it.second.isVisible = it.first.isVisible
+                it.second.scaleX = it.first.scaleX
+                it.second.scaleY = it.first.scaleY
+                it.second.applyShadow(it.first)
+            }
+        }
+
+        listOf(
+            Pair(bindingView.actionNext, bindingView.actionNextShadow),
+        ).forEach {
+            if ((if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) == 0) {
+                it.second.isVisible = false
+            } else {
+                it.second.isVisible = it.first.isVisible
+                it.second.scaleX = it.first.scaleX
+                it.second.scaleY = it.first.scaleY
+                it.second.applyShadow(it.first, 0.6f)
+            }
+        }
+
+        // Custom Font
+        if (Preferences.customFont == Constants.CUSTOM_FONT_GOOGLE_SANS) {
+            val googleSans: Typeface = when (Preferences.customFontVariant) {
+                "100" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_thin.ttf")
+                "200" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_light.ttf")
+                "500" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_medium.ttf")
+                "700" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_bold.ttf")
+                "800" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_black.ttf")
+                else -> Typeface.createFromAsset(context.assets, "fonts/google_sans_regular.ttf")
+            }
+
+            listOf<TextView>(
+                bindingView.date,
+                bindingView.weatherDateLineTemperature,
+                bindingView.nextEvent,
+                bindingView.nextEventDifferenceTime,
+                bindingView.subLineText,
+                bindingView.weatherSubLineDivider,
+                bindingView.weatherSubLineTemperature,
+            ).forEach {
+                it.typeface = googleSans
+            }
+        } else if (Preferences.customFont == Constants.CUSTOM_FONT_DOWNLOADED && typeface != null) {
+            listOf<TextView>(
+                bindingView.date,
+                bindingView.weatherDateLineTemperature,
+                bindingView.nextEvent,
+                bindingView.nextEventDifferenceTime,
+                bindingView.subLineText,
+                bindingView.weatherSubLineDivider,
+                bindingView.weatherSubLineTemperature,
+            ).forEach {
+                it.typeface = typeface
+            }
+        }
+
+        // Dividers
+        arrayOf(bindingView.weatherSubLineDivider).forEach {
+            it.visibility = if (Preferences.showDividers) View.VISIBLE else View.INVISIBLE
+            it.layoutParams = (it.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                this.marginEnd = if (Preferences.showDividers) 8f.convertDpToPixel(context).toInt() else 0
+            }
+        }
+
+        eventRepository.close()
+
+        return bindingView
+    }
+}
\ No newline at end of file
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 c797dcc..adb1dcc 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
@@ -7,13 +7,11 @@ import android.appwidget.AppWidgetProvider
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.content.IntentSender
 import android.content.res.Resources
 import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
 import android.text.format.DateUtils
-import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
@@ -23,8 +21,9 @@ import android.widget.RemoteViews
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import com.google.gson.Gson
+import androidx.viewbinding.ViewBinding
 import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.databinding.LeftAlignedWidgetBinding
 import com.tommasoberlose.anotherwidget.databinding.TheWidgetBinding
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Actions
@@ -98,991 +97,21 @@ class MainWidget : AppWidgetProvider() {
             val dimensions = WidgetHelper.WidgetSizeProvider(context, appWidgetManager).getWidgetsSize(appWidgetId)
 
             WidgetHelper.runWithCustomTypeface(context) {
-                generateWidgetView(context, appWidgetId, appWidgetManager, min(dimensions.first - 8.toPixel(context), min(width, height) - 16.toPixel(context)), it)
+                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)
             }
         }
 
-        private fun generateWidgetView(context: Context, appWidgetId: Int, appWidgetManager: AppWidgetManager, w: Int, typeface: Typeface? = null) {
-
-            var views = RemoteViews(context.packageName, R.layout.the_widget_sans)
-
-            try {
-                // Background
-                views.setInt(
-                    R.id.widget_shape_background,
-                    "setColorFilter",
-                    ColorHelper.getBackgroundColorRgb(context.isDarkTheme())
-                )
-                views.setInt(
-                    R.id.widget_shape_background,
-                    "setImageAlpha",
-                    ColorHelper.getBackgroundAlpha(context.isDarkTheme())
-                )
-                val refreshIntent = PendingIntent.getActivity(
-                    context,
-                    appWidgetId,
-                    IntentHelper.getWidgetUpdateIntent(context),
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-                views.setOnClickPendingIntent(R.id.widget_shape_background, refreshIntent)
-            } catch (ex: Exception) {
-                ex.printStackTrace()
-                CrashlyticsReceiver.sendCrash(context, ex)
+        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)
             }
-
-            // Clock
-            views = updateClockView(context, views, appWidgetId)
-
-            // Setup listener
-            try {
-
-                val generatedBinding = generateWidgetView(context, typeface)
-                views.setImageViewBitmap(
-                    R.id.bitmap_container,
-                    BitmapHelper.getBitmapFromView(generatedBinding.root, width = w)
-                )
-                views = updateCalendarView(context, generatedBinding, views, appWidgetId)
-                views = updateWeatherView(context, generatedBinding, views, appWidgetId)
-            } catch (ex: Exception) {
-                ex.printStackTrace()
-                CrashlyticsReceiver.sendCrash(context, ex)
-            }
-
-            appWidgetManager.updateAppWidget(appWidgetId, views)
-        }
-
-        private fun updateCalendarView(context: Context, bindingView: TheWidgetBinding, views: RemoteViews, widgetID: Int): RemoteViews {
-            val eventRepository = EventRepository(context)
-            try {
-                views.setImageViewBitmap(
-                    R.id.empty_date_rect,
-                    BitmapHelper.getBitmapFromView(bindingView.emptyDate, draw = false)
-                )
-
-                views.setViewVisibility(R.id.empty_layout_rect, View.VISIBLE)
-                views.setViewVisibility(R.id.calendar_layout_rect, View.GONE)
-                views.setViewVisibility(R.id.second_row_rect, View.GONE)
-                views.setViewVisibility(R.id.next_event_difference_time_rect, View.GONE)
-
-                val calPIntent = PendingIntent.getActivity(
-                    context,
-                    widgetID,
-                    IntentHelper.getCalendarIntent(context),
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-                views.setOnClickPendingIntent(R.id.empty_date_rect, calPIntent)
-
-                val nextEvent = eventRepository.getNextEvent()
-                val nextAlarm = AlarmHelper.getNextAlarm(context)
-
-                if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) {
-                    if (Preferences.showNextEvent && eventRepository.getEventsCount() > 1) {
-                        views.setImageViewBitmap(
-                            R.id.action_next_rect,
-                            BitmapHelper.getBitmapFromView(bindingView.actionNext, draw = false)
-                        )
-                        views.setViewVisibility(R.id.action_next_rect, View.VISIBLE)
-                        views.setOnClickPendingIntent(
-                            R.id.action_next_rect,
-                            PendingIntent.getBroadcast(
-                                context,
-                                widgetID,
-                                Intent(
-                                    context,
-                                    NewCalendarEventReceiver::class.java
-                                ).apply { action = Actions.ACTION_GO_TO_NEXT_EVENT },
-                                PendingIntent.FLAG_UPDATE_CURRENT
-                            )
-                        )
-
-                        views.setImageViewBitmap(
-                            R.id.action_previous_rect,
-                            BitmapHelper.getBitmapFromView(bindingView.actionPrevious, draw = false)
-                        )
-                        views.setViewVisibility(R.id.action_previous_rect, View.VISIBLE)
-                        views.setOnClickPendingIntent(
-                            R.id.action_previous_rect,
-                            PendingIntent.getBroadcast(
-                                context,
-                                widgetID,
-                                Intent(
-                                    context,
-                                    NewCalendarEventReceiver::class.java
-                                ).apply { action = Actions.ACTION_GO_TO_PREVIOUS_EVENT },
-                                PendingIntent.FLAG_UPDATE_CURRENT
-                            )
-                        )
-                    } else {
-                        views.setViewVisibility(R.id.action_next_rect, View.GONE)
-                        views.setViewVisibility(R.id.action_previous_rect, View.GONE)
-                    }
-
-                    val pIntent = PendingIntent.getActivity(
-                        context,
-                        widgetID,
-                        IntentHelper.getEventIntent(context, nextEvent),
-                        PendingIntent.FLAG_UPDATE_CURRENT
-                    )
-                    views.setOnClickPendingIntent(R.id.next_event_rect, pIntent)
-                    views.setOnClickPendingIntent(R.id.next_event_difference_time_rect, pIntent)
-
-                    if (Preferences.showDiffTime && Calendar.getInstance().timeInMillis < (nextEvent.startDate - 1000 * 60 * 60)) {
-                        views.setImageViewBitmap(
-                            R.id.next_event_difference_time_rect,
-                            BitmapHelper.getBitmapFromView(
-                                bindingView.nextEventDifferenceTime,
-                                draw = false
-                            )
-                        )
-                        views.setViewVisibility(R.id.next_event_difference_time_rect, View.VISIBLE)
-                    } else {
-                        views.setViewVisibility(R.id.next_event_difference_time_rect, View.GONE)
-                    }
-
-                    if (nextEvent.address != "" && Preferences.secondRowInformation == 1) {
-                        val mapIntent = PendingIntent.getActivity(
-                            context,
-                            widgetID,
-                            IntentHelper.getGoogleMapsIntentFromAddress(context, nextEvent.address),
-                            PendingIntent.FLAG_UPDATE_CURRENT
-                        )
-                        views.setOnClickPendingIntent(R.id.second_row_rect, mapIntent)
-                    } else {
-                        val pIntentDetail = PendingIntent.getActivity(
-                            context,
-                            widgetID,
-                            IntentHelper.getEventIntent(
-                                context,
-                                nextEvent,
-                                forceEventDetails = true
-                            ),
-                            PendingIntent.FLAG_UPDATE_CURRENT
-                        )
-                        views.setOnClickPendingIntent(R.id.second_row_rect, pIntentDetail)
-                    }
-
-                    views.setImageViewBitmap(
-                        R.id.next_event_rect,
-                        BitmapHelper.getBitmapFromView(bindingView.nextEvent, draw = false)
-                    )
-
-                    views.setImageViewBitmap(
-                        R.id.second_row_rect,
-                        BitmapHelper.getBitmapFromView(bindingView.secondRow, draw = false)
-                    )
-                    views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
-
-                    views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
-                    views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
-
-                    views.setViewVisibility(
-                        R.id.second_row_top_margin_small_sans,
-                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
-                    )
-                    views.setViewVisibility(
-                        R.id.second_row_top_margin_medium_sans,
-                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
-                    )
-                    views.setViewVisibility(
-                        R.id.second_row_top_margin_large_sans,
-                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
-                    )
-                } else if (GlanceProviderHelper.showGlanceProviders(context) && bindingView.calendarLayout.isVisible) {
-                    var showSomething = false
-                    loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
-                        when (provider) {
-                            Constants.GlanceProviderId.PLAYING_SONG -> {
-                                if (MediaPlayerHelper.isSomeonePlaying(context)) {
-                                    val musicIntent = PendingIntent.getActivity(
-                                        context,
-                                        widgetID,
-                                        IntentHelper.getMusicIntent(context),
-                                        PendingIntent.FLAG_UPDATE_CURRENT
-                                    )
-                                    views.setOnClickPendingIntent(R.id.second_row_rect, musicIntent)
-                                    showSomething = true
-                                    break@loop
-                                }
-                            }
-                            Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
-                                if (Preferences.showNextAlarm && nextAlarm != "") {
-                                    val alarmIntent = PendingIntent.getActivity(
-                                        context,
-                                        widgetID,
-                                        IntentHelper.getClockIntent(context),
-                                        PendingIntent.FLAG_UPDATE_CURRENT
-                                    )
-                                    views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
-                                    showSomething = true
-                                    break@loop
-                                }
-                            }
-                            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
-                                if (Preferences.showBatteryCharging) {
-                                    BatteryHelper.updateBatteryInfo(context)
-                                    if (Preferences.isCharging || Preferences.isBatteryLevelLow) {
-                                        val batteryIntent = PendingIntent.getActivity(
-                                            context,
-                                            widgetID,
-                                            IntentHelper.getBatteryIntent(),
-                                            PendingIntent.FLAG_UPDATE_CURRENT
-                                        )
-                                        views.setOnClickPendingIntent(R.id.second_row_rect, batteryIntent)
-                                        showSomething = true
-                                        break@loop
-                                    }
-                                }
-                            }
-                            Constants.GlanceProviderId.CUSTOM_INFO -> {
-                                if (Preferences.customNotes.isNotEmpty()) {
-                                    break@loop
-                                }
-                            }
-                            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
-                                if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
-                                    val fitIntent = PendingIntent.getActivity(
-                                        context,
-                                        widgetID,
-                                        IntentHelper.getFitIntent(context),
-                                        PendingIntent.FLAG_UPDATE_CURRENT
-                                    )
-                                    views.setOnClickPendingIntent(R.id.second_row_rect, fitIntent)
-                                    showSomething = true
-                                    break@loop
-                                }
-                            }
-                            Constants.GlanceProviderId.NOTIFICATIONS -> {
-                                if (Preferences.showNotifications && ActiveNotificationsHelper.showLastNotification()) {
-                                    try {
-                                        if (Preferences.lastNotificationIcon != 0) {
-                                            val remotePackageContext = context.createPackageContext(Preferences.lastNotificationPackage, 0)
-                                            ContextCompat.getDrawable(
-                                                remotePackageContext,
-                                                Preferences.lastNotificationIcon)
-                                        }
-                                        val notificationIntent = PendingIntent.getActivity(
-                                            context,
-                                            widgetID,
-                                            IntentHelper.getNotificationIntent(context),
-                                            PendingIntent.FLAG_UPDATE_CURRENT
-                                        )
-                                        views.setOnClickPendingIntent(
-                                            R.id.second_row_rect,
-                                            notificationIntent
-                                        )
-                                        showSomething = true
-                                        break@loop
-                                    } catch (ex: Exception) {}
-                                }
-                            }
-                            Constants.GlanceProviderId.GREETINGS -> {
-                                if (Preferences.showGreetings && GreetingsHelper.showGreetings() && GreetingsHelper.getRandomString(context).isNotBlank()) {
-                                    showSomething = true
-                                    break@loop
-                                }
-                            }
-                            Constants.GlanceProviderId.EVENTS -> {
-                                if (Preferences.showEventsAsGlanceProvider&& Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null) {
-                                    val pIntentDetail = PendingIntent.getActivity(
-                                        context,
-                                        widgetID,
-                                        IntentHelper.getEventIntent(
-                                            context,
-                                            nextEvent,
-                                            forceEventDetails = true
-                                        ),
-                                        PendingIntent.FLAG_UPDATE_CURRENT
-                                    )
-                                    views.setOnClickPendingIntent(
-                                        R.id.second_row_rect,
-                                        pIntentDetail
-                                    )
-                                    showSomething = true
-                                    break@loop
-                                }
-                            }
-                        }
-                    }
-
-
-                    if (showSomething) {
-                        views.setImageViewBitmap(
-                            R.id.next_event_rect,
-                            BitmapHelper.getBitmapFromView(bindingView.nextEvent, draw = false)
-                        )
-
-                        views.setImageViewBitmap(
-                            R.id.second_row_rect,
-                            BitmapHelper.getBitmapFromView(bindingView.secondRow, draw = false)
-                        )
-
-                        views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
-                        views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
-                        views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
-                        views.setOnClickPendingIntent(R.id.next_event_rect, calPIntent)
-
-
-                        views.setViewVisibility(
-                            R.id.second_row_top_margin_small_sans,
-                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
-                        )
-                        views.setViewVisibility(
-                            R.id.second_row_top_margin_medium_sans,
-                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
-                        )
-                        views.setViewVisibility(
-                            R.id.second_row_top_margin_large_sans,
-                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
-                        )
-                    }
-                }
-            } catch (ex: Exception) {
-                ex.printStackTrace()
-                CrashlyticsReceiver.sendCrash(context, ex)
-            } finally {
-                eventRepository.close()
-            }
-
-            return views
-        }
-
-        private fun updateWeatherView(context: Context, bindingView: TheWidgetBinding, views: RemoteViews, widgetID: Int): RemoteViews {
-            try {
-                if (Preferences.showWeather && Preferences.weatherIcon != "") {
-                    views.setViewVisibility(R.id.weather_rect, View.VISIBLE)
-                    views.setViewVisibility(R.id.calendar_weather_rect, View.VISIBLE)
-                    views.setViewVisibility(R.id.special_weather_rect, View.VISIBLE)
-
-                    val i = Intent(context, WidgetClickListenerReceiver::class.java)
-                    i.action = Actions.ACTION_OPEN_WEATHER_INTENT
-                    val weatherPIntent = PendingIntent.getBroadcast(context, widgetID, i, 0)
-
-                    views.setOnClickPendingIntent(R.id.weather_rect, weatherPIntent)
-                    views.setOnClickPendingIntent(R.id.calendar_weather_rect, weatherPIntent)
-                    views.setOnClickPendingIntent(R.id.special_weather_rect, weatherPIntent)
-
-                    views.setImageViewBitmap(
-                        R.id.weather_rect,
-                        BitmapHelper.getBitmapFromView(bindingView.weather, draw = false)
-                    )
-
-                    views.setImageViewBitmap(
-                        R.id.calendar_weather_rect,
-                        BitmapHelper.getBitmapFromView(bindingView.calendarWeather, draw = false)
-                    )
-
-                    views.setImageViewBitmap(
-                        R.id.special_weather_rect,
-                        BitmapHelper.getBitmapFromView(bindingView.calendarWeather, draw = false)
-                    )
-
-                    if (GlanceProviderHelper.showGlanceProviders(context)) {
-                        views.setViewVisibility(R.id.calendar_weather_rect, View.GONE)
-                    } else {
-                        views.setViewVisibility(R.id.special_weather_rect, View.GONE)
-                    }
-                } else {
-                    views.setViewVisibility(R.id.weather_rect, View.GONE)
-                    views.setViewVisibility(R.id.calendar_weather_rect, View.GONE)
-                    views.setViewVisibility(R.id.special_weather_rect, View.GONE)
-                }
-            } catch (ex: Exception) {
-                ex.printStackTrace()
-                CrashlyticsReceiver.sendCrash(context, ex)
-            }
-            return views
-        }
-
-        private fun updateClockView(context: Context, views: RemoteViews, widgetID: Int): RemoteViews {
-            try {
-                if (!Preferences.showClock) {
-                    views.setViewVisibility(R.id.time, View.GONE)
-                    views.setViewVisibility(R.id.time_am_pm, 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.getClockFontColor(context.isDarkTheme()))
-                    views.setTextColor(R.id.time_am_pm, ColorHelper.getClockFontColor(context.isDarkTheme()))
-                    views.setTextViewTextSize(
-                        R.id.time,
-                        TypedValue.COMPLEX_UNIT_SP,
-                        Preferences.clockTextSize.toPixel(context)
-                    )
-                    views.setTextViewTextSize(
-                        R.id.time_am_pm,
-                        TypedValue.COMPLEX_UNIT_SP,
-                        Preferences.clockTextSize.toPixel(context) / 5 * 2
-                    )
-                    val clockPIntent = PendingIntent.getActivity(
-                        context,
-                        widgetID,
-                        IntentHelper.getClockIntent(context),
-                        0
-                    )
-                    views.setOnClickPendingIntent(R.id.time, clockPIntent)
-                    views.setOnClickPendingIntent(R.id.time_am_pm, clockPIntent)
-                    views.setViewVisibility(R.id.time, View.VISIBLE)
-                    views.setViewVisibility(R.id.time_am_pm, if (Preferences.showAMPMIndicator) View.VISIBLE else View.GONE)
-
-                    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
-                    )
-                }
-            } catch (ex: Exception) {
-                ex.printStackTrace()
-                CrashlyticsReceiver.sendCrash(context, ex)
-            }
-
-            return views
-        }
-
-
-        // Generates the widget bitmap from the view
-        fun generateWidgetView(context: Context, typeface: Typeface? = null): TheWidgetBinding {
-            val eventRepository = EventRepository(context)
-            val bindingView = TheWidgetBinding.inflate(LayoutInflater.from(context))
-
-            bindingView.loader.isVisible = false
-
-            val now = Calendar.getInstance().apply {
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }
-
-            bindingView.emptyLayout.visibility = View.VISIBLE
-            bindingView.calendarLayout.visibility = View.GONE
-            bindingView.nextEventDifferenceTime.visibility = View.GONE
-            bindingView.actionNext.isVisible = false
-            bindingView.actionPrevious.isVisible = false
-
-            bindingView.emptyDate.text = DateHelper.getDateText(context, now)
-
-            val nextEvent = eventRepository.getNextEvent()
-            val nextAlarm = AlarmHelper.getNextAlarm(context)
-
-            if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) {
-                // Multiple counter
-                bindingView.actionNext.isVisible =
-                    Preferences.showNextEvent && eventRepository.getEventsCount() > 1
-                bindingView.actionPrevious.isVisible =
-                    Preferences.showNextEvent && eventRepository.getEventsCount() > 1
-
-                bindingView.nextEvent.text = nextEvent.title
-
-                if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
-                    bindingView.nextEventDifferenceTime.text = if (!nextEvent.allDay) {
-                        SettingsStringHelper.getDifferenceText(
-                            context,
-                            now.timeInMillis,
-                            nextEvent.startDate
-                        )
-                            .toLowerCase(Locale.getDefault())
-                    } else {
-                        SettingsStringHelper.getAllDayEventDifferenceText(
-                            context,
-                            now.timeInMillis,
-                            nextEvent.startDate
-                        ).toLowerCase(Locale.getDefault())
-                    }
-                    bindingView.nextEventDifferenceTime.visibility = View.VISIBLE
-                } else {
-                    bindingView.nextEventDifferenceTime.visibility = View.GONE
-                }
-
-                if (nextEvent.address != "" && Preferences.secondRowInformation == 1) {
-                    bindingView.secondRowIcon.setImageDrawable(
-                        ContextCompat.getDrawable(
-                            context,
-                            R.drawable.round_place_24
-                        )
-                    )
-                    bindingView.nextEventDate.text = nextEvent.address
-                } else {
-                    bindingView.secondRowIcon.setImageDrawable(
-                        ContextCompat.getDrawable(
-                            context,
-                            R.drawable.round_today_24
-                        )
-                    )
-                    if (!nextEvent.allDay) {
-                        val startHour =
-                            DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault())
-                                .format(nextEvent.startDate)
-                        val endHour =
-                            DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault())
-                                .format(nextEvent.endDate)
-
-                        var dayDiff =
-                            TimeUnit.MILLISECONDS.toDays(nextEvent.endDate - nextEvent.startDate)
-
-                        val startCal = Calendar.getInstance()
-                        startCal.timeInMillis = nextEvent.startDate
-
-                        val endCal = Calendar.getInstance()
-                        endCal.timeInMillis = nextEvent.endDate
-
-                        if (startCal.get(Calendar.HOUR_OF_DAY) > endCal.get(Calendar.HOUR_OF_DAY)) {
-                            dayDiff++
-                        } else if (startCal.get(Calendar.HOUR_OF_DAY) == endCal.get(Calendar.HOUR_OF_DAY) && startCal.get(
-                                Calendar.MINUTE
-                            ) > endCal.get(Calendar.MINUTE)
-                        ) {
-                            dayDiff++
-                        }
-                        var multipleDay = ""
-                        if (dayDiff > 0) {
-                            multipleDay = String.format(
-                                " (+%s%s)",
-                                dayDiff,
-                                context.getString(R.string.day_char)
-                            )
-                        }
-
-                        if (nextEvent.startDate != nextEvent.endDate) {
-                            bindingView.nextEventDate.text =
-                                String.format("%s - %s%s", startHour, endHour, multipleDay)
-                        } else {
-                            bindingView.nextEventDate.text =
-                                String.format("%s", startHour)
-                        }
-
-                    } else {
-                        val flags: Int =
-                            DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
-                        val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
-
-                        bindingView.nextEventDate.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get(Calendar.DAY_OF_YEAR)) {
-                            DateUtils.formatDateTime(context, nextEvent.startDate, flags)
-                        } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get(Calendar.YEAR) > start.get(Calendar.YEAR)) {
-                            DateUtils.formatDateTime(context, now.timeInMillis, flags)
-                        } else {
-                            DateUtils.formatDateTime(context, nextEvent.startDate, flags)
-                        }
-                    }
-                }
-
-                bindingView.emptyLayout.visibility = View.GONE
-                bindingView.calendarLayout.visibility = View.VISIBLE
-
-                bindingView.secondRowTopMarginSmall.visibility =
-                    if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
-                bindingView.secondRowTopMarginMedium.visibility =
-                    if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
-                bindingView.secondRowTopMarginLarge.visibility =
-                    if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
-            } else if (GlanceProviderHelper.showGlanceProviders(context)) {
-                bindingView.secondRowIcon.isVisible = true
-                var showSomething = false
-                loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(
-                    context
-                )) {
-                    when (provider) {
-                        Constants.GlanceProviderId.PLAYING_SONG -> {
-                            if (MediaPlayerHelper.isSomeonePlaying(context)) {
-                                bindingView.secondRowIcon.setImageDrawable(
-                                    ContextCompat.getDrawable(
-                                        context,
-                                        R.drawable.round_music_note_24
-                                    )
-                                )
-                                bindingView.nextEventDate.text = MediaPlayerHelper.getMediaInfo()
-                                showSomething = true
-                                break@loop
-                            }
-                        }
-                        Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
-                            if (Preferences.showNextAlarm && nextAlarm != "") {
-                                bindingView.secondRowIcon.setImageDrawable(
-                                    ContextCompat.getDrawable(
-                                        context,
-                                        R.drawable.round_alarm_24
-                                    )
-                                )
-                                bindingView.nextEventDate.text = AlarmHelper.getNextAlarm(context)
-                                showSomething = true
-                                break@loop
-                            }
-                        }
-                        Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
-                            if (Preferences.showBatteryCharging) {
-                                BatteryHelper.updateBatteryInfo(context)
-                                if (Preferences.isCharging) {
-                                    bindingView.secondRowIcon.isVisible = false
-                                    val batteryLevel = BatteryHelper.getBatteryLevel(context)
-                                    if (batteryLevel != 100) {
-                                        bindingView.nextEventDate.text = context.getString(R.string.charging)
-                                    } else {
-                                        bindingView.nextEventDate.text =
-                                            context.getString(R.string.charged)
-                                    }
-                                    showSomething = true
-                                    break@loop
-                                } else if (Preferences.isBatteryLevelLow) {
-                                    bindingView.secondRowIcon.isVisible = false
-                                    bindingView.nextEventDate.text =
-                                        context.getString(R.string.battery_low_warning)
-                                    showSomething = true
-                                    break@loop
-                                }
-                            }
-                        }
-                        Constants.GlanceProviderId.CUSTOM_INFO -> {
-                            if (Preferences.customNotes.isNotEmpty()) {
-                                bindingView.secondRowIcon.isVisible = false
-                                bindingView.nextEventDate.text = Preferences.customNotes
-                                bindingView.nextEventDate.maxLines = 2
-                                showSomething = true
-                                break@loop
-                            }
-                        }
-                        Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
-                            if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
-                                bindingView.secondRowIcon.isVisible = false
-                                bindingView.nextEventDate.text =
-                                    context.getString(R.string.daily_steps_counter)
-                                        .format(Preferences.googleFitSteps)
-                                showSomething = true
-                                break@loop
-                            }
-                        }
-                        Constants.GlanceProviderId.NOTIFICATIONS -> {
-                            if (Preferences.showNotifications && ActiveNotificationsHelper.showLastNotification()) {
-                                try {
-                                    if (Preferences.lastNotificationIcon != 0) {
-                                        val remotePackageContext = context.createPackageContext(Preferences.lastNotificationPackage, 0)
-                                        val icon = ContextCompat.getDrawable(remotePackageContext,
-                                            Preferences.lastNotificationIcon)
-                                        bindingView.secondRowIcon.isVisible = true
-                                        bindingView.secondRowIcon.setImageDrawable(icon)
-                                    } else {
-                                        bindingView.secondRowIcon.isVisible = false
-                                    }
-                                    bindingView.nextEventDate.text = Preferences.lastNotificationTitle
-                                    showSomething = true
-                                    break@loop
-                                } catch (ex: Exception) {}
-                            }
-                        }
-                        Constants.GlanceProviderId.GREETINGS -> {
-                            val greetingsText = GreetingsHelper.getRandomString(context)
-                            if (Preferences.showGreetings && GreetingsHelper.showGreetings() && greetingsText.isNotBlank()) {
-                                bindingView.nextEventDate.text = greetingsText
-                                bindingView.nextEventDate.maxLines = 2
-                                bindingView.secondRowIcon.isVisible = false
-                                showSomething = true
-                                break@loop
-                            }
-                        }
-                        Constants.GlanceProviderId.EVENTS -> {
-                            if (Preferences.showEventsAsGlanceProvider && Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null) {
-                                bindingView.nextEventDate.text = context.getString(R.string.events_glance_provider_format).format(nextEvent.title, if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
-                                     if (!nextEvent.allDay) {
-                                        SettingsStringHelper.getDifferenceText(
-                                            context,
-                                            now.timeInMillis,
-                                            nextEvent.startDate
-                                        )
-                                            .toLowerCase(Locale.getDefault())
-                                    } else {
-                                        SettingsStringHelper.getAllDayEventDifferenceText(
-                                            context,
-                                            now.timeInMillis,
-                                            nextEvent.startDate
-                                        ).toLowerCase(Locale.getDefault())
-                                    }
-                                } else "").trimEnd()
-                                bindingView.secondRowIcon.isVisible = true
-                                bindingView.secondRowIcon.setImageDrawable(
-                                    ContextCompat.getDrawable(
-                                        context,
-                                        R.drawable.round_today_24
-                                    )
-                                )
-                                showSomething = true
-                                break@loop
-                            }
-                        }
-                    }
-                }
-
-                if (showSomething) {
-                    bindingView.nextEvent.text = DateHelper.getDateText(context, now)
-                    bindingView.emptyLayout.visibility = View.GONE
-                    bindingView.calendarLayout.visibility = View.VISIBLE
-
-                    bindingView.secondRowTopMarginSmall.visibility =
-                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
-                    bindingView.secondRowTopMarginMedium.visibility =
-                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
-                    bindingView.secondRowTopMarginLarge.visibility =
-                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
-                } else {
-                    bindingView.secondRowIcon.isVisible = false
-                }
-            }
-
-
-            // Color
-            listOf<TextView>(
-                bindingView.emptyDate,
-                bindingView.divider1,
-                bindingView.temp,
-                bindingView.nextEvent,
-                bindingView.nextEventDifferenceTime,
-                bindingView.divider3,
-                bindingView.specialTemp
-            ).forEach {
-                it.setTextColor(ColorHelper.getFontColor(context.applicationContext.isDarkTheme()))
-            }
-
-            if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.value) {
-                listOf<ImageView>(bindingView.actionNext, bindingView.actionPrevious)
-            } else {
-                listOf<ImageView>(
-                    bindingView.actionNext,
-                    bindingView.actionPrevious,
-                    bindingView.emptyWeatherIcon,
-                    bindingView.specialWeatherIcon
-                )
-            }.forEach {
-                it.setColorFilter(ColorHelper.getFontColorRgb(context.applicationContext.isDarkTheme()))
-                it.alpha =
-                    (if (context.isDarkTheme()) Preferences.textGlobalAlphaDark.toIntValue()
-                        .toFloat() else Preferences.textGlobalAlpha.toIntValue()
-                        .toFloat()) / 100
-            }
-
-            listOf<TextView>(bindingView.nextEventDate, bindingView.divider2, bindingView.calendarTemp).forEach {
-                it.setTextColor(ColorHelper.getSecondaryFontColor(context.applicationContext.isDarkTheme()))
-            }
-
-            if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.value) {
-                listOf<ImageView>(bindingView.secondRowIcon, bindingView.secondRowIconShadow)
-            } else {
-                listOf<ImageView>(bindingView.secondRowIcon, bindingView.weatherIcon, bindingView.secondRowIconShadow)
-            }.forEach {
-                it.setColorFilter(ColorHelper.getSecondaryFontColorRgb(context.applicationContext.isDarkTheme()))
-                it.alpha =
-                    (if (context.isDarkTheme()) Preferences.textSecondaryAlphaDark.toIntValue()
-                        .toFloat() else Preferences.textSecondaryAlpha.toIntValue()
-                        .toFloat()) / 100
-            }
-
-            // Text Size
-            listOf<Pair<TextView, Float>>(
-                bindingView.emptyDate to Preferences.textMainSize,
-                bindingView.divider1 to (Preferences.textMainSize - 2),
-                bindingView.temp to Preferences.textMainSize,
-                bindingView.nextEvent to Preferences.textMainSize,
-                bindingView.nextEventDifferenceTime to Preferences.textMainSize,
-                bindingView.nextEventDate to Preferences.textSecondSize,
-                bindingView.divider2 to (Preferences.textSecondSize - 2),
-                bindingView.calendarTemp to Preferences.textSecondSize,
-                bindingView.divider3 to (Preferences.textMainSize - 2),
-                bindingView.specialTemp to Preferences.textMainSize
-            ).forEach {
-                it.first.setTextSize(TypedValue.COMPLEX_UNIT_SP, it.second)
-            }
-
-            // Icons scale
-            bindingView.secondRowIcon.scaleX = Preferences.textSecondSize / 18f
-            bindingView.secondRowIcon.scaleY = Preferences.textSecondSize / 18f
-
-            bindingView.weatherIcon.scaleX = Preferences.textSecondSize / 14f
-            bindingView.weatherIcon.scaleY = Preferences.textSecondSize / 14f
-
-            bindingView.emptyWeatherIcon.scaleX = Preferences.textMainSize / 18f
-            bindingView.emptyWeatherIcon.scaleY = Preferences.textMainSize / 18f
-
-            bindingView.actionNext.scaleX = Preferences.textMainSize / 28f
-            bindingView.actionNext.scaleY = Preferences.textMainSize / 28f
-
-            bindingView.actionPrevious.scaleX = Preferences.textMainSize / 28f
-            bindingView.actionPrevious.scaleY = Preferences.textMainSize / 28f
-
-            bindingView.specialWeatherIcon.scaleX = Preferences.textMainSize / 18f
-            bindingView.specialWeatherIcon.scaleY = Preferences.textMainSize / 18f
-
-
-            // Shadows
-            val shadowRadius =
-                when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
-                    0 -> 0f
-                    1 -> 5f
-                    2 -> 5f
-                    else -> 5f
-                }
-            val shadowColor =
-                when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
-                    0 -> Color.TRANSPARENT
-                    1 -> R.color.black_50
-                    2 -> Color.BLACK
-                    else -> R.color.black_50
-                }
-            val shadowDy =
-                when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
-                    0 -> 0f
-                    1 -> 0f
-                    2 -> 1f
-                    else -> 0f
-                }
-
-            listOf<TextView>(
-                bindingView.emptyDate,
-                bindingView.divider1,
-                bindingView.temp,
-                bindingView.nextEvent,
-                bindingView.nextEventDifferenceTime,
-                bindingView.nextEventDate,
-                bindingView.divider2,
-                bindingView.calendarTemp,
-                bindingView.divider3,
-                bindingView.specialTemp
-            ).forEach {
-                it.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-            }
-
-            // Icons shadow
-
-            listOf(
-                Pair(bindingView.secondRowIcon, bindingView.secondRowIconShadow),
-            ).forEach {
-                if ((if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) == 0) {
-                    it.second.isVisible = false
-                } else {
-                    it.second.isVisible = it.first.isVisible
-                    it.second.scaleX = it.first.scaleX
-                    it.second.scaleY = it.first.scaleY
-                    it.second.applyShadow(it.first)
-                }
-            }
-
-            listOf(
-                Pair(bindingView.actionNext, bindingView.actionNextShadow),
-                Pair(bindingView.actionPrevious, bindingView.actionPreviousShadow),
-            ).forEach {
-                if ((if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) == 0) {
-                    it.second.isVisible = false
-                } else {
-                    it.second.isVisible = it.first.isVisible
-                    it.second.scaleX = it.first.scaleX
-                    it.second.scaleY = it.first.scaleY
-                    it.second.applyShadow(it.first, 0.6f)
-                }
-            }
-
-            bindingView.actionPrevious.scaleX = bindingView.actionPrevious.scaleX * -1
-            bindingView.actionPreviousShadow.scaleX = bindingView.actionPreviousShadow.scaleX * -1
-
-            // Custom Font
-            if (Preferences.customFont == Constants.CUSTOM_FONT_GOOGLE_SANS) {
-                val googleSans: Typeface = when (Preferences.customFontVariant) {
-                    "100" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_thin.ttf")
-                    "200" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_light.ttf")
-                    "500" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_medium.ttf")
-                    "700" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_bold.ttf")
-                    "800" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_black.ttf")
-                    else -> Typeface.createFromAsset(context.assets, "fonts/google_sans_regular.ttf")
-                }
-
-                listOf<TextView>(
-                    bindingView.emptyDate,
-                    bindingView.divider1,
-                    bindingView.temp,
-                    bindingView.nextEvent,
-                    bindingView.nextEventDifferenceTime,
-                    bindingView.nextEventDate,
-                    bindingView.divider2,
-                    bindingView.calendarTemp,
-                    bindingView.divider3,
-                    bindingView.specialTemp
-                ).forEach {
-                    it.typeface = googleSans
-                }
-            } else if (Preferences.customFont == Constants.CUSTOM_FONT_DOWNLOADED && typeface != null) {
-                listOf<TextView>(
-                    bindingView.emptyDate,
-                    bindingView.divider1,
-                    bindingView.temp,
-                    bindingView.nextEvent,
-                    bindingView.nextEventDifferenceTime,
-                    bindingView.nextEventDate,
-                    bindingView.divider2,
-                    bindingView.calendarTemp,
-                    bindingView.divider3,
-                    bindingView.specialTemp
-                ).forEach {
-                    it.typeface = typeface
-                }
-            }
-
-            // Weather
-            if (Preferences.showWeather && Preferences.weatherIcon != "") {
-                bindingView.weather.visibility = View.VISIBLE
-                bindingView.calendarWeather.visibility = View.VISIBLE
-                bindingView.specialWeather.visibility = View.VISIBLE
-                val currentTemp = String.format(
-                    Locale.getDefault(),
-                    "%d °%s",
-                    Preferences.weatherTemp.roundToInt(),
-                    Preferences.weatherRealTempUnit
-                )
-
-                val icon: String = Preferences.weatherIcon
-                if (icon == "") {
-                    bindingView.weatherIcon.visibility = View.GONE
-                    bindingView.emptyWeatherIcon.visibility = View.GONE
-                    bindingView.specialWeatherIcon.visibility = View.GONE
-                } else {
-                    bindingView.weatherIcon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
-                    bindingView.emptyWeatherIcon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
-                    bindingView.specialWeatherIcon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
-                    bindingView.weatherIcon.visibility = View.VISIBLE
-                    bindingView.emptyWeatherIcon.visibility = View.VISIBLE
-                    bindingView.specialWeatherIcon.visibility = View.VISIBLE
-                }
-
-                bindingView.temp.text = currentTemp
-                bindingView.calendarTemp.text = currentTemp
-                bindingView.specialTemp.text = currentTemp
-
-                if (GlanceProviderHelper.showGlanceProviders(context)) {
-                    bindingView.calendarWeather.visibility = View.GONE
-                } else {
-                    bindingView.specialWeather.visibility = View.GONE
-                }
-            } else {
-                bindingView.weather.visibility = View.GONE
-                bindingView.calendarWeather.visibility = View.GONE
-                bindingView.specialWeather.visibility = View.GONE
-            }
-
-            // Dividers
-            arrayOf(bindingView.divider1, bindingView.divider2, bindingView.divider3).forEach {
-                it.visibility = if (Preferences.showDividers) View.VISIBLE else View.INVISIBLE
-                it.layoutParams = (it.layoutParams as ViewGroup.MarginLayoutParams).apply {
-                    this.marginEnd = if (Preferences.showDividers) 8f.convertDpToPixel(context).toInt() else 0
-                }
-            }
-
-            eventRepository.close()
-
-            return bindingView
         }
     }
 }
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
new file mode 100644
index 0000000..1901107
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
@@ -0,0 +1,925 @@
+package com.tommasoberlose.anotherwidget.ui.widgets
+
+import android.Manifest
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.Typeface
+import android.text.format.DateUtils
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.RemoteViews
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.databinding.TheWidgetBinding
+import com.tommasoberlose.anotherwidget.db.EventRepository
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.*
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
+import com.tommasoberlose.anotherwidget.helpers.ImageHelper.applyShadow
+import com.tommasoberlose.anotherwidget.receivers.CrashlyticsReceiver
+import com.tommasoberlose.anotherwidget.receivers.NewCalendarEventReceiver
+import com.tommasoberlose.anotherwidget.receivers.WidgetClickListenerReceiver
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.convertDpToPixel
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
+import com.tommasoberlose.anotherwidget.utils.toPixel
+import java.text.DateFormat
+import java.util.*
+import java.util.concurrent.TimeUnit
+import kotlin.math.roundToInt
+
+class StandardWidget(val context: Context) {
+    fun generateWidget(appWidgetId: Int, w: Int, typeface: Typeface? = null): RemoteViews {
+
+        var views = RemoteViews(context.packageName, R.layout.the_widget_sans)
+
+        try {
+            // Background
+            views.setInt(
+                R.id.widget_shape_background,
+                "setColorFilter",
+                ColorHelper.getBackgroundColorRgb(context.isDarkTheme())
+            )
+            views.setInt(
+                R.id.widget_shape_background,
+                "setImageAlpha",
+                ColorHelper.getBackgroundAlpha(context.isDarkTheme())
+            )
+            val refreshIntent = PendingIntent.getActivity(
+                context,
+                appWidgetId,
+                IntentHelper.getWidgetUpdateIntent(context),
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            views.setOnClickPendingIntent(R.id.widget_shape_background, refreshIntent)
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+            CrashlyticsReceiver.sendCrash(context, ex)
+        }
+
+        // Clock
+        views = ClockWidget(context).updateClockView(views, appWidgetId)
+
+        // Setup listener
+        try {
+            val generatedBinding = generateWidgetView(typeface)
+            views.setImageViewBitmap(
+                R.id.bitmap_container,
+                BitmapHelper.getBitmapFromView(generatedBinding.root, width = w)
+            )
+            views = updateGridView(generatedBinding, views, appWidgetId)
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+            CrashlyticsReceiver.sendCrash(context, ex)
+        }
+
+        return views
+    }
+
+    private fun updateGridView(bindingView: TheWidgetBinding, views: RemoteViews, widgetID: Int): RemoteViews {
+        val eventRepository = EventRepository(context)
+        try {
+            // Weather
+            if (Preferences.showWeather && Preferences.weatherIcon != "") {
+                views.setViewVisibility(R.id.weather_rect, View.VISIBLE)
+                views.setViewVisibility(R.id.weather_sub_line, View.GONE)
+
+                val i = Intent(context, WidgetClickListenerReceiver::class.java)
+                i.action = Actions.ACTION_OPEN_WEATHER_INTENT
+                val weatherPIntent = PendingIntent.getBroadcast(context, widgetID, i, 0)
+
+                views.setOnClickPendingIntent(R.id.weather_rect, weatherPIntent)
+                views.setOnClickPendingIntent(R.id.weather_sub_line_rect, weatherPIntent)
+
+                views.setImageViewBitmap(
+                    R.id.weather_rect,
+                    BitmapHelper.getBitmapFromView(bindingView.weatherDateLine, draw = false)
+                )
+
+                views.setImageViewBitmap(
+                    R.id.weather_sub_line_rect,
+                    BitmapHelper.getBitmapFromView(bindingView.weatherSubLine, draw = false)
+                )
+            } else {
+                views.setViewVisibility(R.id.weather_rect, View.GONE)
+                views.setViewVisibility(R.id.weather_sub_line, View.GONE)
+            }
+
+
+            // Calendar
+            views.setImageViewBitmap(
+                R.id.date_rect,
+                BitmapHelper.getBitmapFromView(bindingView.date, draw = false)
+            )
+
+            val calPIntent = PendingIntent.getActivity(
+                context,
+                widgetID,
+                IntentHelper.getCalendarIntent(context),
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            views.setOnClickPendingIntent(R.id.date_rect, calPIntent)
+            views.setViewVisibility(R.id.date_layout, View.VISIBLE)
+
+            val nextEvent = eventRepository.getNextEvent()
+            val nextAlarm = AlarmHelper.getNextAlarm(context)
+
+            // Spacing
+            views.setViewVisibility(
+                R.id.sub_line_top_margin_small_sans,
+                if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.rawValue) View.VISIBLE else View.GONE
+            )
+            views.setViewVisibility(
+                R.id.sub_line_top_margin_medium_sans,
+                if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.rawValue) View.VISIBLE else View.GONE
+            )
+            views.setViewVisibility(
+                R.id.sub_line_top_margin_large_sans,
+                if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.rawValue) View.VISIBLE else View.GONE
+            )
+
+            if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) {
+                if (Preferences.showNextEvent && eventRepository.getEventsCount() > 1) {
+
+                    // Action next event
+                    views.setImageViewBitmap(
+                        R.id.action_next_rect,
+                        BitmapHelper.getBitmapFromView(bindingView.actionNext, draw = false)
+                    )
+                    views.setViewVisibility(R.id.action_next_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(
+                        R.id.action_next_rect,
+                        PendingIntent.getBroadcast(
+                            context,
+                            widgetID,
+                            Intent(
+                                context,
+                                NewCalendarEventReceiver::class.java
+                            ).apply { action = Actions.ACTION_GO_TO_NEXT_EVENT },
+                            PendingIntent.FLAG_UPDATE_CURRENT
+                        )
+                    )
+
+                    // Action previous event
+                    views.setImageViewBitmap(
+                        R.id.action_previous_rect,
+                        BitmapHelper.getBitmapFromView(bindingView.actionPrevious, draw = false)
+                    )
+                    views.setViewVisibility(R.id.action_previous_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(
+                        R.id.action_previous_rect,
+                        PendingIntent.getBroadcast(
+                            context,
+                            widgetID,
+                            Intent(
+                                context,
+                                NewCalendarEventReceiver::class.java
+                            ).apply { action = Actions.ACTION_GO_TO_PREVIOUS_EVENT },
+                            PendingIntent.FLAG_UPDATE_CURRENT
+                        )
+                    )
+
+                    views.setViewVisibility(R.id.action_next_rect, View.VISIBLE)
+                    views.setViewVisibility(R.id.action_previous_rect, View.VISIBLE)
+                } else {
+                    views.setViewVisibility(R.id.action_next_rect, View.GONE)
+                    views.setViewVisibility(R.id.action_previous_rect, View.GONE)
+                }
+
+                // Event intent
+                val eventIntent = PendingIntent.getActivity(
+                    context,
+                    widgetID,
+                    IntentHelper.getEventIntent(context, nextEvent),
+                    PendingIntent.FLAG_UPDATE_CURRENT
+                )
+                views.setOnClickPendingIntent(R.id.next_event_rect, eventIntent)
+                views.setViewVisibility(R.id.next_event_rect, View.VISIBLE)
+
+                // Event time difference
+                if (Preferences.showDiffTime && Calendar.getInstance().timeInMillis < (nextEvent.startDate - 1000 * 60 * 60)) {
+                    views.setImageViewBitmap(
+                        R.id.next_event_difference_time_rect,
+                        BitmapHelper.getBitmapFromView(
+                            bindingView.nextEventDifferenceTime,
+                            draw = false
+                        )
+                    )
+                    views.setViewVisibility(R.id.next_event_difference_time_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(R.id.next_event_difference_time_rect, eventIntent)
+                } else {
+                    views.setViewVisibility(R.id.next_event_difference_time_rect, View.GONE)
+                }
+
+                // Event information
+                if (nextEvent.address != "" && Preferences.secondRowInformation == 1) {
+                    val mapIntent = PendingIntent.getActivity(
+                        context,
+                        widgetID,
+                        IntentHelper.getGoogleMapsIntentFromAddress(context, nextEvent.address),
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                    )
+                    views.setOnClickPendingIntent(R.id.sub_line_rect, mapIntent)
+                } else {
+                    val pIntentDetail = PendingIntent.getActivity(
+                        context,
+                        widgetID,
+                        IntentHelper.getEventIntent(
+                            context,
+                            nextEvent,
+                            forceEventDetails = true
+                        ),
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                    )
+                    views.setOnClickPendingIntent(R.id.sub_line_rect, pIntentDetail)
+                }
+
+                views.setImageViewBitmap(
+                    R.id.next_event_rect,
+                    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)
+            } else if (GlanceProviderHelper.showGlanceProviders(context) && bindingView.calendarLayout.isVisible) {
+                var showSomething = false
+                loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
+                    when (provider) {
+                        Constants.GlanceProviderId.PLAYING_SONG -> {
+                            if (MediaPlayerHelper.isSomeonePlaying(context)) {
+                                val musicIntent = PendingIntent.getActivity(
+                                    context,
+                                    widgetID,
+                                    IntentHelper.getMusicIntent(context),
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                                views.setOnClickPendingIntent(R.id.sub_line_rect, musicIntent)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
+                            if (Preferences.showNextAlarm && nextAlarm != "") {
+                                val alarmIntent = PendingIntent.getActivity(
+                                    context,
+                                    widgetID,
+                                    IntentHelper.getClockIntent(context),
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                                views.setOnClickPendingIntent(R.id.sub_line_rect, alarmIntent)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                            if (Preferences.showBatteryCharging) {
+                                BatteryHelper.updateBatteryInfo(context)
+                                if (Preferences.isCharging || Preferences.isBatteryLevelLow) {
+                                    val batteryIntent = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getBatteryIntent(),
+                                        PendingIntent.FLAG_UPDATE_CURRENT
+                                    )
+                                    views.setOnClickPendingIntent(R.id.sub_line_rect, batteryIntent)
+                                    showSomething = true
+                                    break@loop
+                                }
+                            }
+                        }
+                        Constants.GlanceProviderId.CUSTOM_INFO -> {
+                            if (Preferences.customNotes.isNotEmpty()) {
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                            if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                                val fitIntent = PendingIntent.getActivity(
+                                    context,
+                                    widgetID,
+                                    IntentHelper.getFitIntent(context),
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                                views.setOnClickPendingIntent(R.id.sub_line_rect, fitIntent)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.NOTIFICATIONS -> {
+                            if (Preferences.showNotifications && ActiveNotificationsHelper.showLastNotification()) {
+                                try {
+                                    if (Preferences.lastNotificationIcon != 0) {
+                                        val remotePackageContext = context.createPackageContext(
+                                            Preferences.lastNotificationPackage, 0)
+                                        ContextCompat.getDrawable(
+                                            remotePackageContext,
+                                            Preferences.lastNotificationIcon)
+                                    }
+                                    val notificationIntent = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getNotificationIntent(context),
+                                        PendingIntent.FLAG_UPDATE_CURRENT
+                                    )
+                                    views.setOnClickPendingIntent(
+                                        R.id.sub_line_rect,
+                                        notificationIntent
+                                    )
+                                    showSomething = true
+                                    break@loop
+                                } catch (ex: Exception) {}
+                            }
+                        }
+                        Constants.GlanceProviderId.GREETINGS -> {
+                            if (Preferences.showGreetings && GreetingsHelper.showGreetings() && GreetingsHelper.getRandomString(context).isNotBlank()) {
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.EVENTS -> {
+                            if (Preferences.showEventsAsGlanceProvider&& Preferences.showEvents && context.checkGrantedPermission(
+                                    Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                                val pIntentDetail = PendingIntent.getActivity(
+                                    context,
+                                    widgetID,
+                                    IntentHelper.getEventIntent(
+                                        context,
+                                        nextEvent,
+                                        forceEventDetails = true
+                                    ),
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                                views.setOnClickPendingIntent(
+                                    R.id.sub_line_rect,
+                                    pIntentDetail
+                                )
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                    }
+                }
+
+
+                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.sub_line_rect, View.VISIBLE)
+
+                    views.setViewVisibility(R.id.weather_sub_line_rect, View.GONE)
+                } else {
+                    // Spacing
+                    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)
+                }
+            }
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+            CrashlyticsReceiver.sendCrash(context, ex)
+        } finally {
+            eventRepository.close()
+        }
+
+        return views
+    }
+
+
+    // Generates the widget bitmap from the view
+    fun generateWidgetView(typeface: Typeface? = null): TheWidgetBinding {
+        val eventRepository = EventRepository(context)
+        val bindingView = TheWidgetBinding.inflate(LayoutInflater.from(context))
+
+        bindingView.loader.isVisible = false
+
+        // Weather
+        if (Preferences.showWeather && Preferences.weatherIcon != "") {
+            bindingView.weatherDateLine.isVisible = true
+            val currentTemp = String.format(
+                Locale.getDefault(),
+                "%d °%s",
+                Preferences.weatherTemp.roundToInt(),
+                Preferences.weatherRealTempUnit
+            )
+
+            val icon: String = Preferences.weatherIcon
+            if (icon == "") {
+                bindingView.weatherSubLineWeatherIcon.isVisible = false
+                bindingView.weatherDateLineWeatherIcon.isVisible = false
+            } else {
+                bindingView.weatherSubLineWeatherIcon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
+                bindingView.weatherDateLineWeatherIcon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
+                bindingView.weatherSubLineWeatherIcon.isVisible = true
+                bindingView.weatherDateLineWeatherIcon.isVisible = true
+            }
+
+            bindingView.weatherDateLineTemperature.text = currentTemp
+            bindingView.weatherSubLineTemperature.text = currentTemp
+
+            if (GlanceProviderHelper.showGlanceProviders(context)) {
+                bindingView.weatherSubLine.isVisible = false
+            }
+        } else {
+            bindingView.weatherDateLine.isVisible = false
+            bindingView.weatherSubLine.isVisible = false
+        }
+
+        val now = Calendar.getInstance().apply {
+            set(Calendar.SECOND, 0)
+            set(Calendar.MILLISECOND, 0)
+        }
+
+        bindingView.dateLayout.isVisible = true
+        bindingView.calendarLayout.isVisible = false
+        bindingView.nextEventDifferenceTime.isVisible = false
+        bindingView.actionNext.isVisible = false
+        bindingView.actionPrevious.isVisible = false
+
+        bindingView.date.text = DateHelper.getDateText(context, now)
+
+        val nextEvent = eventRepository.getNextEvent()
+        val nextAlarm = AlarmHelper.getNextAlarm(context)
+
+        if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) {
+            // Multiple counter
+            bindingView.actionNext.isVisible =
+                Preferences.showNextEvent && eventRepository.getEventsCount() > 1
+            bindingView.actionPrevious.isVisible =
+                Preferences.showNextEvent && eventRepository.getEventsCount() > 1
+
+            bindingView.nextEvent.text = nextEvent.title
+
+            if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
+                bindingView.nextEventDifferenceTime.text = if (!nextEvent.allDay) {
+                    SettingsStringHelper.getDifferenceText(
+                        context,
+                        now.timeInMillis,
+                        nextEvent.startDate
+                    )
+                        .toLowerCase(Locale.getDefault())
+                } else {
+                    SettingsStringHelper.getAllDayEventDifferenceText(
+                        context,
+                        now.timeInMillis,
+                        nextEvent.startDate
+                    ).toLowerCase(Locale.getDefault())
+                }
+                bindingView.nextEventDifferenceTime.isVisible = true
+            } else {
+                bindingView.nextEventDifferenceTime.isVisible = false
+            }
+
+            if (nextEvent.address != "" && Preferences.secondRowInformation == 1) {
+                bindingView.subLineIcon.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        context,
+                        R.drawable.round_place_24
+                    )
+                )
+                bindingView.subLineText.text = nextEvent.address
+            } else {
+                bindingView.subLineIcon.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        context,
+                        R.drawable.round_today_24
+                    )
+                )
+                if (!nextEvent.allDay) {
+                    val startHour =
+                        DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault())
+                            .format(nextEvent.startDate)
+                    val endHour =
+                        DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault())
+                            .format(nextEvent.endDate)
+
+                    var dayDiff =
+                        TimeUnit.MILLISECONDS.toDays(nextEvent.endDate - nextEvent.startDate)
+
+                    val startCal = Calendar.getInstance()
+                    startCal.timeInMillis = nextEvent.startDate
+
+                    val endCal = Calendar.getInstance()
+                    endCal.timeInMillis = nextEvent.endDate
+
+                    if (startCal.get(Calendar.HOUR_OF_DAY) > endCal.get(Calendar.HOUR_OF_DAY)) {
+                        dayDiff++
+                    } else if (startCal.get(Calendar.HOUR_OF_DAY) == endCal.get(Calendar.HOUR_OF_DAY) && startCal.get(
+                            Calendar.MINUTE
+                        ) > endCal.get(Calendar.MINUTE)
+                    ) {
+                        dayDiff++
+                    }
+                    var multipleDay = ""
+                    if (dayDiff > 0) {
+                        multipleDay = String.format(
+                            " (+%s%s)",
+                            dayDiff,
+                            context.getString(R.string.day_char)
+                        )
+                    }
+
+                    if (nextEvent.startDate != nextEvent.endDate) {
+                        bindingView.subLineText.text =
+                            String.format("%s - %s%s", startHour, endHour, multipleDay)
+                    } else {
+                        bindingView.subLineText.text =
+                            String.format("%s", startHour)
+                    }
+
+                } else {
+                    val flags: Int =
+                        DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
+                    val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
+
+                    bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get(
+                            Calendar.DAY_OF_YEAR)) {
+                        DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                    } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get(
+                            Calendar.YEAR) > start.get(Calendar.YEAR)) {
+                        DateUtils.formatDateTime(context, now.timeInMillis, flags)
+                    } else {
+                        DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                    }
+                }
+            }
+
+            bindingView.dateLayout.isVisible = false
+            bindingView.calendarLayout.isVisible = true
+            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
+        } else if (GlanceProviderHelper.showGlanceProviders(context)) {
+            bindingView.subLineIcon.isVisible = true
+            var showSomething = false
+            loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(
+                context
+            )) {
+                when (provider) {
+                    Constants.GlanceProviderId.PLAYING_SONG -> {
+                        if (MediaPlayerHelper.isSomeonePlaying(context)) {
+                            bindingView.subLineIcon.setImageDrawable(
+                                ContextCompat.getDrawable(
+                                    context,
+                                    R.drawable.round_music_note_24
+                                )
+                            )
+                            bindingView.subLineText.text = MediaPlayerHelper.getMediaInfo()
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
+                        if (Preferences.showNextAlarm && nextAlarm != "") {
+                            bindingView.subLineIcon.setImageDrawable(
+                                ContextCompat.getDrawable(
+                                    context,
+                                    R.drawable.round_alarm_24
+                                )
+                            )
+                            bindingView.subLineText.text = AlarmHelper.getNextAlarm(context)
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                        if (Preferences.showBatteryCharging) {
+                            BatteryHelper.updateBatteryInfo(context)
+                            if (Preferences.isCharging) {
+                                bindingView.subLineIcon.isVisible = false
+                                val batteryLevel = BatteryHelper.getBatteryLevel(context)
+                                if (batteryLevel != 100) {
+                                    bindingView.subLineText.text = context.getString(R.string.charging)
+                                } else {
+                                    bindingView.subLineText.text =
+                                        context.getString(R.string.charged)
+                                }
+                                showSomething = true
+                                break@loop
+                            } else if (Preferences.isBatteryLevelLow) {
+                                bindingView.subLineIcon.isVisible = false
+                                bindingView.subLineText.text =
+                                    context.getString(R.string.battery_low_warning)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                    }
+                    Constants.GlanceProviderId.CUSTOM_INFO -> {
+                        if (Preferences.customNotes.isNotEmpty()) {
+                            bindingView.subLineIcon.isVisible = false
+                            bindingView.subLineText.text = Preferences.customNotes
+                            bindingView.subLineText.maxLines = 2
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                        if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                            bindingView.subLineIcon.isVisible = false
+                            bindingView.subLineText.text =
+                                context.getString(R.string.daily_steps_counter)
+                                    .format(Preferences.googleFitSteps)
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.NOTIFICATIONS -> {
+                        if (Preferences.showNotifications && ActiveNotificationsHelper.showLastNotification()) {
+                            try {
+                                if (Preferences.lastNotificationIcon != 0) {
+                                    val remotePackageContext = context.createPackageContext(
+                                        Preferences.lastNotificationPackage, 0)
+                                    val icon = ContextCompat.getDrawable(remotePackageContext,
+                                        Preferences.lastNotificationIcon)
+                                    bindingView.subLineIcon.isVisible = true
+                                    bindingView.subLineIcon.setImageDrawable(icon)
+                                } else {
+                                    bindingView.subLineIcon.isVisible = false
+                                }
+                                bindingView.subLineText.text = Preferences.lastNotificationTitle
+                                showSomething = true
+                                break@loop
+                            } catch (ex: Exception) {}
+                        }
+                    }
+                    Constants.GlanceProviderId.GREETINGS -> {
+                        val greetingsText = GreetingsHelper.getRandomString(context)
+                        if (Preferences.showGreetings && GreetingsHelper.showGreetings() && greetingsText.isNotBlank()) {
+                            bindingView.subLineText.text = greetingsText
+                            bindingView.subLineText.maxLines = 2
+                            bindingView.subLineIcon.isVisible = false
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                    Constants.GlanceProviderId.EVENTS -> {
+                        if (Preferences.showEventsAsGlanceProvider && Preferences.showEvents && context.checkGrantedPermission(
+                                Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                            bindingView.subLineText.text = context.getString(R.string.events_glance_provider_format).format(nextEvent.title, if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
+                                if (!nextEvent.allDay) {
+                                    SettingsStringHelper.getDifferenceText(
+                                        context,
+                                        now.timeInMillis,
+                                        nextEvent.startDate
+                                    )
+                                        .toLowerCase(Locale.getDefault())
+                                } else {
+                                    SettingsStringHelper.getAllDayEventDifferenceText(
+                                        context,
+                                        now.timeInMillis,
+                                        nextEvent.startDate
+                                    ).toLowerCase(Locale.getDefault())
+                                }
+                            } else "").trimEnd()
+                            bindingView.subLineIcon.isVisible = true
+                            bindingView.subLineIcon.setImageDrawable(
+                                ContextCompat.getDrawable(
+                                    context,
+                                    R.drawable.round_today_24
+                                )
+                            )
+                            showSomething = true
+                            break@loop
+                        }
+                    }
+                }
+            }
+
+            if (showSomething) {
+                bindingView.dateLayout.isVisible = true
+                bindingView.calendarLayout.isVisible = false
+                bindingView.subLine.isVisible = true
+                bindingView.weatherSubLine.isVisible = false
+
+                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
+            } else {
+                bindingView.subLineIcon.isVisible = false
+            }
+        }
+
+
+        // Color
+        listOf<TextView>(
+            bindingView.date,
+            bindingView.weatherDateLineDivider,
+            bindingView.weatherDateLineTemperature,
+            bindingView.nextEvent,
+            bindingView.nextEventDifferenceTime,
+        ).forEach {
+            it.setTextColor(ColorHelper.getFontColor(context.applicationContext.isDarkTheme()))
+        }
+
+        if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.rawValue) {
+            listOf<ImageView>(bindingView.actionNext, bindingView.actionPrevious)
+        } else {
+            listOf<ImageView>(
+                bindingView.actionNext,
+                bindingView.actionPrevious,
+                bindingView.weatherDateLineWeatherIcon,
+                bindingView.weatherSubLineWeatherIcon
+            )
+        }.forEach {
+            it.setColorFilter(ColorHelper.getFontColorRgb(context.applicationContext.isDarkTheme()))
+            it.alpha =
+                (if (context.isDarkTheme()) Preferences.textGlobalAlphaDark.toIntValue()
+                    .toFloat() else Preferences.textGlobalAlpha.toIntValue()
+                    .toFloat()) / 100
+        }
+
+        listOf<TextView>(bindingView.subLineText, bindingView.weatherSubLineDivider, bindingView.weatherSubLineTemperature).forEach {
+            it.setTextColor(ColorHelper.getSecondaryFontColor(context.applicationContext.isDarkTheme()))
+        }
+
+        if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.rawValue) {
+            listOf<ImageView>(bindingView.subLineIcon, bindingView.subLineIconShadow)
+        } else {
+            listOf<ImageView>(bindingView.subLineIcon, bindingView.weatherSubLineWeatherIcon, bindingView.subLineIconShadow)
+        }.forEach {
+            it.setColorFilter(ColorHelper.getSecondaryFontColorRgb(context.applicationContext.isDarkTheme()))
+            it.alpha =
+                (if (context.isDarkTheme()) Preferences.textSecondaryAlphaDark.toIntValue()
+                    .toFloat() else Preferences.textSecondaryAlpha.toIntValue()
+                    .toFloat()) / 100
+        }
+
+        // Text Size
+        listOf<Pair<TextView, Float>>(
+            bindingView.date to Preferences.textMainSize,
+            bindingView.weatherDateLineDivider to (Preferences.textMainSize - 2),
+            bindingView.weatherDateLineTemperature to Preferences.textMainSize,
+            bindingView.nextEvent to Preferences.textMainSize,
+            bindingView.nextEventDifferenceTime to Preferences.textMainSize,
+            bindingView.subLineText to Preferences.textSecondSize,
+            bindingView.weatherSubLineDivider to (Preferences.textSecondSize - 2),
+            bindingView.weatherSubLineTemperature to Preferences.textSecondSize,
+        ).forEach {
+            it.first.setTextSize(TypedValue.COMPLEX_UNIT_SP, it.second)
+        }
+
+        // Icons scale
+        bindingView.subLineIcon.scaleX = Preferences.textSecondSize / 18f
+        bindingView.subLineIcon.scaleY = Preferences.textSecondSize / 18f
+
+        bindingView.weatherSubLineWeatherIcon.scaleX = Preferences.textSecondSize / 18f
+        bindingView.weatherSubLineWeatherIcon.scaleY = Preferences.textSecondSize / 18f
+
+        bindingView.weatherDateLineWeatherIcon.scaleX = Preferences.textMainSize / 18f
+        bindingView.weatherDateLineWeatherIcon.scaleY = Preferences.textMainSize / 18f
+
+        bindingView.actionNext.scaleX = Preferences.textMainSize / 28f
+        bindingView.actionNext.scaleY = Preferences.textMainSize / 28f
+
+        bindingView.actionPrevious.scaleX = Preferences.textMainSize / 28f
+        bindingView.actionPrevious.scaleY = Preferences.textMainSize / 28f
+
+
+        // Shadows
+        val shadowRadius =
+            when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
+                0 -> 0f
+                1 -> 5f
+                2 -> 5f
+                else -> 5f
+            }
+        val shadowColor =
+            when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
+                0 -> Color.TRANSPARENT
+                1 -> R.color.black_50
+                2 -> Color.BLACK
+                else -> R.color.black_50
+            }
+        val shadowDy =
+            when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
+                0 -> 0f
+                1 -> 0f
+                2 -> 1f
+                else -> 0f
+            }
+
+        listOf<TextView>(
+            bindingView.date,
+            bindingView.weatherDateLineDivider,
+            bindingView.weatherDateLineTemperature,
+            bindingView.nextEvent,
+            bindingView.nextEventDifferenceTime,
+            bindingView.subLineText,
+            bindingView.weatherSubLineDivider,
+            bindingView.weatherSubLineTemperature,
+        ).forEach {
+            it.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
+        }
+
+        // Icons shadow
+
+        listOf(
+            Pair(bindingView.subLineIcon, bindingView.subLineIconShadow),
+        ).forEach {
+            if ((if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) == 0) {
+                it.second.isVisible = false
+            } else {
+                it.second.isVisible = it.first.isVisible
+                it.second.scaleX = it.first.scaleX
+                it.second.scaleY = it.first.scaleY
+                it.second.applyShadow(it.first)
+            }
+        }
+
+        listOf(
+            Pair(bindingView.actionNext, bindingView.actionNextShadow),
+            Pair(bindingView.actionPrevious, bindingView.actionPreviousShadow),
+        ).forEach {
+            if ((if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) == 0) {
+                it.second.isVisible = false
+            } else {
+                it.second.isVisible = it.first.isVisible
+                it.second.scaleX = it.first.scaleX
+                it.second.scaleY = it.first.scaleY
+                it.second.applyShadow(it.first, 0.6f)
+            }
+        }
+
+        bindingView.actionPrevious.scaleX = bindingView.actionPrevious.scaleX * -1
+        bindingView.actionPreviousShadow.scaleX = bindingView.actionPreviousShadow.scaleX * -1
+
+        // Custom Font
+        if (Preferences.customFont == Constants.CUSTOM_FONT_GOOGLE_SANS) {
+            val googleSans: Typeface = when (Preferences.customFontVariant) {
+                "100" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_thin.ttf")
+                "200" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_light.ttf")
+                "500" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_medium.ttf")
+                "700" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_bold.ttf")
+                "800" -> Typeface.createFromAsset(context.assets, "fonts/google_sans_black.ttf")
+                else -> Typeface.createFromAsset(context.assets, "fonts/google_sans_regular.ttf")
+            }
+
+            listOf<TextView>(
+                bindingView.date,
+                bindingView.weatherDateLineDivider,
+                bindingView.weatherDateLineTemperature,
+                bindingView.nextEvent,
+                bindingView.nextEventDifferenceTime,
+                bindingView.subLineText,
+                bindingView.weatherSubLineDivider,
+                bindingView.weatherSubLineTemperature,
+            ).forEach {
+                it.typeface = googleSans
+            }
+        } else if (Preferences.customFont == Constants.CUSTOM_FONT_DOWNLOADED && typeface != null) {
+            listOf<TextView>(
+                bindingView.date,
+                bindingView.weatherDateLineDivider,
+                bindingView.weatherDateLineTemperature,
+                bindingView.nextEvent,
+                bindingView.nextEventDifferenceTime,
+                bindingView.subLineText,
+                bindingView.weatherSubLineDivider,
+                bindingView.weatherSubLineTemperature,
+            ).forEach {
+                it.typeface = typeface
+            }
+        }
+
+        // Dividers
+        arrayOf(bindingView.weatherDateLineDivider, bindingView.weatherSubLineDivider).forEach {
+            it.visibility = if (Preferences.showDividers) View.VISIBLE else View.INVISIBLE
+            it.layoutParams = (it.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                this.marginEnd = if (Preferences.showDividers) 8f.convertDpToPixel(context).toInt() else 0
+            }
+        }
+
+        eventRepository.close()
+
+        return bindingView
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tab_layout.xml b/app/src/main/res/layout/fragment_tab_layout.xml
index 5761e31..3492aec 100644
--- a/app/src/main/res/layout/fragment_tab_layout.xml
+++ b/app/src/main/res/layout/fragment_tab_layout.xml
@@ -111,6 +111,43 @@
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp"
                 android:textAppearance="@style/AnotherWidget.Settings.Header" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:id="@+id/action_widget_align"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_dashboard_24"
+                    app:tint="@color/colorPrimaryText"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="@string/settings_widget_align_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/widget_align_label"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/left_aligned_widget.xml b/app/src/main/res/layout/left_aligned_widget.xml
new file mode 100644
index 0000000..d2a8ac4
--- /dev/null
+++ b/app/src/main/res/layout/left_aligned_widget.xml
@@ -0,0 +1,212 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="vertical"
+    android:id="@+id/main_layout">
+    <ProgressBar
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:layout_centerInParent="true"
+        android:indeterminateTint="@color/colorPrimary"
+        android:id="@+id/loader" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerVertical="true">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:layout_marginBottom="8dp"
+            android:orientation="vertical"
+            android:layoutDirection="locale"
+            android:id="@+id/date_layout">
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:textColor="@color/colorPrimary"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:includeFontPadding="false"
+                style="@style/AnotherWidget.Widget.Title"/>
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:visibility="gone"
+                android:id="@+id/weather_date_line">
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:id="@+id/weather_date_line_weather_icon"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="4dp"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AnotherWidget.Widget.Date.Big"
+                    android:maxLines="1"
+                    android:includeFontPadding="false"
+                    android:id="@+id/weather_date_line_temperature"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layoutDirection="locale"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/calendar_layout"
+            android:visibility="gone"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/next_event"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:maxLines="1"
+                android:lines="1"
+                android:gravity="end"
+                android:ellipsize="end"
+                android:includeFontPadding="false"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Widget.Title" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <TextView
+                    android:id="@+id/next_event_difference_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="marquee"
+                    android:includeFontPadding="false"
+                    style="@style/AnotherWidget.Widget.Title" />
+            </LinearLayout>
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical">
+                <ImageView
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:id="@+id/action_next_shadow"
+                    android:src="@drawable/round_chevron_right_24" />
+                <ImageView
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:id="@+id/action_next"
+                    android:src="@drawable/round_chevron_right_24" />
+            </RelativeLayout>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="4dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/sub_line_top_margin_small" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="8dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/sub_line_top_margin_medium" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="12dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/sub_line_top_margin_large" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:baselineAligned="false"
+            android:layout_gravity="center_vertical"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:paddingStart="4dp"
+            android:layoutDirection="locale"
+            android:gravity="center_vertical">
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:id="@+id/sub_line"
+                android:visibility="gone"
+                android:orientation="horizontal">
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:cropToPadding="false"
+                    android:clipChildren="false"
+                    android:layout_marginEnd="4dp">
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:cropToPadding="false"
+                        android:clipChildren="false"
+                        android:id="@+id/sub_line_icon_shadow"
+                        android:src="@drawable/round_today_24"/>
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:cropToPadding="false"
+                        android:clipChildren="false"
+                        android:id="@+id/sub_line_icon"
+                        android:src="@drawable/round_today_24"/>
+                </RelativeLayout>
+                <TextView
+                    android:id="@+id/sub_line_text"
+                    android:layout_width="wrap_content"
+                    android:ellipsize="end"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:includeFontPadding="false"
+                    android:layout_height="wrap_content"
+                    style="@style/AnotherWidget.Widget.Subtitle" />
+            </LinearLayout>
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:visibility="gone"
+                android:layout_marginStart="4dp"
+                android:id="@+id/weather_sub_line">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginStart="4dp"
+                    android:id="@+id/weather_sub_line_divider"
+                    android:text="@string/divider"
+                    android:includeFontPadding="false"
+                    style="@style/AnotherWidget.Widget.Subtitle"/>
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:id="@+id/weather_sub_line_weather_icon"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AnotherWidget.Widget.Date.Big"
+                    android:maxLines="1"
+                    android:includeFontPadding="false"
+                    android:id="@+id/weather_sub_line_temperature"/>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/left_aligned_widget_sans.xml b/app/src/main/res/layout/left_aligned_widget_sans.xml
new file mode 100644
index 0000000..11fa721
--- /dev/null
+++ b/app/src/main/res/layout/left_aligned_widget_sans.xml
@@ -0,0 +1,181 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        android:scaleType="fitXY"
+        android:id="@+id/widget_shape_background"
+        android:src="@drawable/card_background" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:id="@+id/main_layout"
+        android:animateLayoutChanges="true">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/time_container"
+            android:layoutDirection="locale"
+            android:orientation="horizontal">
+            <TextClock
+                android:id="@+id/time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="h:mm"
+                android:padding="0dp"
+                android:lines="1"
+                android:maxLines="1"
+                style="@style/AnotherWidget.Widget.Title"
+                android:gravity="center_vertical"/>
+            <TextClock
+                android:id="@+id/time_am_pm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="a"
+                android:format24Hour=""
+                android:padding="0dp"
+                android:lines="1"
+                android:maxLines="1"
+                style="@style/AnotherWidget.Widget.Title"
+                android:gravity="center_vertical"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_marginTop="-16dp"
+            android:orientation="horizontal"
+            android:id="@+id/clock_bottom_margin_none" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_marginTop="-8dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/clock_bottom_margin_small" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/clock_bottom_margin_medium" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/clock_bottom_margin_large" />
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:layout_centerVertical="true"
+                android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:alpha="0"
+                    android:visibility="gone"
+                    android:orientation="vertical"
+                    android:layoutDirection="locale"
+                    android:id="@+id/first_line_rect">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/date_rect"/>
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:id="@+id/weather_rect" />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layoutDirection="locale"
+                    android:visibility="gone"
+                    android:id="@+id/calendar_layout_rect"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_height="wrap_content"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:id="@+id/next_event_rect" />
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:id="@+id/next_event_difference_time_rect" />
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/action_next_rect" />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="4dp"
+                    android:visibility="gone"
+                    android:orientation="horizontal"
+                    android:id="@+id/sub_line_top_margin_small_sans" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    android:visibility="gone"
+                    android:orientation="horizontal"
+                    android:id="@+id/sub_line_top_margin_medium_sans" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="12dp"
+                    android:visibility="gone"
+                    android:orientation="horizontal"
+                    android:id="@+id/sub_line_top_margin_large_sans" />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layoutDirection="locale"
+                    android:gravity="center_vertical">
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/sub_line_rect" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="center">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:visibility="gone"
+                            android:id="@+id/weather_sub_line_rect" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scaleType="fitCenter"
+                android:layout_centerVertical="true"
+                android:id="@+id/bitmap_container"/>
+        </RelativeLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/right_aligned_widget.xml b/app/src/main/res/layout/right_aligned_widget.xml
new file mode 100644
index 0000000..5519290
--- /dev/null
+++ b/app/src/main/res/layout/right_aligned_widget.xml
@@ -0,0 +1,280 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:id="@+id/main_layout">
+    <ProgressBar
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_centerInParent="true"
+        android:indeterminate="true"
+        android:indeterminateTint="@color/colorPrimary"
+        android:id="@+id/loader" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical|end"
+        android:layout_centerVertical="true"
+        android:orientation="vertical"
+        android:id="@+id/date_layout">
+        <TextView
+            android:id="@+id/empty_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:textColor="@color/colorPrimary"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            style="@style/AnotherWidget.Widget.Title"/>
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|end"
+            android:visibility="gone"
+            android:scaleX=".8"
+            android:scaleY=".8"
+            android:transformPivotX="0dp"
+            android:layout_marginStart="4dp"
+            android:id="@+id/weather">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:id="@+id/divider1"
+                    android:text="@string/divider"
+                    android:includeFontPadding="false"
+                    style="@style/AnotherWidget.Widget.Subtitle"/>
+            </LinearLayout>
+            <ImageView
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:paddingEnd="4dp"
+                android:paddingStart="4dp"
+                android:layout_marginEnd="4dp"
+                android:id="@+id/empty_weather_icon"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Widget.Date.Big"
+                android:maxLines="1"
+                android:includeFontPadding="false"
+                android:id="@+id/temp"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:id="@+id/calendar_layout"
+        android:visibility="gone"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:gravity="center_vertical|end">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical">
+                    <ImageView
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:id="@+id/action_previous_shadow"
+                        android:src="@drawable/round_chevron_right_24" />
+                    <ImageView
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:id="@+id/action_previous"
+                        android:src="@drawable/round_chevron_right_24" />
+                </RelativeLayout>
+                <TextView
+                    android:id="@+id/next_event"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:maxLines="1"
+                    android:lines="1"
+                    android:gravity="end"
+                    android:ellipsize="end"
+                    android:includeFontPadding="false"
+                    android:layout_height="wrap_content"
+                    style="@style/AnotherWidget.Widget.Title" />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical">
+                    <TextView
+                        android:id="@+id/next_event_difference_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="marquee"
+                        android:includeFontPadding="false"
+                        style="@style/AnotherWidget.Widget.Title" />
+                </LinearLayout>
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical">
+                    <ImageView
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:id="@+id/action_next_shadow"
+                        android:src="@drawable/round_chevron_right_24" />
+                    <ImageView
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:id="@+id/action_next"
+                        android:src="@drawable/round_chevron_right_24" />
+                </RelativeLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:scaleX=".8"
+                android:scaleY=".8"
+                android:transformPivotX="0dp"
+                android:layout_marginStart="4dp"
+                android:gravity="center_vertical"
+                android:id="@+id/special_weather">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:id="@+id/divider3"
+                        android:text="@string/divider"
+                        android:includeFontPadding="false"
+                        style="@style/AnotherWidget.Widget.Subtitle"/>
+                </LinearLayout>
+                <ImageView
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:paddingEnd="4dp"
+                    android:paddingStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:id="@+id/special_weather_icon"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AnotherWidget.Widget.Date.Big"
+                    android:maxLines="1"
+                    android:includeFontPadding="false"
+                    android:id="@+id/special_temp"/>
+            </LinearLayout>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="4dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/second_row_top_margin_small" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="8dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/second_row_top_margin_medium" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="12dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/second_row_top_margin_large" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|end"
+            android:id="@+id/second_row"
+            android:layout_marginStart="4dp"
+            android:orientation="horizontal">
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:cropToPadding="false"
+                android:clipChildren="false"
+                android:layout_marginEnd="4dp">
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:cropToPadding="false"
+                    android:clipChildren="false"
+                    android:id="@+id/second_row_icon_shadow"
+                    android:src="@drawable/round_today_24"/>
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:cropToPadding="false"
+                    android:clipChildren="false"
+                    android:id="@+id/second_row_icon"
+                    android:src="@drawable/round_today_24"/>
+            </RelativeLayout>
+            <TextView
+                android:id="@+id/next_event_date"
+                android:layout_width="wrap_content"
+                android:ellipsize="end"
+                android:lines="1"
+                android:maxLines="1"
+                android:includeFontPadding="false"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Widget.Subtitle" />
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:visibility="gone"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:layout_marginStart="8dp"
+                android:id="@+id/calendar_weather">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:id="@+id/divider2"
+                    android:text="@string/divider"
+                    android:includeFontPadding="false"
+                    style="@style/AnotherWidget.Widget.Subtitle"/>
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:id="@+id/weather_icon"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    android:adjustViewBounds="true"
+                    android:layout_marginEnd="2dp"
+                    android:layout_marginStart="2dp"
+                    android:src="@drawable/clear_night"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AnotherWidget.Widget.Date"
+                    android:layout_marginStart="8dp"
+                    android:ellipsize="marquee"
+                    android:layout_marginEnd="4dp"
+                    android:includeFontPadding="false"
+                    android:id="@+id/calendar_temp"/>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/right_aligned_widget_sans.xml b/app/src/main/res/layout/right_aligned_widget_sans.xml
new file mode 100644
index 0000000..85ce6f5
--- /dev/null
+++ b/app/src/main/res/layout/right_aligned_widget_sans.xml
@@ -0,0 +1,173 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        android:scaleType="fitXY"
+        android:id="@+id/widget_shape_background"
+        android:src="@drawable/card_background" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_vertical|end"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:id="@+id/main_layout"
+        android:animateLayoutChanges="true">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/time_container"
+            android:orientation="horizontal">
+            <TextClock
+                android:id="@+id/time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:format12Hour="h:mm"
+                android:padding="0dp"
+                android:lines="1"
+                android:maxLines="1"
+                style="@style/AnotherWidget.Widget.Title"/>
+            <TextClock
+                android:id="@+id/time_am_pm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:format12Hour="a"
+                android:format24Hour=""
+                android:padding="0dp"
+                android:lines="1"
+                android:maxLines="1"
+                style="@style/AnotherWidget.Widget.Title"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_marginTop="-16dp"
+            android:orientation="horizontal"
+            android:id="@+id/clock_bottom_margin_none" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_marginTop="-8dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/clock_bottom_margin_small" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/clock_bottom_margin_medium" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:id="@+id/clock_bottom_margin_large" />
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical|end"
+                android:alpha="0"
+                android:orientation="vertical"
+                android:id="@+id/empty_layout_rect">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/empty_date_rect"/>
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/weather_rect" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:id="@+id/calendar_layout_rect"
+                android:alpha="0"
+                android:gravity="center_vertical|end">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/action_previous_rect" />
+                        <ImageView
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:id="@+id/next_event_rect" />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/next_event_difference_time_rect" />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/action_next_rect" />
+                    </LinearLayout>
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/calendar_weather_rect" />
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/special_weather_rect" />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="4dp"
+                    android:visibility="gone"
+                    android:orientation="horizontal"
+                    android:id="@+id/second_row_top_margin_small_sans" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    android:visibility="gone"
+                    android:orientation="horizontal"
+                    android:id="@+id/second_row_top_margin_medium_sans" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="12dp"
+                    android:visibility="gone"
+                    android:orientation="horizontal"
+                    android:id="@+id/second_row_top_margin_large_sans" />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/second_row_rect" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scaleType="fitCenter"
+                android:id="@+id/bitmap_container"/>
+
+        </RelativeLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/the_widget.xml b/app/src/main/res/layout/the_widget.xml
index c0b260e..2282237 100644
--- a/app/src/main/res/layout/the_widget.xml
+++ b/app/src/main/res/layout/the_widget.xml
@@ -4,79 +4,80 @@
     android:layout_gravity="center"
     android:clipChildren="false"
     android:clipToPadding="false"
+    android:orientation="vertical"
     android:id="@+id/main_layout">
     <ProgressBar
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center"
         android:indeterminate="true"
+        android:layout_centerInParent="true"
         android:indeterminateTint="@color/colorPrimary"
         android:id="@+id/loader" />
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_centerInParent="true"
-        android:orientation="horizontal"
-        android:layoutDirection="locale"
-        android:id="@+id/empty_layout">
-        <TextView
-            android:id="@+id/empty_date"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:lines="1"
-            android:textColor="@color/colorPrimary"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:includeFontPadding="false"
-            style="@style/AnotherWidget.Widget.Title"/>
+        android:orientation="vertical"
+        android:layout_centerInParent="true">
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:visibility="gone"
-            android:paddingStart="8dp"
-            android:id="@+id/weather">
+            android:layout_gravity="center"
+            android:orientation="horizontal"
+            android:layoutDirection="locale"
+            android:id="@+id/date_layout">
             <TextView
-                android:layout_width="wrap_content"
+                android:id="@+id/date"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:id="@+id/divider1"
-                android:text="@string/divider"
-                android:includeFontPadding="false"
-                style="@style/AnotherWidget.Widget.Subtitle"/>
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:id="@+id/empty_weather_icon"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="8dp"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/AnotherWidget.Widget.Date.Big"
+                android:lines="1"
+                android:textColor="@color/colorPrimary"
                 android:maxLines="1"
+                android:ellipsize="end"
                 android:includeFontPadding="false"
-                android:id="@+id/temp"/>
+                style="@style/AnotherWidget.Widget.Title"/>
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:visibility="gone"
+                android:layout_marginStart="4dp"
+                android:id="@+id/weather_date_line">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:id="@+id/weather_date_line_divider"
+                    android:text="@string/divider"
+                    android:includeFontPadding="false"
+                    style="@style/AnotherWidget.Widget.Subtitle"/>
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:id="@+id/weather_date_line_weather_icon"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="8dp"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AnotherWidget.Widget.Date.Big"
+                    android:maxLines="1"
+                    android:includeFontPadding="false"
+                    android:id="@+id/weather_date_line_temperature"/>
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerHorizontal="true"
-        android:id="@+id/calendar_layout"
-        android:visibility="gone"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:gravity="center">
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layoutDirection="locale"
+            android:layout_gravity="center"
+            android:id="@+id/calendar_layout"
+            android:visibility="gone"
             android:orientation="horizontal">
             <RelativeLayout
                 android:layout_width="wrap_content"
@@ -131,60 +132,31 @@
                     android:id="@+id/action_next"
                     android:src="@drawable/round_chevron_right_24" />
             </RelativeLayout>
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:visibility="gone"
-                android:paddingStart="8dp"
-                android:id="@+id/special_weather">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:id="@+id/divider3"
-                    android:text="@string/divider"
-                    android:includeFontPadding="false"
-                    style="@style/AnotherWidget.Widget.Subtitle"/>
-                <ImageView
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:paddingEnd="4dp"
-                    android:paddingStart="4dp"
-                    android:layout_marginEnd="4dp"
-                    android:id="@+id/special_weather_icon"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Widget.Date.Big"
-                    android:maxLines="1"
-                    android:includeFontPadding="false"
-                    android:id="@+id/special_temp"/>
-            </LinearLayout>
         </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="4dp"
             android:visibility="gone"
             android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_small" />
+            android:id="@+id/sub_line_top_margin_small" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="8dp"
             android:visibility="gone"
             android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_medium" />
+            android:id="@+id/sub_line_top_margin_medium" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="12dp"
             android:visibility="gone"
             android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_large" />
+            android:id="@+id/sub_line_top_margin_large" />
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:baselineAligned="false"
+            android:layout_gravity="center"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:layoutDirection="locale"
@@ -194,7 +166,8 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:id="@+id/second_row"
+                android:id="@+id/sub_line"
+                android:visibility="gone"
                 android:orientation="horizontal">
                 <RelativeLayout
                     android:layout_width="wrap_content"
@@ -207,18 +180,18 @@
                         android:layout_height="16dp"
                         android:cropToPadding="false"
                         android:clipChildren="false"
-                        android:id="@+id/second_row_icon_shadow"
+                        android:id="@+id/sub_line_icon_shadow"
                         android:src="@drawable/round_today_24"/>
                     <ImageView
                         android:layout_width="16dp"
                         android:layout_height="16dp"
                         android:cropToPadding="false"
                         android:clipChildren="false"
-                        android:id="@+id/second_row_icon"
+                        android:id="@+id/sub_line_icon"
                         android:src="@drawable/round_today_24"/>
                 </RelativeLayout>
                 <TextView
-                    android:id="@+id/next_event_date"
+                    android:id="@+id/sub_line_text"
                     android:layout_width="wrap_content"
                     android:ellipsize="end"
                     android:lines="1"
@@ -230,42 +203,33 @@
             <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:gravity="center"
                 android:visibility="gone"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:layout_marginStart="8dp"
-                android:id="@+id/calendar_weather">
+                android:layout_marginStart="4dp"
+                android:id="@+id/weather_sub_line">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:id="@+id/divider2"
+                    android:id="@+id/weather_sub_line_divider"
                     android:text="@string/divider"
                     android:includeFontPadding="false"
                     style="@style/AnotherWidget.Widget.Subtitle"/>
                 <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:id="@+id/weather_icon"
-                    android:clipChildren="false"
-                    android:clipToPadding="false"
-                    android:adjustViewBounds="true"
-                    android:layout_marginEnd="2dp"
-                    android:layout_marginStart="2dp"
-                    android:src="@drawable/clear_night"/>
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:id="@+id/weather_sub_line_weather_icon"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="8dp"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Widget.Date"
-                    android:layout_marginStart="8dp"
-                    android:ellipsize="marquee"
-                    android:layout_marginEnd="4dp"
+                    style="@style/AnotherWidget.Widget.Date.Big"
+                    android:maxLines="1"
                     android:includeFontPadding="false"
-                    android:id="@+id/calendar_temp"/>
+                    android:id="@+id/weather_sub_line_temperature"/>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-
 </RelativeLayout>
\ 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 697b42a..75e8cda 100644
--- a/app/src/main/res/layout/the_widget_sans.xml
+++ b/app/src/main/res/layout/the_widget_sans.xml
@@ -74,40 +74,48 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scaleType="fitCenter"
+                android:layout_centerInParent="true"
+                android:id="@+id/bitmap_container"/>
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:alpha="0"
-                android:layout_centerHorizontal="true"
-                android:orientation="horizontal"
-                android:layoutDirection="locale"
-                android:id="@+id/empty_layout_rect">
-                <ImageView
+                android:layout_centerInParent="true"
+                android:orientation="vertical">
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/empty_date_rect"/>
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/weather_rect" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_centerHorizontal="true"
-                android:id="@+id/calendar_layout_rect"
-                android:alpha="0"
-                android:gravity="center">
+                    android:gravity="center"
+                    android:alpha="0"
+                    android:visibility="gone"
+                    android:orientation="horizontal"
+                    android:layoutDirection="locale"
+                    android:id="@+id/first_line_rect">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/date_rect"/>
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:id="@+id/weather_rect" />
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layoutDirection="locale"
+                    android:visibility="gone"
+                    android:id="@+id/calendar_layout_rect"
                     android:orientation="horizontal">
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:visibility="gone"
                         android:layout_gravity="center_vertical"
                         android:id="@+id/action_previous_rect" />
                     <ImageView
@@ -118,35 +126,33 @@
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:visibility="gone"
                         android:id="@+id/next_event_difference_time_rect" />
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:visibility="gone"
                         android:layout_gravity="center_vertical"
                         android:id="@+id/action_next_rect" />
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/special_weather_rect" />
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="4dp"
                     android:visibility="gone"
                     android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_small_sans" />
+                    android:id="@+id/sub_line_top_margin_small_sans" />
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="8dp"
                     android:visibility="gone"
                     android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_medium_sans" />
+                    android:id="@+id/sub_line_top_margin_medium_sans" />
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="12dp"
                     android:visibility="gone"
                     android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_large_sans" />
+                    android:id="@+id/sub_line_top_margin_large_sans" />
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -162,7 +168,7 @@
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:id="@+id/second_row_rect" />
+                            android:id="@+id/sub_line_rect" />
                     </LinearLayout>
                     <LinearLayout
                         android:orientation="horizontal"
@@ -172,17 +178,11 @@
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:id="@+id/calendar_weather_rect" />
+                            android:visibility="gone"
+                            android:id="@+id/weather_sub_line_rect" />
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scaleType="fitCenter"
-                android:id="@+id/bitmap_container"/>
-
         </RelativeLayout>
     </LinearLayout>
 </RelativeLayout>
\ 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 24eb9f2..f37c356 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -37,6 +37,10 @@
     <string name="font_700">Grassetto</string>
     <string name="font_800">Nero</string>
     <string name="font_900">Molto nero</string>
+    <string name="settings_widget_align_title">Allineamento widget</string>
+    <string name="settings_widget_align_left_subtitle">Sinistra</string>
+    <string name="settings_widget_align_right_subtitle">Destra</string>
+    <string name="settings_widget_align_center_subtitle">Centro</string>
 
     <!-- Calendar -->
     <string name="settings_calendar_title">Calendario</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d2c9b0..218745c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,10 @@
     <string name="settings_secondary_row_top_margin_title">Rows spacing</string>
     <string name="action_custom_font_to_search">Custom font…</string>
     <string name="font_family_settings_title">Font family</string>
+    <string name="settings_widget_align_title">Widget align</string>
+    <string name="settings_widget_align_left_subtitle">Left</string>
+    <string name="settings_widget_align_right_subtitle">Right</string>
+    <string name="settings_widget_align_center_subtitle">Center</string>
     
     <string name="font_100" translatable="false">Thin</string>
     <string name="font_200" translatable="false">Light</string>
diff --git a/build.gradle b/build.gradle
index abafc28..8238dc1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.4.32'
     repositories {
         google()
         jcenter()
@@ -10,14 +10,14 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.gms:google-services:4.3.5'
 
         // Add the Crashlytics Gradle plugin.
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
 
-        classpath 'io.realm:realm-gradle-plugin:6.0.2'
+        classpath 'io.realm:realm-gradle-plugin:10.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 1f22426dec104f6f45ac5122e71c0d97ca3ba7d5 Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Tue, 4 May 2021 18:32:20 +0200
Subject: [PATCH 4/6] 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)<h;3K|Lk000e1NJLTq000{R000{Z1ONa4C*3^W0001%Nkl<ZILp<P
zy$OIY5JuAo>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+%t8<o5
z@_^e00YRgdY7Qr_LXqQz(|I1IXD>Qt&!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<<yzNoN|K=h!%N_{N+Rae5`R#A(Ix4fCDKcxttu99K{=+xb>3lI><rbB^Q`
z`{I2(QJXJB?efy9>|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)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002%Nkl<ZSi|ku
zF%E(-6vlB38wb$Iuo?{m7XWV3&4n1ffk*K$vUm-4PQdVYFtYiSXQ>+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|<uYbg
qK@2nO_pqRkE+L<jf<Ba4KAtP62Ksa5no}(R0000<MNUMnLSTZ09)c?X

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_48.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_center_white_48.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|@<G-*jeK-4ynnpkV
z3(*Y>j7%&X6WBdAhso~xx;jrb%5;12CZ$uoDyptiZ#k&)gxqp4<q7%!h5P1O#qF_a
z<$Q&u3_u+M3j`hGW4HfZe@Tzo^PR^llTAzO76@5vVC(x^`anNrd)u9|nRhLZTxH}C
tP;h8qW54-VZF{xHgKt-wI_$nN1is+?c;(ESUqF8_c)I$ztaD0e0svG|U()~p

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_18.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b14dda9e19169320516532d86f863cc3935c838
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i0wmS%+S~(D^`0({Ar_~T6Bbzic>lHjalPoJ
zt#AMR|6kAh^42%ztylRKbN{FQ(|*us6S3uQ`rrB=_H`c~*E1|Ld;GuUpqfu^%>R6$
z3t!&XYl-du`}|M--}{XGA+ozZwjIqs_Fs}S<FMc)Z;s5va{2Rt<UB8{lb(~6oNe|`
ijGQ(hyyzk?14F{Pl!BBS7utYMVeoYIb6Mw<&;$T97EmSt

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_20.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_left_white_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..37be50e8ec7fea750126bd5d4994350708e36ed8
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfCAHMo$;V5R21quWaOPP!MQMw3e1U
zbn8}=gwS)tTNk9o3lzhZ%=8|-XKD~P**Ky6YdFJk?Jj@klP<Hn+!Oqdav!KS<Z_mm
zZT^&$CG)-Tie1jcqrVD{Yc5cq`~S?WnW|RCR{EZQ4zX!5^4VQgJGfBQQpIA+yzF1c
kGm0kfiP-D!^?!0q*w*>0&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)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002mNkl<ZSi|ku
zu?>Py5XNz6?5(iUmXI)l!4Y%<1|TFbfT6K<0edHM025k6w5Rx6XzxAl<wcVF-T=Sm
z-reP*$TH)wp=BS2TJr?p90F_k<P`$zz8HoXW>{E^n4I0@mlKOI3VL+uDMT0v1Nsak
z60F2eN(okZ!YT=tF?ygzGFgE%YHp;Fmwrl3H~H11)<Fz2?7!yO?@xW?z`_G2ZdW%}
zO3bMdU$vOah<Ru+m*IKWVlHdJNnaq+h3Dc}kCRuqElcYlh8gycSkR+O$a7NALz!hZ
Zc>@=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;<?WU&Y#accVu?F=w2DRK6G`}R=EX^+u8Up6tU~d
zEof(8WMbhESg^~%>y=6Nb@kh(tAlqj1YKIO;+Xi7<qOuF_*8j8glpEh=4}BN!VZdW
zigwQ1ede9aqgM<-T?!8M7Eku?xA1nDe!PF<1QCM;PbDsh7|auE+}6OjZ=HV1_O?4^
yGw)g+xylGq+)&4s@_qK5cZ!X-gSnNsUN9_W;{CXW*-{?p8wO8TKbLh*2~7YPY-67Q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_18.png b/app/src/main/res/drawable-hdpi/round_align_horizontal_right_white_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cd7e078fb074655ec1bbe09e7281f9d728875dc
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i0wmS%+S~(DO`a}}Ar_~T6C}1g*njGO@Bh6X
z*TX*l|NsB)lI+#&S-0&IZvFfGC;R|&>V~Y}@*n;mumAJlLw%S}?(BcUY{zEY3i|(F
zdBMwP^?EsV!GGU3ut)uWF2f?|z?%DC^1t-thui;qckp?N<j(KtF*nJb>#|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@rNagV<!e`*og42V7|-Dq@W<FR9tUU$ru<I^gLkl
z0<(6XrW`)iMx!8+PtPwb61eqMzdDuc$~LzYhO28A$_7<Fmh5zz$G>xJ&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)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002mNkl<ZSi|ku
zF%E)25QSlA?5(iUmXL4+gGbO4Z~#IA2QW0YUclZHc>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<avw=uUBA2mI
z4@34v<zo$uFIM!abxu0BZ9{3}f3+VeH|x}I`Z{y$%)F9yVVQ4p6#s=4<!<~Jelf0<
zTd<yiiG@Qz!QpzN$d$~C3$=?g0+&x<47#u+Xl9*f;et5T%gdXeEm~kHyG5M!t$Bpv
zZrdkir{26%bYoX=XkcKhV$-N(m@d2Srl{)rI+uoDU97rXCgE!~1TNT{bn^ds(M`9V
y^Om1^Czn(LwMT!#UE`g1-I=zp7i+OmQ~$T0_hU-Hb~&Jb7(8A5T-G@yGywo!Mq``+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_18.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fea0c4b918454d100564dd460928ae67a752382
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|may?xfLp07OCn&K0+5RWrGveaB
z|J5AYxBl1L|Lpo#{r5iiB$mV99XOKT|9#&Yu;rh<-Uhja9zW~f{;$&5!{1_1_O?D%
z%0fox<mde?M|Vy7Z!@Ed%RnZ!VWr2@|6)@VZhVSwbyM`KViBGkvVoDIoPXBVOzlv9
Ppv4THu6{1-oD!M<8dgE6

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_20.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..141cbf9e16e00137e34567532792532627d87c49
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc0wmQNuC@WGVow*x5RLQ62@3Lm!hfuHm~-gy
z|9;`+A5Q((o}&FnpRq_%<Q|I?i$7E3%<KR6|1WIZ|9`Il*W>?>nLnOL+r=Py_<^v3
z%ZHeZH`yDQPX52B5$67X`jK@X<l4;NC5BfpIX~ol!)0l}G^d%b&^OLV+3aBwJ3}?&
W(a81{A~Hbh89ZJ6T-G@yGywp&h(XQ(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_24.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_center_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..446ca4dadf967ad26f457b89165ce6146b3cf3aa
GIT binary patch
literal 123
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Cr=m05R22v2@(n){-5}-yd;yM
zY2mVm^{@ZW|NpUZ{{QGe)0$uY95sv1v^^A9Q?aM-{B8@T@4{bmB=`<`If^Y+Vql28
X^z>`?_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<<yzNoN|K=h!%N_{N+Rae5`R#A(Ix4fCDKcxttu99K{=+xb>3lI><rbB^Q`
z`{I2(QJXJB?efy9>|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^Y<p-f;xzsKGb@v{w$PcN;Vn*Ax~N#%lEtAghYKRd2?mtEwMu=vWd>VAa#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_DWD<bgh
z|NAYXSO5R__jUar`Y-?IetG7+pX-~}taxBw7SOP!<9R*jgjPQ9f1fWLd${77WkPt%
rs}J9gusE{5b(*t+Lrra^02{+~vAJtzTC%+ZTEO7x>gTe~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{y<Tw_spMO1`aE;m0oow2{Hn)z4*}
HQ$iB}mliq<

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_24.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_left_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..46bb3dfc5f7ecbed05f33d780c5886477361e2ef
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1M^6{W5R22v2@AM?)Ia$zc*%s}
zV8O)?`@jA_|9{7U^Z(b*kh1%GoZT)k@9+kmu$2C!s~<T11A>mWDax){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-M<n#U~^|ov}KhHa_n(Yzt<$fc_
w>wo)?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<uIfq&q8Rne4t#|tOpKze9
N44$rjF6*2UngIGEMf?B&

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_24.png b/app/src/main/res/drawable-mdpi/round_align_horizontal_right_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f6ca91d6f94d2ac56b095cbda196634dcea0c3c
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*17f%<*5R22v2@)m`{!jex?s1uc
zr8)BO|7-v4|37B3|Gzyc>&F*)`5!Jjc@HZ_1gczMZkVuqBg;qiSGNpgnx<w&PRU_l
ZxYYdg>w%}%^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@rNagV<!e`*og42V7|-Dq@W<FR9tUU$ru<I^gLkl
z0<(6XrW`)iMx!8+PtPwb61eqMzdDuc$~LzYhO28A$_7<Fmh5zz$G>xJ&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_MZ4hQ<?JG{<cV>E}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<tiaC!3H^+eAP
z=7mXWTKrozS9}!kbv)uM*RsyZisPTjlQ4nke;aQwxxD%&ykMCe2ji+&f}#t$Bb6Ut
mvf$k*W@LRcY<`FAW5!KaUIiD%O$-4#hr!d;&t;ucLK6Va4Mj)*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-night-hdpi/round_align_horizontal_right_24.png b/app/src/main/res/drawable-night-hdpi/round_align_horizontal_right_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..43fe3d3bf5e425fa0b9a3c111b5d1d84ea33f0c6
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8lc$SgNX4zU*A8+XP~c$=*gZ*m
zN5f|k5%q#?Igi->1yz}Dn<%s7$#ac8-JVx0Pit^k2%0QtX<EWKbvKWYbH|DE2fb5|
zaJF!HYVn&2Ua9DC5%@TPePO+m6~{fPPtOHz3tW0Vf18Hqf^8;B%q#SG-!fRuIBFEH
md~L#S=Pdti*VL2V$1L0bD)^e?BQ~IG7(8A5T-G@yGywpBo<)-Y

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-night-mdpi/round_align_horizontal_center_24.png b/app/src/main/res/drawable-night-mdpi/round_align_horizontal_center_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2f3bccf8cd08fa246a97838df3077bf1ba811a7
GIT binary patch
literal 124
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1XHOT$kcwN$2@(n)?0?mpWJ*c>
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@eIMbd4l8<eU=R=1t6Xqu#D#`7{k)wKJP2m`~d
Xd6ya+|9N%;jbre1^>bP0l+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%puof8pk<cm
z=<o1S=as3QYZg~WeAuFTHj9(jq8FJy4L;a#(4e9rG3ijnftq;?jP-069&+sQJaF;)
zf!3ZMQXL`+T#V`c9eYzmeH$7cUz$5L`}3w>b^@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*?<YpVW#-u7+#g*=Ha
z9b@(%0%w_Z&L}HqwR16C`Yg-pV5Z3I@LauxL$Jy5>f<c)qSot6FW-LqW$F`M!FY#>
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<MYKlHvyD@-sjGANcI^%Qpom(d+5r7*fHQEb-0Zgv-PYN>?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<MYKlHvyD@-sjGANcI^%Qpom(e3Ht7*fHQEOFA|gv-PYN>?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^cbu<VPewa
i)yuA!?ArE_k72Tu^ex$6g6n|JV(@hJb6Mw<&;$TXXLLOP

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_center_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_align_horizontal_center_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..a00f0d0d52f1502d790b35b4736b5812de91a37c
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3-2k5uS0MeLXt2;@^=zO9zLFrn
zV1@?9&uJ(2@<|4lloy8_-B{fKl-cX);uum9_x8Fj-ysKqwuif}^|dH?<~O(&G)UF3
zvS++9jA4v!f5I|{@uVcz30vpv;|8^N)oSL~Pr5mOW=hwb#ZwM%c7Krb&EY}nHm3(^
z+uRO3`=cu$a6|6$`8RxWA+cPa_F4oiH&ADvC9y{~Bl$yNf_$?ebBvIk$-b~Z1wXP^
zG_tTP;yfL-{MDgnUsgW;_C50v<KxSE5{cey&pH_OIOV0{wd*YYm|k&UVk-G~TcMzJ
kwQ79a>4*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
zU<SV6lH&4)5XQ6<pZ`nlm8<Ay0ZQ%mba4!+U`&#*Nf0s6vgVwy#L+}ocY+FUYG$UV
zN~VFgx3`+7vy=eCjg{5HYz`V62ZSvuq_VlqJA^y9SM*OX)R9rD?URvNvgft^hrgK#
zA4Hpv8`mupXL-qX@-?pl`&q^S%NYz(?A!+)B)oR0pA@&{URZ6xrK}$fEfPQS-?lcF
zeALlA!DuNG!ZNw3Eg{fAAV>0q|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
zU<SV6lH&4)5XQ6<pZ`nlm8<Ay0ZQ%jba4!+V0?RBk>gN+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<XaE2J

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_18.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_18.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<<yzNoN|K=h!%N_{N+Rae5`R#A(Ix4fCDKcxttu99K{=+xb>3lI><rbB^Q`
z`{I2(QJXJB?efy9>|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)0<x%E&C9Ef9Ey%bNNr1JfyZQf8fQy
Q26QTer>mdKI;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^Y<p-f;xzsKGb@v{w$PcN;Vn*Ax~N#%lEtAghYKRd2?mtEwMu=vWd>VAa#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|@<G-*jeK-4ynnpkV
z3(*Y>j7%&X6WBdAhso~xx;jrb%5;12CZ$uoDyptiZ#k&)gxqp4<q7%!h5P1O#qF_a
z<$Q&u3_u+M3j`hGW4HfZe@Tzo^PR^llTAzO76@5vVC(x^`anNrd)u9|nRhLZTxH}C
tP;h8qW54-VZF{xHgKt-wI_$nN1is+?c;(ESUqF8_c)I$ztaD0e0svG|U()~p

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_48.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_center_white_48.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;<CT1Vi&V*y}ta`8mUv$)v~rumHF3P@K0w&xbN5J
zjKQG|FKrT5b8Yymc;KJVrv06F<rja`-z2T08qv!HH;I8^!GQ(AWd)qlro|KYcR98H
zjd`HMQlIzoG2=%0J<BQ_-l!kvJ@8jw@%QW-e+{$#EA2iQ)O1w?Nk79rhBxMiZsxm|
i+~>*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)<aQlyBd!=lfB(kY>;;PsIG&N!&@gaok1S9=6_E2)AyRs~5>J7^
z)ESI<i_(uVgkKaeaH!gMFZgS5!d*k&qhZ`t|IhvWSCDmzb3xvL`6Wzoi9lB}c)I$z
JtaD0e0s#9vOT_>H

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;<?WU&Y#accVu?F=w2DRK6G`}R=EX^+u8Up6tU~d
zEof(8WMbhESg^~%>y=6Nb@kh(tAlqj1YKIO;+Xi7<qOuF_*8j8glpEh=4}BN!VZdW
zigwQ1ede9aqgM<-T?!8M7Eku?xA1nDe!PF<1QCM;PbDsh7|auE+}6OjZ=HV1_O?4^
yGw)g+xylGq+)&4s@_qK5cZ!X-gSnNsUN9_W;{CXW*-{?p8wO8TKbLh*2~7YPY-67Q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_48.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_left_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d0fd1cc76ba14d0a3fee0e8200c5dd2a3dd7873
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg{(HJOhE&{odwVx;vjKx^pqBo@
zo()se8!ve~xUw?u5eZx}L9NqZo7|n~;DRIPw-sC#5EOhHw0cG4=0#EGFUNn$GE~uc
zwf6=4jIxH4{2v5?CL+L_KF(LB8Nn;fcwdPcF<#MH>GpED<S+9Er=^$cg$@-uET2_+
zoH04{K!wbPFxE8;fAST7x8L|{n)P3C_kn<>iy8=%7}oU4&A9N#*zqL)3A3d>%m4I-
zlmyN9+ria3J#^QnhCSTT$(0WGmL3&7@HY>)A=6oJ<hN|T-}Pdj<dr&WJwd^{tJs-%
VJ-ik4wt0i>@^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@rNagV<!e`*og42V7|-Dq@W<FR9tUU$ru<I^gLkl
z0<(6XrW`)iMx!8+PtPwb61eqMzdDuc$~LzYhO28A$_7<Fmh5zz$G>xJ&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_MZ4hQ<?JG{<cV>E}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<avw=uUBA2mI
z4@34v<zo$uFIM!abxu0BZ9{3}f3+VeH|x}I`Z{y$%)F9yVVQ4p6#s=4<!<~Jelf0<
zTd<yiiG@Qz!QpzN$d$~C3$=?g0+&x<47#u+Xl9*f;et5T%gdXeEm~kHyG5M!t$Bpv
zZrdkir{26%bYoX=XkcKhV$-N(m@d2Srl{)rI+uoDU97rXCgE!~1TNT{bn^ds(M`9V
y^Om1^Czn(LwMT!#UE`g1-I=zp7i+OmQ~$T0_hU-Hb~&Jb7(8A5T-G@yGywo!Mq``+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_48.png b/app/src/main/res/drawable-xhdpi/round_align_horizontal_right_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..87aff505803893bd4d77c9c12347d31e776ebe76
GIT binary patch
literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{ud~;uunK>+S8`yv+s@u8CUu
z2YWV5O>dl}x?oWgV_ug=kkHbNIR?|`Y<BpeB==8uXJ$u7hu+*MSKTO)t5tFTR)w!t
zbPRm&YJcDl<BY!y@r*#DVc<bTLsJ#+t<tdFY+t!r8L~`Qx?Nu1X)d`S;N_?JEfe@(
zglyK6Hwa_x`Pr~mD}nhzJ@-xfBk$G+{^q~QJ56Yf8?spwJ}B>G4!GO6>;^|v-V&cb
z-<Nmue(h{{mvmd}WWy%u#K%7yHbqaAZuq~u^^JVe_v<VEw!dNX<_ud5a}0>K;7F(!
nIQLIu(eK27-;Z~=xRhk@tG@T}wvy?c3zGMA^>bP0l+XkKE30<l

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_18.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ad39c5e360633678eedc990e0bda6c04aedd34d
GIT binary patch
literal 292
zcmV+<0o(qGP)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002%Nkl<ZSi|ku
zF%E(-6vlB38wb$Iuo?{m7XWV3&4n1ffk*K$vUm-4PQdVYFtYiSXQ>+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|<uYbg
qK@2nO_pqRkE+L<jf<Ba4KAtP62Ksa5no}(R0000<MNUMnLSTZ09)c?X

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_20.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..f75bd4471dec9797bdf03c3d8337f02ea6255902
GIT binary patch
literal 287
zcmV+)0pR|LP)<h;3K|Lk000e1NJLTq002Ay002A)1ONa4ko6Jy0002yNkl<ZSi|ku
zu?>ST5QX71YygAMLd^__9grf*RET-lzzt)-1T+*VB@KUyD5S%|#*irY+*<w$pU&1@
zE)vPNg`A$A{Af0224E&W7QXSy?O3>6;8I|L1s3>yXh2G-S<M1B+Px{kCv3vN-Wf=A
ztnYw*(*8P};VRiWe02t2*Wt(+9O-VkcEZ;Bs`jX8cSTz&Jn38l3oP&-z=SC7n_A=@
zMQG1XM*VrRq*2CCgR+B1V|cWKJ7c)pt9rM_uG;Yoe<bw|Pd_omrVoALa4sS(Q(%Dw
l{=p&YS!3hV2IUfoJ`dgX(}G<hGME4W002ovPDHLkV1g3qej5M)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_24.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_24.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|@<G-*jeK-4ynnpkV
z3(*Y>j7%&X6WBdAhso~xx;jrb%5;12CZ$uoDyptiZ#k&)gxqp4<q7%!h5P1O#qF_a
z<$Q&u3_u+M3j`hGW4HfZe@Tzo^PR^llTAzO76@5vVC(x^`anNrd)u9|nRhLZTxH}C
tP;h8qW54-VZF{xHgKt-wI_$nN1is+?c;(ESUqF8_c)I$ztaD0e0svG|U()~p

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_36.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d875f2ffcd471354bddf02dd38380901c731740
GIT binary patch
literal 483
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=esd5Fs|}+aSW-r_4dxjKE^<awuhWq
zb6r*j?O?CEILV`A$`++X57b`dz7;Fr_Ud#p=e1S*l)LrhyH($K_HRD^`_<9ObIzQZ
z8Sf_|C@6Sw_p(W1U830wgFM!(I``|<nk<bqYm#d9!_0UheD|+zWt6^mur2YxvGNUu
z1_=im7@664B*2X7<QYM$R;=FmIlY!WTK&hiby{AwO;<0(?b{lzteLG8KU*d7>eJ%V
z@UUBlU4IliF1wqM`ZMk(@3qfz*NU5Y_q6lgNzi?tsB0b(XTCnt{Auj^Zuz*wc6Z(<
zTlVY!sD3)>&LZwx6(?`4nDAwx*5YkpRu#@x8B4br<wPU70pyqs*Z)6Rly>XYuMcnk
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
P7<mkyu6{1-oD!M<ckkE)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_48.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_center_white_48.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!<cZ--~
z+}$T)j$a!TnmB$5G;t_(02yH7)vv@g`_g27ottNP_UiSslXvQ7t8UPHX0mqb5v!T!
z!#Z=GT?#dtTlr?{nLIgn)#4fMaVMXAY<`q)^w&@J|Azkhq$}}OhvH)%^V_R1n;g4h
z#Ukh;;D{i8rT_kQ`%tFXJqv4{)gLZ49p0iPzt1A))bU`xxnCIP9bQ*+<Ygg;Jd?Kk
z(&s3~_SC=Zs4u+AZ$AZOtP{dSFze5rw?FpI<z$cvRx#*2^4LV0f#HF;a&bv-!SA#(
QV4yO1y85}Sb4q9e0K#SC9smFU

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_18.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fa79acff23f6cfb75a743e71a0bfb7fce38cfdb
GIT binary patch
literal 275
zcmV+u0qp*XP)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002mNkl<ZSi|ku
zu?>Py5XNz6?5(iUmXI)l!4Y%<1|TFbfT6K<0edHM025k6w5Rx6XzxAl<wcVF-T=Sm
z-reP*$TH)wp=BS2TJr?p90F_k<P`$zz8HoXW>{E^n4I0@mlKOI3VL+uDMT0v1Nsak
z60F2eN(okZ!YT=tF?ygzGFgE%YHp;Fmwrl3H~H11)<Fz2?7!yO?@xW?z`_G2ZdW%}
zO3bMdU$vOah<Ru+m*IKWVlHdJNnaq+h3Dc}kCRuqElcYlh8gycSkR+O$a7NALz!hZ
Zc>@=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
zcmV<a00IArP)<h;3K|Lk000e1NJLTq002Ay002A)1ONa4ko6Jy0002RNkl<ZSi|ku
zu?>VU5ClLH%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;<?WU&Y#accVu?F=w2DRK6G`}R=EX^+u8Up6tU~d
zEof(8WMbhESg^~%>y=6Nb@kh(tAlqj1YKIO;+Xi7<qOuF_*8j8glpEh=4}BN!VZdW
zigwQ1ede9aqgM<-T?!8M7Eku?xA1nDe!PF<1QCM;PbDsh7|auE+}6OjZ=HV1_O?4^
yGw)g+xylGq+)&4s@_qK5cZ!X-gSnNsUN9_W;{CXW*-{?p8wO8TKbLh*2~7YPY-67Q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_36.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_left_white_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a814719e19afc4059eb3bbdb56a1a7764018234
GIT binary patch
literal 448
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=esd5Ft&TTIEGZ*dV9yP>yU#;d!gfc
zg@~w1wcj$1%QoEzK60=52zN%J=8_LgFSm8LJlX$rQ{LnQ)xXo)-+yMY=Sea8JmY3h
zM@Pp$_gUG?yX{IZ`hA`hp<Y|A)wXQO{G~w&&&_Y_6uI%3_nQXmH|>N24UEieJQ4;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)_5A<wfTUP(%_n{v1Vz%!KUmbY6U4*armVs=H
z{D}*?@2sSrm1<mcJG`fF;;)Pu*AK>v^M1BkmAfc0uKjhW$(eMSq&Er8ueop4HKhL0
z==wbARMC@+TOTI;e|0a#Bj?u+@%g%_e%4`+*eE_#q<X8*#_5bxt7?NcisuOm3I>+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-{$`>ZSrm<Ba*2s9S3jEeE8Of;X{5G
ki`v8qKARm~TwK;4`diY=eMfRDFjyHpUHx3vIVCg!0Q{%qp8x;=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_18.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..4298f7fe20c7f33f9a86125e6e77665b0e0c829e
GIT binary patch
literal 275
zcmV+u0qp*XP)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002mNkl<ZSi|ku
zF%E)25QSlA?5(iUmXL4+gGbO4Z~#IA2QW0YUclZHc>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-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)<h;3K|Lk000e1NJLTq002Ay002A)1ONa4ko6Jy0002UNkl<ZSi|ku
zu?>ST5Cu>g#$X87OvMBqhz(8*;w>zc2CAPTQIsmWFHR;2|9gN}`R?nwPEme27_i`m
z1w(7t@QAgBw<o-{hF=jZSnwai7%?Fqd=o|rMvoa$nbG^<jL2j^TteaEhifQY{ji0?
z=7$sZFm^{Gz7rA*>tS?-y|bEJf&~k{AnYEfu_KdQA>5Mq2(wGmqF}Zr)F_xOMkNYn
zt6+|Tx$?`@TL<o|`)r}t<Pt1c@HfJz9Z^p^8=rM3SFV{mwo$RbS|>`&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(dut<avw=uUBA2mI
z4@34v<zo$uFIM!abxu0BZ9{3}f3+VeH|x}I`Z{y$%)F9yVVQ4p6#s=4<!<~Jelf0<
zTd<yiiG@Qz!QpzN$d$~C3$=?g0+&x<47#u+Xl9*f;et5T%gdXeEm~kHyG5M!t$Bpv
zZrdkir{26%bYoX=XkcKhV$-N(m@d2Srl{)rI+uoDU97rXCgE!~1TNT{bn^ds(M`9V
y^Om1^Czn(LwMT!#UE`g1-I=zp7i+OmQ~$T0_hU-Hb~&Jb7(8A5T-G@yGywo!Mq``+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_36.png b/app/src/main/res/drawable-xxhdpi/round_align_horizontal_right_white_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f52f04319e279063cdc04bb20da6fecc5a5f81c
GIT binary patch
literal 444
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=esd5FgAO-IEGZ*dV9w(?~sFlTcXMi
zCLz_S=Uv__D};+!w!XCN*vTL=#Y1mL!)_5bw-^4Btt!2?i|6Ltd(1L_1Is+ww>fSu
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-R<K+!e6l9N)F}rmtli%tY2~ZN9oNVXN$#3j%GXD>nRTTzBYz*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;yp<K|Q>dkX)g!ivPfe-b>a%S+<I}3z;BDf0f`Woi@3Bj?
WS_-E)i>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<p-cR=U-E>?|yEHC^U7#NvYI0O_NK#VK=k4669GU2N=&4_clWOTjpnyyQ3HgCo~
zr)y^64c`Q|J$J12czt<+@)Ft13zC=4nXG8plEl90cFH^Jt^X6>*C$<xw|b+$?%#I#
zf94s#kWFS;q2=(EfATN(qm>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~loCIB3m<jVj6

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_18.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|@<G-*jeK-4ynnpkV
z3(*Y>j7%&X6WBdAhso~xx;jrb%5;12CZ$uoDyptiZ#k&)gxqp4<q7%!h5P1O#qF_a
z<$Q&u3_u+M3j`hGW4HfZe@Tzo^PR^llTAzO76@5vVC(x^`anNrd)u9|nRhLZTxH}C
tP;h8qW54-VZF{xHgKt-wI_$nN1is+?c;(ESUqF8_c)I$ztaD0e0svG|U()~p

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_20.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..8124710d33fce91aebee3bb627d6187d5cbcd18c
GIT binary patch
literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq002+`002-31ONa4Bp5m-0003sNkl<ZXx{DG
zAr6B;5Cu>qHApVdGt?A;;{^Cx&cHe9Nw^3XK%;S_vJOLjMVqFWW~Uu?Hst@+8=l(C
z3=>5R!!YmQfHTfGgvvW%1OSXUg~*FvyeBaZ518RIS$M#51uO|9kU#<nB#^+J1CgLY
zBRJg(*op2|NTj?RH~7pAxrBGb9lmqN(H+>pB8@w6G67ERz}W;iy8{Ok;NT9dO@Ote
z0q?!@dQroV1T7YCxCO2Fsg5F~C~$E;*VQMlf|~_W77GLtNFad(61WrKmjc4ASlF^K
zP%6QGE3G^ivHb>rqm<i#S|2zVHAqIS=&TRaZRRI^pzb)N(FbY{lq7>9gOQwU)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;<CT1Vi&V*y}ta`8mUv$)v~rumHF3P@K0w&xbN5J
zjKQG|FKrT5b8Yymc;KJVrv06F<rja`-z2T08qv!HH;I8^!GQ(AWd)qlro|KYcR98H
zjd`HMQlIzoG2=%0J<BQ_-l!kvJ@8jw@%QW-e+{$#EA2iQ)O1w?Nk79rhBxMiZsxm|
i+~>*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!<cZ--~
z+}$T)j$a!TnmB$5G;t_(02yH7)vv@g`_g27ottNP_UiSslXvQ7t8UPHX0mqb5v!T!
z!#Z=GT?#dtTlr?{nLIgn)#4fMaVMXAY<`q)^w&@J|Azkhq$}}OhvH)%^V_R1n;g4h
z#Ukh;;D{i8rT_kQ`%tFXJqv4{)gLZ49p0iPzt1A))bU`xxnCIP9bQ*+<Ygg;Jd?Kk
z(&s3~_SC=Zs4u+AZ$AZOtP{dSFze5rw?FpI<z$cvRx#*2^4LV0f#HF;a&bv-!SA#(
QV4yO1y85}Sb4q9e0K#SC9smFU

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_center_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8638d442ef9a4091f812958be2ab41c592414bf
GIT binary patch
literal 596
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1-T^)#u0Z-fl|b`MZg!w?k|jZY
z!3<h`S3j{%`tyI+#4EDdTW)`ro)eJ&H)q?8>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<M5PmfO#)0D+@hNQ6gmj+q=q$f^LE=Wx
zrj^?Z)*L!0hSTbX#;ljhZzZ%&L>&Kea8{3*saedlkNdy@?s9%p=PTa(+;>iabbGq`
KxvX<aXaWE$cpO&%

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_18.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;<?WU&Y#accVu?F=w2DRK6G`}R=EX^+u8Up6tU~d
zEof(8WMbhESg^~%>y=6Nb@kh(tAlqj1YKIO;+Xi7<qOuF_*8j8glpEh=4}BN!VZdW
zigwQ1ede9aqgM<-T?!8M7Eku?xA1nDe!PF<1QCM;PbDsh7|auE+}6OjZ=HV1_O?4^
yGw)g+xylGq+)&4s@_qK5cZ!X-gSnNsUN9_W;{CXW*-{?p8wO8TKbLh*2~7YPY-67Q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_20.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..289b9b9ff5540bff2e055df69187e3d73f70b0b5
GIT binary patch
literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r50wh%=tkf777%e<q978hhy}h-O?_hukTY_|K
zPuu~e#FUF2XEi34Z1>vJ=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%$#fAc<G7pr3H4WNkzX_bixV>QNJf0cW%zUW_j!16MWIiYJ@!F+!
zl>?_3^{XxW#rLqUj(D`>)a?biKUO;PGWUd@<ItVP3Nf4WPvwFII(ved-Z1dK3JdJr
z#Au?kX696R=T%ed*Yf&^v@2>Kh$)=2g~>$zPW3K_%U6%Dp4uk5;N_=`RsZFttiRuN
zEh|1QK}=sQQVi~3Ylrvx(|^|4p8w6=_nq<XbL~YuhyTQ!`+0K$^Q+@J<-nk1@O1Ta
JS?83{1ON%Tmcsx5

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d0fd1cc76ba14d0a3fee0e8200c5dd2a3dd7873
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg{(HJOhE&{odwVx;vjKx^pqBo@
zo()se8!ve~xUw?u5eZx}L9NqZo7|n~;DRIPw-sC#5EOhHw0cG4=0#EGFUNn$GE~uc
zwf6=4jIxH4{2v5?CL+L_KF(LB8Nn;fcwdPcF<#MH>GpED<S+9Er=^$cg$@-uET2_+
zoH04{K!wbPFxE8;fAST7x8L|{n)P3C_kn<>iy8=%7}oU4&A9N#*zqL)3A3d>%m4I-
zlmyN9+ria3J#^QnhCSTT$(0WGmL3&7@HY>)A=6oJ<hN|T-}Pdj<dr&WJwd^{tJs-%
VJ-ik4wt0i>@^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-{$`>ZSrm<Ba*2s9S3jEeE8Of;X{5G
ki`v8qKARm~TwK;4`diY=eMfRDFjyHpUHx3vIVCg!0Q{%qp8x;=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_left_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3087fe6ce3cf698432eeb3c5024bd18105ea48f
GIT binary patch
literal 592
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1-T^)#u0Z-fl|b`MZg!w?k|jZY
z!3<h`S3j{%`tyI+#4EDdTW)`ro)eJ&H)q?8>UB}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<QR{cuR2hXE+ntISehW5i2f79aD7{>^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>waH<!#y6%Bia!vPEo
z=X$MjA}myHC3QVs!0fa4^0K+kr*f~QUSn8xwD9pQ#ixPI1{@5FEzRcfuUP!~qh$LO
z_IcMXGtS<*Z7$!9vs?d`I2c@KYGB#t^rvHK{bHLFUz|DFihn&c5tjNp#pti6?P;xl
zj5zJy5zwps_TT=H3E8qcBQF2X3f7zcv??AF*zR+}U-3SY?==AF_H^}gS?83{1OT%C
B3E}_%

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd08e6e2d8e7acee84abc3d6edfb265bedbc64a5
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawj(EB_hGg7(dut<avw=uUBA2mI
z4@34v<zo$uFIM!abxu0BZ9{3}f3+VeH|x}I`Z{y$%)F9yVVQ4p6#s=4<!<~Jelf0<
zTd<yiiG@Qz!QpzN$d$~C3$=?g0+&x<47#u+Xl9*f;et5T%gdXeEm~kHyG5M!t$Bpv
zZrdkir{26%bYoX=XkcKhV$-N(m@d2Srl{)rI+uoDU97rXCgE!~1TNT{bn^ds(M`9V
y^Om1^Czn(LwMT!#UE`g1-I=zp7i+OmQ~$T0_hU-Hb~&Jb7(8A5T-G@yGywo!Mq``+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_20.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..c19529d423b5d1360362d56ac5c98cdae3695235
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r50wh%=tkf777|lFg978hhy}h-U&(TqUH9=Nt
zsrUsCjk|3fewq_sY!%91Ak1GRd|r9suC0C|T&*sSefOEBS{J7qKb%wBxc=tdnJ1qV
z@f<do$>M6Ve))^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<F0tU&->;*uRHkB@5^4LQwBX2;^ndvm<>K%J`4;<22WQ%
Jmvv4FO#oLPj<Ns%

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..87aff505803893bd4d77c9c12347d31e776ebe76
GIT binary patch
literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{ud~;uunK>+S8`yv+s@u8CUu
z2YWV5O>dl}x?oWgV_ug=kkHbNIR?|`Y<BpeB==8uXJ$u7hu+*MSKTO)t5tFTR)w!t
zbPRm&YJcDl<BY!y@r*#DVc<bTLsJ#+t<tdFY+t!r8L~`Qx?Nu1X)d`S;N_?JEfe@(
zglyK6Hwa_x`Pr~mD}nhzJ@-xfBk$G+{^q~QJ56Yf8?spwJ}B>G4!GO6>;^|v-V&cb
z-<Nmue(h{{mvmd}WWy%u#K%7yHbqaAZuq~u^^JVe_v<VEw!dNX<_ud5a}0>K;7F(!
nIQLIu(eK27-;Z~=xRhk@tG@T}wvy?c3zGMA^>bP0l+XkKE30<l

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_36.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<p-cR=U-E>?|yEHC^U7#NvYI0O_NK#VK=k4669GU2N=&4_clWOTjpnyyQ3HgCo~
zr)y^64c`Q|J$J12czt<+@)Ft13zC=4nXG8plEl90cFH^Jt^X6>*C$<xw|b+$?%#I#
zf94s#kWFS;q2=(EfATN(qm>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~loCIB3m<jVj6

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_align_horizontal_right_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b9fd0ddb27b4c7e8bf5530a6ae47b95f6e00f81
GIT binary patch
literal 588
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1-T^)#u0Z-fl|b`MZg!w?k|jZY
z!3<h`S3j{%`tyI+#4EDdTW)`ro)eJ&H)q?8>UB}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`7UUzPG<N-(9)z{Vg@k
zggJ}u?zHHA$?!R$sm)R}A=3BKt|g3TR(D1{7iln@vBp4+!AC9U6Z5Q$LrIU>a@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<nSc4r3on*W@p+YcT1zK~5vRR7
y0(!OI%1q}fTB|IcZMDwqX;I|5@2W~5;CTMT?pM5d4(on{bbGq`xvX<aXaWEkEeSRN

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/round_align_horizontal_center_24.xml b/app/src/main/res/drawable/round_align_horizontal_center_24.xml
new file mode 100644
index 0000000..bcb1896
--- /dev/null
+++ b/app/src/main/res/drawable/round_align_horizontal_center_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2L12,2c0.55,0 1,0.45 1,1v4l6.5,0C20.33,7 21,7.67 21,8.5v0c0,0.83 -0.67,1.5 -1.5,1.5H13v4h3.5c0.83,0 1.5,0.67 1.5,1.5v0c0,0.83 -0.67,1.5 -1.5,1.5H13v4c0,0.55 -0.45,1 -1,1h0c-0.55,0 -1,-0.45 -1,-1v-4H7.5C6.67,17 6,16.33 6,15.5v0C6,14.67 6.67,14 7.5,14H11v-4H4.5C3.67,10 3,9.33 3,8.5v0C3,7.67 3.67,7 4.5,7H11l0,-4C11,2.45 11.45,2 12,2z"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,22L3,22c-0.55,0 -1,-0.45 -1,-1V3c0,-0.55 0.45,-1 1,-1h0c0.55,0 1,0.45 1,1v18C4,21.55 3.55,22 3,22zM20.5,7h-13C6.67,7 6,7.67 6,8.5v0C6,9.33 6.67,10 7.5,10h13c0.83,0 1.5,-0.67 1.5,-1.5v0C22,7.67 21.33,7 20.5,7zM14.5,14h-7C6.67,14 6,14.67 6,15.5v0C6,16.33 6.67,17 7.5,17h7c0.83,0 1.5,-0.67 1.5,-1.5v0C16,14.67 15.33,14 14.5,14z"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21,2L21,2c0.55,0 1,0.45 1,1v18c0,0.55 -0.45,1 -1,1h0c-0.55,0 -1,-0.45 -1,-1V3C20,2.45 20.45,2 21,2zM3.5,10h13c0.83,0 1.5,-0.67 1.5,-1.5v0C18,7.67 17.33,7 16.5,7h-13C2.67,7 2,7.67 2,8.5v0C2,9.33 2.67,10 3.5,10zM9.5,17h7c0.83,0 1.5,-0.67 1.5,-1.5v0c0,-0.83 -0.67,-1.5 -1.5,-1.5h-7C8.67,14 8,14.67 8,15.5v0C8,16.33 8.67,17 9.5,17z"/>
+</vector>
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">
                         <include layout="@layout/the_widget_sans" android:id="@+id/widget_detail" />
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"/>
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/left_aligned_widget.xml b/app/src/main/res/layout/left_aligned_widget.xml
index d2a8ac4..276fb0d 100644
--- a/app/src/main/res/layout/left_aligned_widget.xml
+++ b/app/src/main/res/layout/left_aligned_widget.xml
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:visibility="gone"
-            android:layout_marginBottom="8dp"
+            android:paddingBottom="8dp"
             android:orientation="vertical"
             android:layoutDirection="locale"
             android:id="@+id/date_layout">
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 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:paddingTop="4dp">
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="fitCenter"
+                    android:id="@+id/bitmap_container"/>
+            </RelativeLayout>
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
+                android:alpha="0"
                 android:layout_centerVertical="true"
                 android:orientation="vertical">
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:alpha="0"
-                    android:visibility="gone"
                     android:orientation="vertical"
+                    android:background="@color/errorColorText"
                     android:layoutDirection="locale"
+                    android:visibility="gone"
+                    android:layout_marginBottom="4dp"
                     android:id="@+id/first_line_rect">
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:background="@color/colorAccent"
                         android:id="@+id/date_rect"/>
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:background="@color/colorNightDark"
                         android:visibility="gone"
                         android:id="@+id/weather_rect" />
                 </LinearLayout>
@@ -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" />
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:visibility="gone"
+                        android:background="@color/colorNightDark"
                         android:id="@+id/next_event_difference_time_rect" />
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:visibility="gone"
+                        android:background="@color/colorAccent"
                         android:layout_gravity="center_vertical"
                         android:id="@+id/action_next_rect" />
                 </LinearLayout>
@@ -143,6 +158,7 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="@color/colorNightDark"
                     android:orientation="horizontal"
                     android:layoutDirection="locale"
                     android:gravity="center_vertical">
@@ -155,6 +171,7 @@
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:background="@color/colorAccent"
                             android:id="@+id/sub_line_rect" />
                     </LinearLayout>
                     <LinearLayout
@@ -166,16 +183,11 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:visibility="gone"
+                            android:background="@color/colorNightDark"
                             android:id="@+id/weather_sub_line_rect" />
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scaleType="fitCenter"
-                android:layout_centerVertical="true"
-                android:id="@+id/bitmap_container"/>
         </RelativeLayout>
     </LinearLayout>
 </RelativeLayout>
\ 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 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
-            <ImageView
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:scaleType="fitCenter"
                 android:layout_centerInParent="true"
-                android:id="@+id/bitmap_container"/>
+                android:paddingTop="4dp">
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="fitCenter"
+                    android:layout_centerInParent="true"
+                    android:id="@+id/bitmap_container"/>
+            </RelativeLayout>
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
+                android:alpha="0"
                 android:layout_centerInParent="true"
                 android:orientation="vertical">
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:alpha="0"
                     android:visibility="gone"
+                    android:background="@color/colorNightDark"
                     android:orientation="horizontal"
                     android:layoutDirection="locale"
+                    android:layout_marginBottom="4dp"
                     android:id="@+id/first_line_rect">
                     <ImageView
                         android:layout_width="wrap_content"
@@ -110,6 +118,7 @@
                     android:layout_height="wrap_content"
                     android:layoutDirection="locale"
                     android:visibility="gone"
+                    android:background="@color/colorNightDark"
                     android:id="@+id/calendar_layout_rect"
                     android:orientation="horizontal">
                     <ImageView
@@ -168,6 +177,7 @@
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:background="@color/colorNightDark"
                             android:id="@+id/sub_line_rect" />
                     </LinearLayout>
                     <LinearLayout
@@ -179,6 +189,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:visibility="gone"
+                            android:background="@color/colorAccent"
                             android:id="@+id/weather_sub_line_rect" />
                     </LinearLayout>
                 </LinearLayout>

From 854cfac28ce9510f6d339fbe5256d71c0763cd0b Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Wed, 5 May 2021 10:54:09 +0200
Subject: [PATCH 5/6] Bugfixes

---
 .../anotherwidget/ui/activities/tabs/CustomLocationActivity.kt  | 1 +
 .../anotherwidget/ui/widgets/LeftAlignedWidget.kt               | 2 +-
 .../tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt   | 2 +-
 app/src/main/res/layout/custom_location_item.xml                | 2 --
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/CustomLocationActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/CustomLocationActivity.kt
index 8be37f3..9f46e34 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/CustomLocationActivity.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/CustomLocationActivity.kt
@@ -5,6 +5,7 @@ import android.app.Activity
 import android.location.Address
 import android.location.Geocoder
 import android.os.Bundle
+import android.util.Log
 import com.tommasoberlose.anotherwidget.R
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
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 a1255c1..5040072 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
@@ -401,7 +401,7 @@ class LeftAlignedWidget(val context: Context) {
             bindingView.weatherDateLine.isVisible = true
             val currentTemp = String.format(
                 Locale.getDefault(),
-                "%d °%s",
+                "%d°%s",
                 Preferences.weatherTemp.roundToInt(),
                 Preferences.weatherRealTempUnit
             )
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 3503207..f9d3b7d 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
@@ -421,7 +421,7 @@ class StandardWidget(val context: Context) {
             bindingView.weatherDateLine.isVisible = true
             val currentTemp = String.format(
                 Locale.getDefault(),
-                "%d °%s",
+                "%d°%s",
                 Preferences.weatherTemp.roundToInt(),
                 Preferences.weatherRealTempUnit
             )
diff --git a/app/src/main/res/layout/custom_location_item.xml b/app/src/main/res/layout/custom_location_item.xml
index 8be6b34..db10c90 100644
--- a/app/src/main/res/layout/custom_location_item.xml
+++ b/app/src/main/res/layout/custom_location_item.xml
@@ -26,8 +26,6 @@
         android:paddingBottom="8dp"
         android:paddingEnd="16dp"
         android:paddingStart="16dp"
-        android:focusable="true"
-        android:clickable="true"
         android:textAlignment="viewStart"
         android:background="?attr/selectableItemBackground"
         android:textColor="@color/colorPrimaryText"

From 67abd14bb10a8425dfc0a596cb2ced7e9396df2d Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Wed, 5 May 2021 12:11:51 +0200
Subject: [PATCH 6/6] Bugfixes

---
 .../anotherwidget/helpers/ImageHelper.kt      |   2 +-
 .../helpers/MediaPlayerHelper.kt              |   2 +
 .../receivers/NotificationListener.kt         |   1 +
 .../ui/fragments/MainFragment.kt              |   2 +-
 .../ui/widgets/LeftAlignedWidget.kt           |   2 +-
 .../ui/widgets/StandardWidget.kt              |   3 +-
 .../res/layout/activity_media_info_format.xml |   5 +-
 .../main/res/layout/left_aligned_widget.xml   |  11 +-
 .../res/layout/left_aligned_widget_sans.xml   |   6 +-
 .../main/res/layout/right_aligned_widget.xml  | 280 ------------------
 .../res/layout/right_aligned_widget_sans.xml  | 173 -----------
 11 files changed, 14 insertions(+), 473 deletions(-)
 delete mode 100644 app/src/main/res/layout/right_aligned_widget.xml
 delete mode 100644 app/src/main/res/layout/right_aligned_widget_sans.xml

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ImageHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ImageHelper.kt
index 257115d..d852137 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ImageHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ImageHelper.kt
@@ -20,7 +20,7 @@ object ImageHelper {
             else -> 0f * factor
         }, resources.displayMetrics)
 
-        if (originalView.drawable != null) {
+        if (originalView.drawable != null && originalView.drawable.intrinsicWidth > 0 && originalView.drawable.intrinsicHeight > 0) {
             val btm = originalView.drawable.toBitmap().copy(Bitmap.Config.ARGB_8888, true)
             val comb = Bitmap.createBitmap(btm)
             val shadowBitmap = generateShadowBitmap(context, cElevation, btm, factor)
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt
index cd51492..5d20eac 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt
@@ -33,12 +33,14 @@ object MediaPlayerHelper {
                     DEFAULT_MEDIA_INFO_FORMAT.replace(MEDIA_INFO_TITLE, title)
                         .replace(MEDIA_INFO_ARTIST, artist)
                         .replace(MEDIA_INFO_ALBUM, album)
+                        .replace("\\n", System.getProperty("line.separator") ?: " ")
                 }
             }
             else -> {
                 format.replace(MEDIA_INFO_TITLE, title)
                     .replace(MEDIA_INFO_ARTIST, artist)
                     .replace(MEDIA_INFO_ALBUM, album)
+                    .replace("\\n", System.getProperty("line.separator") ?: " ")
             }
         }
     }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NotificationListener.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NotificationListener.kt
index e86d2ba..6a6bcf1 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NotificationListener.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NotificationListener.kt
@@ -9,6 +9,7 @@ import android.service.notification.NotificationListenerService
 import android.service.notification.StatusBarNotification
 import android.util.Log
 import android.widget.Toast
+import com.google.gson.Gson
 import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
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 c890ea7..5406549 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
@@ -45,7 +45,7 @@ class MainFragment : Fragment() {
     companion object {
         fun newInstance() = MainFragment()
         private val PREVIEW_BASE_HEIGHT: Int
-            get() = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) 120 else 200
+            get() = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) 120 else 180
     }
 
     private lateinit var viewModel: MainViewModel
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 5040072..6d89ea0 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
@@ -238,7 +238,7 @@ class LeftAlignedWidget(val context: Context) {
                 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) {
+            } else if (GlanceProviderHelper.showGlanceProviders(context)) {
                 var showSomething = false
                 loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
                     when (provider) {
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 f9d3b7d..f4b2b79 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
@@ -8,6 +8,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
@@ -260,7 +261,7 @@ class StandardWidget(val context: Context) {
 
                 views.setViewVisibility(R.id.first_line_rect, View.GONE)
 
-            } else if (GlanceProviderHelper.showGlanceProviders(context) && bindingView.calendarLayout.isVisible) {
+            } else if (GlanceProviderHelper.showGlanceProviders(context)) {
                 var showSomething = false
                 loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
                     when (provider) {
diff --git a/app/src/main/res/layout/activity_media_info_format.xml b/app/src/main/res/layout/activity_media_info_format.xml
index 5138a46..25c9526 100644
--- a/app/src/main/res/layout/activity_media_info_format.xml
+++ b/app/src/main/res/layout/activity_media_info_format.xml
@@ -110,10 +110,7 @@
                     app:textAllCaps="false"
                     android:gravity="center_vertical|start"
                     android:textAlignment="viewStart"
-                    android:maxLines="1"
-                    android:lines="1"
-                    android:singleLine="true"
-                    android:ellipsize="end"
+                    android:maxLines="2"
                     android:layout_marginLeft="32dp"
                     android:layout_marginRight="32dp" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/left_aligned_widget.xml b/app/src/main/res/layout/left_aligned_widget.xml
index 276fb0d..89ee934 100644
--- a/app/src/main/res/layout/left_aligned_widget.xml
+++ b/app/src/main/res/layout/left_aligned_widget.xml
@@ -1,7 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:orientation="vertical"
@@ -17,8 +16,7 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerVertical="true">
+        android:orientation="vertical">
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -141,7 +139,6 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
                 android:id="@+id/sub_line"
                 android:visibility="gone"
                 android:orientation="horizontal">
@@ -150,6 +147,7 @@
                     android:layout_height="wrap_content"
                     android:cropToPadding="false"
                     android:clipChildren="false"
+                    android:layout_marginTop="2dp"
                     android:layout_marginEnd="4dp">
                     <ImageView
                         android:layout_width="16dp"
@@ -169,9 +167,8 @@
                 <TextView
                     android:id="@+id/sub_line_text"
                     android:layout_width="wrap_content"
-                    android:ellipsize="end"
-                    android:lines="1"
-                    android:maxLines="1"
+                    android:gravity="start"
+                    android:maxLines="2"
                     android:includeFontPadding="false"
                     android:layout_height="wrap_content"
                     style="@style/AnotherWidget.Widget.Subtitle" />
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 e2f2311..131c28e 100644
--- a/app/src/main/res/layout/left_aligned_widget_sans.xml
+++ b/app/src/main/res/layout/left_aligned_widget_sans.xml
@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:gravity="center_vertical"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:id="@+id/main_layout"
@@ -75,9 +74,7 @@
             android:layout_height="wrap_content">
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingTop="4dp">
+                android:layout_height="wrap_content">
                 <ImageView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -88,7 +85,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:alpha="0"
-                android:layout_centerVertical="true"
                 android:orientation="vertical">
                 <LinearLayout
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/right_aligned_widget.xml b/app/src/main/res/layout/right_aligned_widget.xml
deleted file mode 100644
index 5519290..0000000
--- a/app/src/main/res/layout/right_aligned_widget.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:id="@+id/main_layout">
-    <ProgressBar
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"
-        android:indeterminateTint="@color/colorPrimary"
-        android:id="@+id/loader" />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|end"
-        android:layout_centerVertical="true"
-        android:orientation="vertical"
-        android:id="@+id/date_layout">
-        <TextView
-            android:id="@+id/empty_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lines="1"
-            android:textColor="@color/colorPrimary"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:includeFontPadding="false"
-            style="@style/AnotherWidget.Widget.Title"/>
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|end"
-            android:visibility="gone"
-            android:scaleX=".8"
-            android:scaleY=".8"
-            android:transformPivotX="0dp"
-            android:layout_marginStart="4dp"
-            android:id="@+id/weather">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:id="@+id/divider1"
-                    android:text="@string/divider"
-                    android:includeFontPadding="false"
-                    style="@style/AnotherWidget.Widget.Subtitle"/>
-            </LinearLayout>
-            <ImageView
-                android:layout_width="28dp"
-                android:layout_height="28dp"
-                android:paddingEnd="4dp"
-                android:paddingStart="4dp"
-                android:layout_marginEnd="4dp"
-                android:id="@+id/empty_weather_icon"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/AnotherWidget.Widget.Date.Big"
-                android:maxLines="1"
-                android:includeFontPadding="false"
-                android:id="@+id/temp"/>
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:id="@+id/calendar_layout"
-        android:visibility="gone"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:gravity="center_vertical|end">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical">
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:id="@+id/action_previous_shadow"
-                        android:src="@drawable/round_chevron_right_24" />
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:id="@+id/action_previous"
-                        android:src="@drawable/round_chevron_right_24" />
-                </RelativeLayout>
-                <TextView
-                    android:id="@+id/next_event"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:maxLines="1"
-                    android:lines="1"
-                    android:gravity="end"
-                    android:ellipsize="end"
-                    android:includeFontPadding="false"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Widget.Title" />
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical">
-                    <TextView
-                        android:id="@+id/next_event_difference_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="marquee"
-                        android:includeFontPadding="false"
-                        style="@style/AnotherWidget.Widget.Title" />
-                </LinearLayout>
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical">
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:id="@+id/action_next_shadow"
-                        android:src="@drawable/round_chevron_right_24" />
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:id="@+id/action_next"
-                        android:src="@drawable/round_chevron_right_24" />
-                </RelativeLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:scaleX=".8"
-                android:scaleY=".8"
-                android:transformPivotX="0dp"
-                android:layout_marginStart="4dp"
-                android:gravity="center_vertical"
-                android:id="@+id/special_weather">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:id="@+id/divider3"
-                        android:text="@string/divider"
-                        android:includeFontPadding="false"
-                        style="@style/AnotherWidget.Widget.Subtitle"/>
-                </LinearLayout>
-                <ImageView
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:paddingEnd="4dp"
-                    android:paddingStart="4dp"
-                    android:layout_marginEnd="4dp"
-                    android:id="@+id/special_weather_icon"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Widget.Date.Big"
-                    android:maxLines="1"
-                    android:includeFontPadding="false"
-                    android:id="@+id/special_temp"/>
-            </LinearLayout>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="4dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_small" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="8dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_medium" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="12dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_large" />
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|end"
-            android:id="@+id/second_row"
-            android:layout_marginStart="4dp"
-            android:orientation="horizontal">
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:cropToPadding="false"
-                android:clipChildren="false"
-                android:layout_marginEnd="4dp">
-                <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:cropToPadding="false"
-                    android:clipChildren="false"
-                    android:id="@+id/second_row_icon_shadow"
-                    android:src="@drawable/round_today_24"/>
-                <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:cropToPadding="false"
-                    android:clipChildren="false"
-                    android:id="@+id/second_row_icon"
-                    android:src="@drawable/round_today_24"/>
-            </RelativeLayout>
-            <TextView
-                android:id="@+id/next_event_date"
-                android:layout_width="wrap_content"
-                android:ellipsize="end"
-                android:lines="1"
-                android:maxLines="1"
-                android:includeFontPadding="false"
-                android:layout_height="wrap_content"
-                style="@style/AnotherWidget.Widget.Subtitle" />
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:visibility="gone"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:layout_marginStart="8dp"
-                android:id="@+id/calendar_weather">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:id="@+id/divider2"
-                    android:text="@string/divider"
-                    android:includeFontPadding="false"
-                    style="@style/AnotherWidget.Widget.Subtitle"/>
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:id="@+id/weather_icon"
-                    android:clipChildren="false"
-                    android:clipToPadding="false"
-                    android:adjustViewBounds="true"
-                    android:layout_marginEnd="2dp"
-                    android:layout_marginStart="2dp"
-                    android:src="@drawable/clear_night"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Widget.Date"
-                    android:layout_marginStart="8dp"
-                    android:ellipsize="marquee"
-                    android:layout_marginEnd="4dp"
-                    android:includeFontPadding="false"
-                    android:id="@+id/calendar_temp"/>
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/right_aligned_widget_sans.xml b/app/src/main/res/layout/right_aligned_widget_sans.xml
deleted file mode 100644
index 85ce6f5..0000000
--- a/app/src/main/res/layout/right_aligned_widget_sans.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="8dp"
-        android:scaleType="fitXY"
-        android:id="@+id/widget_shape_background"
-        android:src="@drawable/card_background" />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center_vertical|end"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:id="@+id/main_layout"
-        android:animateLayoutChanges="true">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/time_container"
-            android:orientation="horizontal">
-            <TextClock
-                android:id="@+id/time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:format12Hour="h:mm"
-                android:padding="0dp"
-                android:lines="1"
-                android:maxLines="1"
-                style="@style/AnotherWidget.Widget.Title"/>
-            <TextClock
-                android:id="@+id/time_am_pm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:format12Hour="a"
-                android:format24Hour=""
-                android:padding="0dp"
-                android:lines="1"
-                android:maxLines="1"
-                style="@style/AnotherWidget.Widget.Title"/>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_marginTop="-16dp"
-            android:orientation="horizontal"
-            android:id="@+id/clock_bottom_margin_none" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_marginTop="-8dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/clock_bottom_margin_small" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/clock_bottom_margin_medium" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="10dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/clock_bottom_margin_large" />
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical|end"
-                android:alpha="0"
-                android:orientation="vertical"
-                android:id="@+id/empty_layout_rect">
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/empty_date_rect"/>
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/weather_rect" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:id="@+id/calendar_layout_rect"
-                android:alpha="0"
-                android:gravity="center_vertical|end">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:id="@+id/action_previous_rect" />
-                        <ImageView
-                            android:layout_height="wrap_content"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:id="@+id/next_event_rect" />
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/next_event_difference_time_rect" />
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:id="@+id/action_next_rect" />
-                    </LinearLayout>
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/calendar_weather_rect" />
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/special_weather_rect" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="4dp"
-                    android:visibility="gone"
-                    android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_small_sans" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="8dp"
-                    android:visibility="gone"
-                    android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_medium_sans" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="12dp"
-                    android:visibility="gone"
-                    android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_large_sans" />
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/second_row_rect" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scaleType="fitCenter"
-                android:id="@+id/bitmap_container"/>
-
-        </RelativeLayout>
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file