Merge branch 'master' of github.com:tommasoberlose/another-widget

2020-10-03 17:36:41 +02:00
parent e3fda9457e a208aa97b2
commit c04040e242
66 changed files with 92 additions and 76 deletions
--- a/app/src/main/res/font/google_sans.xml
+++ b/app/src/main/res/font/google_sans.xml
@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="400"
+        app:font="@font/google_sans_regular" />
+    <font
+        app:fontStyle="italic"
+        app:fontWeight="400"
+        app:font="@font/google_sans_italic" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="200"
+        app:font="@font/google_sans_light" />
+    <font
+        app:fontStyle="italic"
+        app:fontWeight="200"
+        app:font="@font/google_sans_light_italic" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="300"
+        app:font="@font/google_sans_thin" />
+    <font
+        app:fontStyle="italic"
+        app:fontWeight="300"
+        app:font="@font/google_sans_thin_italic" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="700"
+        app:font="@font/google_sans_medium" />
+    <font
+        app:fontStyle="italic"
+        app:fontWeight="700"
+        app:font="@font/google_sans_medium_italic" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="800"
+        app:font="@font/google_sans_bold" />
+    <font
+        app:fontStyle="italic"
+        app:fontWeight="800"
+        app:font="@font/google_sans_bold_italic" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="900"
+        app:font="@font/google_sans_black" />
+    <font
+        app:fontStyle="italic"
+        app:fontWeight="900"
+        app:font="@font/google_sans_black_italic" />
+</font-family>
--- a/app/src/main/res/font/google_sans_black.ttf
+++ b/app/src/main/res/font/google_sans_black.ttf
--- a/app/src/main/res/font/google_sans_black_italic.ttf
+++ b/app/src/main/res/font/google_sans_black_italic.ttf
--- a/app/src/main/res/font/google_sans_bold.ttf
+++ b/app/src/main/res/font/google_sans_bold.ttf
--- a/app/src/main/res/font/google_sans_bold_italic.ttf
+++ b/app/src/main/res/font/google_sans_bold_italic.ttf
--- a/app/src/main/res/font/google_sans_italic.ttf
+++ b/app/src/main/res/font/google_sans_italic.ttf
--- a/app/src/main/res/font/google_sans_light.ttf
+++ b/app/src/main/res/font/google_sans_light.ttf
--- a/app/src/main/res/font/google_sans_light_italic.ttf
+++ b/app/src/main/res/font/google_sans_light_italic.ttf
--- a/app/src/main/res/font/google_sans_medium.ttf
+++ b/app/src/main/res/font/google_sans_medium.ttf
--- a/app/src/main/res/font/google_sans_medium_italic.ttf
+++ b/app/src/main/res/font/google_sans_medium_italic.ttf
--- a/app/src/main/res/font/google_sans_regular.ttf
+++ b/app/src/main/res/font/google_sans_regular.ttf
--- a/app/src/main/res/font/google_sans_thin.ttf
+++ b/app/src/main/res/font/google_sans_thin.ttf
--- a/app/src/main/res/font/google_sans_thin_italic.ttf
+++ b/app/src/main/res/font/google_sans_thin_italic.ttf
--- a/app/src/main/res/font/product_sans.xml
+++ b/app/src/main/res/font/product_sans.xml
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="400"
-        app:font="@font/product_sans_regular" />
-    <font
-        app:fontStyle="italic"
-        app:fontWeight="400"
-        app:font="@font/product_sans_italic" />
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="200"
-        app:font="@font/product_sans_light" />
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="300"
-        app:font="@font/product_sans_thin" />
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="700"
-        app:font="@font/product_sans_medium" />
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="800"
-        app:font="@font/product_sans_bold" />
-    <font
-        app:fontStyle="italic"
-        app:fontWeight="800"
-        app:font="@font/product_sans_bold_italic" />
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="900"
-        app:font="@font/product_sans_black" />
-</font-family>
--- a/app/src/main/res/font/product_sans_black.ttf
+++ b/app/src/main/res/font/product_sans_black.ttf
--- a/app/src/main/res/font/product_sans_bold.ttf
+++ b/app/src/main/res/font/product_sans_bold.ttf
--- a/app/src/main/res/font/product_sans_bold_italic.ttf
+++ b/app/src/main/res/font/product_sans_bold_italic.ttf
--- a/app/src/main/res/font/product_sans_italic.ttf
+++ b/app/src/main/res/font/product_sans_italic.ttf
--- a/app/src/main/res/font/product_sans_light.ttf
+++ b/app/src/main/res/font/product_sans_light.ttf
--- a/app/src/main/res/font/product_sans_medium.ttf
+++ b/app/src/main/res/font/product_sans_medium.ttf
--- a/app/src/main/res/font/product_sans_regular.ttf
+++ b/app/src/main/res/font/product_sans_regular.ttf
--- a/app/src/main/res/font/product_sans_thin.ttf
+++ b/app/src/main/res/font/product_sans_thin.ttf
--- a/app/src/main/res/layout/activity_choose_application.xml
+++ b/app/src/main/res/layout/activity_choose_application.xml
@ -84,7 +84,7 @@
                    android:textColorHint="@color/colorSecondaryText"
                    android:textAlignment="viewStart"
                    android:id="@+id/search"
