Add am/pm indicator, add tab badges, add widget background, add text color alpha

app/src/main/res/drawable/card_background.xml

@@ -3,10 +3,9 @@
     <item>
         <shape android:shape="rectangle">
             <corners
-                android:radius="3dp" />
-            <stroke
-                android:color="@android:color/white"
-                android:width="2dp"/>
+                android:radius="9dp" />
+            <solid
+                android:color="@android:color/white"/>
         </shape>
     </item>
 </selector>

app/src/main/res/drawable/round_crop_3_2_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="M19,4L5,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM18,18L6,18c-0.55,0 -1,-0.45 -1,-1L5,7c0,-0.55 0.45,-1 1,-1h12c0.55,0 1,0.45 1,1v10c0,0.55 -0.45,1 -1,1z"/>
+</vector>

app/src/main/res/drawable/round_gradient_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="M11,9h2v2h-2L11,9zM9,11h2v2L9,13v-2zM13,11h2v2h-2v-2zM15,9h2v2h-2L15,9zM7,9h2v2L7,11L7,9zM19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,18L7,18v-2h2v2zM13,18h-2v-2h2v2zM17,18h-2v-2h2v2zM19,11h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v2L9,15v-2L7,13v2L5,15v-2h2v-2L5,11L5,6c0,-0.55 0.45,-1 1,-1h12c0.55,0 1,0.45 1,1v5z"/>
+</vector>

app/src/main/res/layout/bottom_sheet_menu_hor.xml

@@ -35,24 +35,77 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <GridLayout
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/menu"
-                android:visibility="gone"
-                android:layout_margin="16dp"
-                android:columnCount="6"/>
-            <ProgressBar
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:indeterminateTint="@color/colorPrimaryText"
-                android:indeterminate="true"
-                android:layout_margin="32dp"
-                android:layout_centerInParent="true"
-                android:id="@+id/color_loader" />
-        </RelativeLayout>
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:paddingRight="16dp"
+                android:paddingLeft="16dp"
+                android:id="@+id/alpha_selector_container"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+                    app:textAllCaps="false"
+                    android:letterSpacing="0"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:textSize="15sp"
+                    android:gravity="start"
+                    android:textAlignment="viewStart"
+                    android:id="@+id/text_alpha"
+                    android:text="Alpha : 20%"
+                    android:textColor="@color/colorSecondaryText"/>
+                <com.warkiz.widget.IndicatorSeekBar
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:isb_max="100"
+                    app:isb_min="0"
+                    app:isb_seek_smoothly="true"
+                    app:isb_show_thumb_text="false"
+                    app:isb_thumb_adjust_auto="true"
+                    app:isb_track_rounded_corners="true"
+                    app:isb_thumb_text_color="@color/colorAccent"
+                    app:isb_progress_value_float="false"
+                    app:isb_show_tick_texts="false"
+                    app:isb_show_indicator="none"
+                    app:isb_thumb_color="@color/colorAccent"
+                    app:isb_thumb_size="12dp"
+                    android:id="@+id/alpha_selector"
+                    app:isb_track_background_color="@color/disabledButtonBackground"
+                    app:isb_track_background_size="4dp"
+                    app:isb_track_progress_color="@color/disabledButtonBackground"
+                    app:isb_track_progress_size="4dp"
+                    app:isb_only_thumb_draggable="false"/>
+            </LinearLayout>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <GridLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/menu"
+                    android:visibility="gone"
+                    android:layout_margin="16dp"
+                    android:columnCount="6"/>
+                <ProgressBar
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:indeterminateTint="@color/colorPrimaryText"
+                    android:indeterminate="true"
+                    android:layout_margin="32dp"
+                    android:layout_centerInParent="true"
+                    android:id="@+id/color_loader" />
+            </RelativeLayout>
+        </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>

app/src/main/res/layout/fragment_calendar_settings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
         <variable
             name="viewModel"
@@ -59,15 +59,22 @@
                         android:id="@+id/show_events_label"
                         android:text="@string/description_permission_calendar"
                         style="@style/AnotherWidget.Settings.Subtitle"/>
+                    <com.google.android.material.button.MaterialButton
+                        android:layout_width="wrap_content"
+                        android:layout_height="36dp"
+                        style="@style/Widget.MaterialComponents.Button.TextButton"
+                        android:letterSpacing="0"
+                        android:textAllCaps="false"
+                        android:clickable="true"
+                        android:layout_marginStart="-8dp"
+                        android:layout_marginBottom="-8dp"
+                        android:paddingBottom="0dp"
+                        android:paddingTop="0dp"
+                        android:focusable="true"
+                        android:id="@+id/read_calendar_permission_alert"
+                        android:textColor="@color/errorColorText"
+                        android:text="@string/action_grant_permission"/>
                 </LinearLayout>
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:padding="12dp"
-                    android:visibility="gone"
-                    android:id="@+id/read_calendar_permission_alert_icon"
-                    android:src="@drawable/round_error"
-                    android:tint="@color/errorColorText"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_general_settings.xml

@@ -129,6 +129,43 @@
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                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_background_color"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_crop_3_2"
+                    android: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_background_color_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/background_color_label"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

app/src/main/res/layout/fragment_weather_settings.xml

@@ -186,15 +186,22 @@
                             android:layout_height="wrap_content"
                             android:id="@+id/label_custom_location"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
