dm1sh/another-widget
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix #212

Browse Source
This commit is contained in:
Tommaso Berlose 2020-10-14 11:47:11 +02:00
parent 3b963dae1c
commit 5259a81cfb
5 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/res/layout/fragment_clock_settings.xml
View File

@ -380,22 +380,23 @@
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="40dp" android:layout_width="48dp"
android:layout_height="40dp" android:layout_height="48dp"
android:padding="10dp" android:padding="12dp"
android:src="@drawable/outline_info_24" android:src="@drawable/outline_info_24"
app:tint="@color/colorSecondaryText"/> app:tint="@color/colorSecondaryText"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:duplicateParentState="true" android:duplicateParentState="true"
android:textSize="14sp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="@string/clock_warning" android:text="@string/clock_warning"
android:textColor="@color/colorSecondaryText" android:textColor="@color/colorSecondaryText"
android:letterSpacing="0" android:letterSpacing="0"
android:fontFamily="@font/google_sans" android:fontFamily="@font/google_sans"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/AnotherWidget.Settings.Subtitle"
app:textAllCaps="false" /> app:textAllCaps="false" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

1
app/src/main/res/layout/fragment_glance_settings.xml
View File

@ -105,7 +105,6 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/small_clock_warning"
android:padding="8dp" android:padding="8dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"

48
app/src/main/res/layout/fragment_weather_settings.xml
View File

@ -249,26 +249,6 @@
android:textStyle="bold" android:textStyle="bold"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button" android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
app:textAllCaps="false" /> app:textAllCaps="false" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/background_location_warning"
android:paddingStart="64dp"
android:paddingEnd="8dp"
android:paddingBottom="8dp"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:duplicateParentState="true"
android:textSize="14sp"
android:text="@string/background_location_warning"
android:textColor="@color/colorSecondaryText"
android:letterSpacing="0"
android:fontFamily="@font/google_sans"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:textAllCaps="false" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -441,6 +421,34 @@
style="@style/AnotherWidget.Settings.Subtitle"/> style="@style/AnotherWidget.Settings.Subtitle"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:id="@+id/background_location_warning"
android:layout_marginTop="16dp"
android:layout_marginBottom="24dp"
android:orientation="horizontal">
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:src="@drawable/outline_info_24"
app:tint="@color/colorSecondaryText"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:duplicateParentState="true"
android:layout_marginTop="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="@string/background_location_warning"
android:textColor="@color/colorSecondaryText"
android:letterSpacing="0"
android:fontFamily="@font/google_sans"
android:textAppearance="@style/AnotherWidget.Settings.Subtitle"
app:textAllCaps="false" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</com.tommasoberlose.anotherwidget.components.FixedFocusScrollView> </com.tommasoberlose.anotherwidget.components.FixedFocusScrollView>

2
app/src/main/res/values-it/strings.xml
View File

@ -123,7 +123,7 @@
<string name="api_key_info_all_set">La chiave API potrebbe aver bisogno di più di 20 minuti per diventare attiva, aggiorneremo il meteo non appena sarà possibile.</string> <string name="api_key_info_all_set">La chiave API potrebbe aver bisogno di più di 20 minuti per diventare attiva, aggiorneremo il meteo non appena sarà possibile.</string>
<string name="settings_weather_icon_pack_title">Icon pack</string> <string name="settings_weather_icon_pack_title">Icon pack</string>
<string name="settings_weather_icon_pack_default">Icon pack %d</string> <string name="settings_weather_icon_pack_default">Icon pack %d</string>
<string name="background_location_warning">Raccoglieremo i dati sulla posizione per attivare l\'aggiornamento del meteo anche quando l\'app è chiusa o non in uso.\nNon utilizzeremo i tuoi dati in nessun altro modo.</string> <string name="background_location_warning">Con la geolocalizzazione attiva raccoglieremo i dati sulla posizione per attivare l\'aggiornamento del meteo anche quando l\'app è chiusa o non in uso.\nNon utilizzeremo i tuoi dati in nessun altro modo.</string>
<string name="settings_weather_provider_api">Provider meteo</string> <string name="settings_weather_provider_api">Provider meteo</string>
<string name="weather_provider_info_open_weather_title">Questo provider meteo necessita di una chiave API\nper un corretto funzionamento.</string> <string name="weather_provider_info_open_weather_title">Questo provider meteo necessita di una chiave API\nper un corretto funzionamento.</string>

2
app/src/main/res/values/strings.xml
View File

@ -128,7 +128,7 @@
<string name="api_key_info_all_set">It may take up to ten minutes before your API key is activated. The weather will be updated as soon as it is available.</string> <string name="api_key_info_all_set">It may take up to ten minutes before your API key is activated. The weather will be updated as soon as it is available.</string>
<string name="settings_weather_icon_pack_title">Icon pack</string> <string name="settings_weather_icon_pack_title">Icon pack</string>
<string name="settings_weather_icon_pack_default">Icon pack %d</string> <string name="settings_weather_icon_pack_default">Icon pack %d</string>
<string name="background_location_warning">We will collect location data to update the weather information even when the app is closed or not in use.\nWe will not use these data otherwise.</string> <string name="background_location_warning">When GPS is on, we will collect location data to update the weather information even when the app is closed or not in use.\nWe will not use these data otherwise.</string>
<string name="settings_weather_provider_api">Weather provider</string> <string name="settings_weather_provider_api">Weather provider</string>
<string name="settings_weather_provider_open_weather" translatable="false">OpenWeatherMap.org</string> <string name="settings_weather_provider_open_weather" translatable="false">OpenWeatherMap.org</string>