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

Firebase topic subscription changes are now immediate, added backup option in experimental dialog

Browse Source
This commit is contained in:
Deniz Düzgören
2019-09-03 18:18:21 +02:00
parent c1c025f616
commit 152004026c
15 changed files with 194 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_first_time.xml
+28 -1
View File
@@ -160,9 +160,9 @@
android:id="@+id/txtSenior"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/seniorCourses"
android:gravity="start"
android:layout_marginTop="16dp"
android:textColor="@color/colorText"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -274,6 +274,33 @@
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/cbNotif" />
<!-- <TextView-->
<!-- android:id="@+id/txtOr"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/or"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/cbPersonalised"-->
<!-- app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"-->
<!-- app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"-->
<!-- android:gravity="start"-->
<!-- android:layout_marginTop="16dp"-->
<!-- android:textColor="@color/colorText"/>-->
<!-- <com.google.android.material.button.MaterialButton style="@style/Widget.MaterialComponents.Button.OutlinedButton"-->
<!-- android:id="@+id/btnRestoreFromFile"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:strokeColor="@color/colorAccent"-->
<!-- app:strokeWidth="2dp"-->
<!-- android:textColor="@color/colorAccent"-->
<!-- android:text="@string/restoreFromFile"-->
<!-- android:layout_marginBottom="64dp"-->
<!-- android:layout_marginTop="8dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/txtOr"-->
<!-- app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"-->
<!-- app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"/>-->
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
app/src/main/res/values-de/strings.xml
+4
View File
@@ -134,4 +134,8 @@
<string name="noRingtonesFound">Keine Klingeltöne gefunden</string>
<string name="deviceSettingsRedirect">Öffnet Geräteinstellungen</string>
<string name="defaultRingtone">Standard</string>
<string name="permissionDenied">Bitte erlaube Speicherzugriff</string>
<string name="success">Erfolg</string>
<string name="restoreFromFile">von Datei wiederherstellen</string>
<string name="or">du kannst auch…</string>
</resources>
app/src/main/res/values/strings.xml
+4
View File
@@ -148,4 +148,8 @@
<string name="noRingtonesFound">No ringtones found</string>
<string name="deviceSettingsRedirect">Redirects to device settings</string>
<string name="defaultRingtone">Default</string>
<string name="permissionDenied">Please enable storage permissions</string>
<string name="success">Success</string>
<string name="restoreFromFile">Restore from file</string>
<string name="or">you may also…</string>
</resources>