+                        <com.google.android.material.button.MaterialButton
+                            android:layout_width="wrap_content"
+                            android:layout_height="36dp"
+                            style="@style/Widget.MaterialComponents.Button.TextButton"
+                            android:letterSpacing="0"
+                            android:textAllCaps="false"
+                            android:clickable="true"
+                            android:layout_marginStart="-8dp"
+                            android:layout_marginBottom="-8dp"
+                            android:paddingBottom="0dp"
+                            android:paddingTop="0dp"
+                            android:focusable="true"
+                            android:id="@+id/location_permission_alert"
+                            android:textColor="@color/errorColorText"
+                            android:text="@string/action_grant_permission"/>
                     </LinearLayout>
-                    <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:padding="12dp"
-                        android:visibility="gone"
-                        android:id="@+id/location_permission_alert_icon"
-                        android:src="@drawable/round_error"
-                        android:tint="@color/errorColorText"/>
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"

app/src/main/res/layout/the_widget.xml

@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/AnotherWidget.Date.Big"
-                android:ellipsize="marquee"
+                android:maxLines="1"
                 android:includeFontPadding="false"
                 android:id="@+id/temp"/>
         </LinearLayout>

app/src/main/res/layout/the_widget_sans.xml

@@ -1,139 +1,171 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:id="@+id/main_layout">
-    <TextClock
-        android:id="@+id/time"
+    android:layout_height="match_parent">
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        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"
-        android:lineSpacingMultiplier="1"
-        android:lineSpacingExtra="0dp"
-        android:includeFontPadding="false"
-        android:format12Hour="hh:mm"
-        android:padding="0dp"
-        android:visibility="gone"
-        android:lines="1"
-        android:maxLines="1"
-        style="@style/AnotherWidget.Title"/>
-    <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">
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:id="@+id/main_layout">
         <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:id="@+id/time_container"
+            android:gravity="center_horizontal"
             android:layoutDirection="locale"
-            android:id="@+id/empty_layout_rect">
-            <ImageView
+            android:orientation="horizontal">
+            <TextClock
+                android:id="@+id/time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/empty_date_rect"/>
-            <ImageView
+                android:gravity="center"
+                android:lineSpacingMultiplier="1"
+                android:lineSpacingExtra="0dp"
+                android:includeFontPadding="false"
+                android:format12Hour="h:mm"
+                android:padding="0dp"
+                android:lines="1"
+                android:maxLines="1"
+                style="@style/AnotherWidget.Title"/>
+            <TextClock
+                android:id="@+id/time_am_pm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/weather_rect" />
+                android:gravity="center"
+                android:lineSpacingMultiplier="1"
+                android:lineSpacingExtra="0dp"
+                android:includeFontPadding="false"
+                android:format12Hour="a"
+                android:format24Hour=""
+                android:padding="0dp"
+                android:lines="1"
+                android:maxLines="1"
+                style="@style/AnotherWidget.Title"/>
         </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">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layoutDirection="locale"
-                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>
+            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"
+                android:alpha="0"
+                android:layout_centerHorizontal="true"
                 android:orientation="horizontal"
                 android:layoutDirection="locale"
+                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:layout_centerHorizontal="true"
+                android:id="@+id/calendar_layout_rect"
+                android:alpha="0"
                 android:gravity="center">
                 <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
+                    android:layoutDirection="locale"
                     android:orientation="horizontal">
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:id="@+id/second_row_rect" />
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center">
+                        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/calendar_weather_rect" />
+                        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>
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layoutDirection="locale"
+                    android:gravity="center">
+                    <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/second_row_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:id="@+id/calendar_weather_rect" />
+                    </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
-        </LinearLayout>
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="fitCenter"
-            android:id="@+id/bitmap_container"/>
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scaleType="fitCenter"
+                android:id="@+id/bitmap_container"/>
 
-    </RelativeLayout>
-</LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+</RelativeLayout>

app/src/main/res/values-de/strings.xml

@@ -202,4 +202,7 @@
 	<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="alpha">Alpha</string>
+	<string name="settings_background_color_title">Background color</string>
+	<string name="transparent">Transparent</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -182,4 +182,7 @@
     <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="alpha">Alpha</string>
+    <string name="settings_background_color_title">Background color</string>
+    <string name="transparent">Transparent</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -181,4 +181,7 @@
     <string name="xiaomi_warning_message">Concedi il permesso per mostrare finstre pop-up quando l\'applicazione è in background. Puoi trovare l\'impostazione nella sezione Altri permessi nei dettagli dell\'app. Nel caso non fosse attivata non sarà possibile aprire applicazioni cliccando sul widget.</string>
     <string name="action_ignore">Ignora</string>
     <string name="action_grant_permission">Concedi permesso</string>
+    <string name="alpha">Trasparenza</string>
+    <string name="settings_background_color_title">Colore background</string>
+    <string name="transparent">Trasparente</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -51,7 +51,7 @@
     <string name="custom_location_gps">Use geolocation</string>
     <string name="action_refresh_widget">Refresh widget</string>
     <string name="show_events_visible">Events are visible</string>
-    <string name="show_events_not_visible">Events are not visible</string>
+    <string name="show_events_not_visible">Events are hidden</string>
     <string name="show_weather_visible">Weather info is visible</string>
     <string name="show_weather_not_visible">Weather info is hidden</string>
     <string name="settings_show_until_subtitle_0">3 hours later</string>
@@ -105,6 +105,7 @@
     <string name="settings_second_row_info_subtitle_0">Event time</string>
     <string name="settings_second_row_info_subtitle_2">Show next alarm time</string>
     <string name="settings_font_color_title">Text color</string>
+    <string name="settings_background_color_title">Background color</string>
     <string name="title_main_text_size">First row text size</string>
     <string name="title_second_text_size">Second row text size</string>
     <string name="provider_open_weather" translatable="false">OpenWeather</string>
@@ -193,4 +194,6 @@
     <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="alpha">Alpha</string>
+    <string name="transparent">Transparent</string>
 </resources>