-                    android:fontFamily="@font/product_sans"
+                    android:fontFamily="@font/google_sans"
                    android:gravity="center_vertical|start"
                    android:hint="@string/search"
                    android:text="@={viewModel.searchInput}"
--- a/app/src/main/res/layout/activity_custom_date.xml
+++ b/app/src/main/res/layout/activity_custom_date.xml
@ -87,7 +87,7 @@
                        android:maxLines="1"
                        android:singleLine="true"
                        android:hint="@string/settings_date_format_title"
-                        android:fontFamily="@font/product_sans"
+                        android:fontFamily="@font/google_sans"
                        android:text="@={viewModel.dateInput}"
                        android:autofillHints=""
                        tools:ignore="TextFields" />
--- a/app/src/main/res/layout/activity_custom_location.xml
+++ b/app/src/main/res/layout/activity_custom_location.xml
@ -70,7 +70,7 @@
                    android:paddingRight="16dp"
                    android:inputType="textCapWords"
                    android:id="@+id/location"
-                    android:fontFamily="@font/product_sans"
+                    android:fontFamily="@font/google_sans"
                    android:gravity="center_vertical|start"
                    android:hint="@string/search"
                    android:textAlignment="viewStart"
--- a/app/src/main/res/layout/activity_weather_provider.xml
+++ b/app/src/main/res/layout/activity_weather_provider.xml
@ -80,7 +80,7 @@
                    app:boxStrokeWidth="0dp"
                    app:hintTextColor="@color/colorAccent"
                    android:hint="@string/api_key_hint"
-                    android:fontFamily="@font/product_sans"
+                    android:fontFamily="@font/google_sans"
                    android:textAlignment="viewStart"
                    android:textDirection="locale"
                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox">
@ -89,7 +89,7 @@
                        android:layout_height="wrap_content"
                        android:textAlignment="viewStart"
                        android:textDirection="locale"
-                        android:fontFamily="@font/product_sans"
+                        android:fontFamily="@font/google_sans"
                        android:gravity="center_vertical|start" />
                </com.google.android.material.textfield.TextInputLayout>
            </LinearLayout>
--- a/app/src/main/res/layout/bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_dialog.xml
@ -59,7 +59,7 @@
            android:id="@+id/action_negative"
            android:letterSpacing="0"
            android:text="Dismiss"
-            android:fontFamily="@font/product_sans"
+            android:fontFamily="@font/google_sans"
            android:textStyle="bold"
            app:textAllCaps="false" />
        <com.google.android.material.button.MaterialButton
@ -74,7 +74,7 @@
            android:id="@+id/action_positive"
            android:letterSpacing="0"
            android:text="Accept"
-            android:fontFamily="@font/product_sans"
+            android:fontFamily="@font/google_sans"
            android:textStyle="bold"
            app:textAllCaps="false" />
    </LinearLayout>
--- a/app/src/main/res/layout/custom_notes_dialog_layout.xml
+++ b/app/src/main/res/layout/custom_notes_dialog_layout.xml
@ -39,7 +39,7 @@
        android:id="@+id/notes"
        android:gravity="center"
        android:textDirection="locale"
-        android:fontFamily="@font/product_sans"
+        android:fontFamily="@font/google_sans"
        android:inputType="textCapSentences|textMultiLine"
        android:maxLines="2"
        android:lines="2"
