karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added option to force a refresh, added fallBackToDestructiveMigration as possible migration strategy for substitution table

Browse Source
This commit is contained in:
Deniz Düzgören
2019-09-08 21:07:20 +02:00
parent 371221a092
commit 47a4a51b44
11 changed files with 114 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/content_settings.xml
+42 -4
View File
@@ -496,6 +496,44 @@
app:layout_constraintStart_toStartOf="@+id/txtAutoRefresh"
app:layout_constraintTop_toTopOf="@+id/txtAutoRefresh"/>
<TextView
android:id="@+id/txtForceRefresh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/forceRefreshTxt"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtAutoRefreshTwo"
app:layout_constraintTop_toBottomOf="@+id/txtAutoRefreshTwo" />
<TextView
android:id="@+id/txtForceRefresh2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/forceRefreshTxt2"
android:textColor="@color/colorHint"
android:textSize="12sp"
android:layout_marginEnd="16dp"
app:layout_constraintStart_toStartOf="@+id/txtForceRefresh"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtForceRefresh" />
<LinearLayout
android:id="@+id/btnForceRefresh"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:clickable="true"
android:focusable="true"
style="@style/SelectableItemBackground"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/txtVisitWeb"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAutoRefreshTwo" />
<TextView
android:id="@+id/txtVisitWeb"
android:layout_width="wrap_content"
@@ -504,8 +542,8 @@
android:text="@string/visitWebsite"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtAutoRefreshTwo"
app:layout_constraintTop_toBottomOf="@+id/txtAutoRefreshTwo" />
app:layout_constraintStart_toStartOf="@+id/txtForceRefresh2"
app:layout_constraintTop_toBottomOf="@+id/txtForceRefresh2" />
<TextView
android:id="@+id/txtWeb"
@@ -514,7 +552,7 @@
android:text="@string/ifYouNeedTo"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtVisitWeb"
app:layout_constraintStart_toStartOf="@+id/txtForceRefresh"
app:layout_constraintTop_toBottomOf="@+id/txtVisitWeb" />
<LinearLayout
@@ -531,7 +569,7 @@
app:layout_constraintBottom_toTopOf="@+id/txtLicences"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAutoRefreshTwo" />
app:layout_constraintTop_toBottomOf="@+id/txtForceRefresh2" />
<TextView
android:id="@+id/txtLicences"
app/src/main/res/values-de/strings.xml
+4
View File
@@ -151,4 +151,8 @@
<item>Hell</item>
<item>Dunkel</item>
</string-array>
<string name="forcedRefresh">Aktualisierung erfolgreich</string>
<string name="forcedRefreshTimes">Aktualisierungszeiten wurden gelöscht</string>
<string name="forceRefreshTxt">Erzwinge eine Aktualisierung</string>
<string name="forceRefreshTxt2">Nutz dies falls du Plan oder Speisemenü nicht sehen kannst</string>
</resources>
app/src/main/res/values/strings.xml
+4
View File
@@ -165,4 +165,8 @@
<item>Light</item>
<item>Dark</item>
</string-array>
<string name="forcedRefresh">Forced refresh successful</string>
<string name="forcedRefreshTimes">Cleared refresh times</string>
<string name="forceRefreshTxt">Force a refresh</string>
<string name="forceRefreshTxt2">Use this if you can\'t see the plan or food menu</string>
</resources>