--- a/app/src/main/res/layout/fragment_clock_settings.xml
+++ b/app/src/main/res/layout/fragment_clock_settings.xml
@ -393,7 +393,7 @@
                        android:text="@string/clock_warning"
                        android:textColor="@color/colorSecondaryText"
                        android:letterSpacing="0"
-                        android:fontFamily="@font/product_sans"
+                        android:fontFamily="@font/google_sans"
                        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                        app:textAllCaps="false" />
                </LinearLayout>
--- a/app/src/main/res/layout/fragment_glance_settings.xml
+++ b/app/src/main/res/layout/fragment_glance_settings.xml
@ -381,7 +381,7 @@
                        android:text="@string/glance_info"
                        android:textColor="@color/colorSecondaryText"
                        android:letterSpacing="0"
-                        android:fontFamily="@font/product_sans"
+                        android:fontFamily="@font/google_sans"
                        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                        app:textAllCaps="false" />
                </LinearLayout>
--- a/app/src/main/res/layout/fragment_weather_settings.xml
+++ b/app/src/main/res/layout/fragment_weather_settings.xml
@ -240,7 +240,7 @@
                        android:text="@string/background_location_warning"
                        android:textColor="@color/colorSecondaryText"
                        android:letterSpacing="0"
-                        android:fontFamily="@font/product_sans"
+                        android:fontFamily="@font/google_sans"
                        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                        app:textAllCaps="false" />
                </LinearLayout>
--- a/app/src/main/res/layout/inapp_product_layout.xml
+++ b/app/src/main/res/layout/inapp_product_layout.xml
@ -42,7 +42,7 @@
            android:paddingRight="12dp"
            android:gravity="center"
            android:text="12.00$"
-            android:fontFamily="@font/product_sans"
+            android:fontFamily="@font/google_sans"
            android:textColor="@color/colorAccent"
            android:id="@+id/product_price"
            android:textSize="14sp"/>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -15,7 +15,7 @@
    <string name="settings_text_shadow_subtitle_high">Høj</string>
    <string name="settings_custom_font_title">Widget skrifttype</string>
    <string name="custom_font_subtitle_0">Enhedsskrifttype</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Tilpasset datoformat</string>
    <string name="alpha">Alpha</string>
    <string name="transparent">Gennemsigtig</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -15,7 +15,7 @@
    <string name="settings_text_shadow_subtitle_high">Hoch</string>
    <string name="settings_custom_font_title">Widget Schriftart</string>
    <string name="custom_font_subtitle_0">System Schriftart</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Eigenes Format</string>
    <string name="alpha">Alpha</string>
    <string name="transparent">Transparent</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -15,7 +15,7 @@
    <string name="settings_text_shadow_subtitle_high">Mucha</string>
    <string name="settings_custom_font_title">Fuente del widget</string>
    <string name="custom_font_subtitle_0">Fuente del dispositivo</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Formato de fecha personalizado</string>
    <string name="alpha">Alfa</string>
    <string name="transparent">Transparente</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -15,7 +15,7 @@
    <string name="settings_text_shadow_subtitle_high">Élevée</string>
    <string name="settings_custom_font_title">Police du widget</string>
    <string name="custom_font_subtitle_0">Police de l\'appareil</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Format personnalisé</string>
    <string name="alpha">Opacité </string>
    <string name="transparent">Transparent</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -16,7 +16,7 @@
    <string name="settings_text_shadow_subtitle_high">Tinggi</string>
    <string name="settings_custom_font_title">Fon widget</string>
    <string name="custom_font_subtitle_0">Fon Perangkat</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Format tanggal khusus</string>
    <string name="alpha">Alpha</string>
    <string name="transparent">Transparan</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -15,7 +15,7 @@
    <string name="settings_text_shadow_subtitle_high">Alta</string>
    <string name="settings_custom_font_title">Font</string>
    <string name="custom_font_subtitle_0">Font dispositivo</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Formato data</string>
    <string name="alpha">Alpha</string>
    <string name="transparent">Trasparente</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -15,7 +15,7 @@
    <string name="settings_text_shadow_subtitle_high">Сильная</string>
    <string name="settings_custom_font_title">Шрифт виджета</string>
    <string name="custom_font_subtitle_0">Шрифт устройства</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Настраиваемый формат даты</string>
    <string name="alpha">Непрозрачность</string>
    <string name="transparent">Прозрачный</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -17,7 +17,7 @@
    <string name="settings_text_shadow_subtitle_high">Silné</string>
    <string name="settings_custom_font_title">Písmo widgetu</string>
    <string name="custom_font_subtitle_0">Písmo zariadenia</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Vlastný formát dátumu</string>
    <string name="alpha">Alfa</string>
    <string name="transparent">Priehľadný</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -15,7 +15,7 @@
    <string name="settings_text_shadow_subtitle_high">高</string>
    <string name="settings_custom_font_title">微件字体</string>
    <string name="custom_font_subtitle_0">设备字体</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">自定义日期格式</string>
    <string name="alpha">不透明度</string>
    <string name="transparent">透明</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -17,7 +17,7 @@
    <string name="settings_text_shadow_subtitle_high">High</string>
    <string name="settings_custom_font_title">Widget font</string>
    <string name="custom_font_subtitle_0">Device font</string>
-    <string name="custom_font_subtitle_1">Product Sans</string>
+    <string name="custom_font_subtitle_1">Google Sans</string>
    <string name="custom_date_format">Custom date format</string>
    <string name="alpha">Alpha</string>
    <string name="transparent">Transparent</string>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -23,14 +23,14 @@
        <item name="textAllCaps">false</item>
        <item name="android:gravity">center</item>
        <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Main.Subtitle" parent="TextAppearance.AppCompat.Small">
        <item name="android:textColor">@color/colorSecondaryText</item>
        <item name="android:textSize">16sp</item>
        <item name="android:gravity">center</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Main.Description" parent="TextAppearance.AppCompat.Small">
@ -38,7 +38,7 @@
        <item name="android:textSize">18sp</item>
        <item name="android:gravity">center</item>
        <item name="android:alpha">0.6</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Main.Button" parent="TextAppearance.AppCompat.Button">
@ -49,7 +49,7 @@
        <item name="android:clickable">true</item>
        <item name="android:focusable">true</item>
        <item name="android:foreground">?android:attr/selectableItemBackground</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Main.Button.Dark" parent="TextAppearance.AppCompat.Button">
@ -61,7 +61,7 @@
        <item name="android:focusable">true</item>
        <item name="android:textSize">12sp</item>
        <item name="android:foreground">?android:attr/selectableItemBackground</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Main.Button.TabBar" parent="TextAppearance.AppCompat.Button">
@ -69,27 +69,27 @@
        <item name="android:gravity">center</item>
        <item name="android:padding">8dp</item>
        <item name="android:textSize">12sp</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Settings.Header" parent="TextAppearance.AppCompat.Medium">
        <item name="android:textColor">@color/colorPrimaryText</item>
        <item name="android:textSize">15sp</item>
        <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Settings.Title" parent="TextAppearance.AppCompat.Medium">
        <item name="android:textColor">@color/colorPrimaryText</item>
        <item name="android:textSize">17sp</item>
        <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Settings.Subtitle" parent="TextAppearance.AppCompat.Medium">
        <item name="android:textSize">15sp</item>
        <item name="android:textColor">@color/colorSecondaryText</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Title" parent="TextAppearance.AppCompat.Medium">
@ -98,14 +98,14 @@
        <item name="android:textSize">24sp</item>
        <item name="android:shadowRadius">5</item>
        <item name="android:gravity">center</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Subtitle" parent="TextAppearance.AppCompat.Small">
        <item name="android:textColor">@color/colorAccent</item>
        <item name="android:textSize">16sp</item>
        <item name="android:gravity">center_horizontal</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="AnotherWidget.Date" parent="AnotherWidget.Subtitle">
@ -113,7 +113,7 @@

    <style name="AnotherWidget.Date.Big" parent="AnotherWidget.Title">
        <item name="android:textSize">22sp</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>
    <style name="AnotherWidget.Widget.Title" parent="TextAppearance.AppCompat.Medium">
        <item name="android:textColor">@color/colorPrimaryText</item>
@ -146,7 +146,7 @@
        <item name="android:windowIsFloating">false</item>
        <item name="android:statusBarColor">@android:color/transparent</item>
        <item name="android:windowSoftInputMode">adjustResize</item>
-        <item name="android:fontFamily">@font/product_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
    </style>

    <style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog" />