Archived
Removed Terms and Conditions as well as the Privacy Policy from SettingsFragment.kt, added little easter egg
This commit is contained in:
Deniz Düzgören
@@ -635,84 +635,10 @@
|
||||
android:focusable="true"
|
||||
style="@style/SelectableItemBackground"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toTopOf="@+id/txtTerms"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtWeb" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtTerms"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="@string/terms_and_conditions_title"
|
||||
android:textColor="@color/colorText"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtLicences"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtWhatittook"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtTermsTwo"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/terms_and_conditions_desc"
|
||||
android:textColor="@color/colorHint"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtTerms"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtTerms" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/btnTerms"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="0dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
style="@style/SelectableItemBackground"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toTopOf="@+id/txtPrivacyP"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtWhatittook"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtPrivacyP"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="@string/privacy_policy_title"
|
||||
android:textColor="@color/colorText"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtTermsTwo"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtTermsTwo" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtPrivacyPTwo"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/privacy_policy_desc"
|
||||
android:textColor="@color/colorHint"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtPrivacyP"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtPrivacyP" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/btnPrivacyP"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="0dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
style="@style/SelectableItemBackground"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toTopOf="@+id/txtVersion"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtTermsTwo" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtWeb" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtVersion"
|
||||
@@ -722,8 +648,8 @@
|
||||
android:text="@string/version"
|
||||
android:textColor="@color/colorText"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtPrivacyPTwo"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtPrivacyPTwo" />
|
||||
app:layout_constraintStart_toStartOf="@+id/txtWhatittook"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtWhatittook" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtVersionTwo"
|
||||
@@ -751,7 +677,7 @@
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtPrivacyPTwo" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtWhatittook" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
@@ -33,13 +33,9 @@
|
||||
<string name="setup_successful">Viel Spaß!</string>
|
||||
<string name="greeting_title">Aktiviere Begrüßungen</string>
|
||||
<string name="greeting_desc">Falls du möchtest, dass ich nett bin :)</string>
|
||||
<string name="licences_title">Lizenzen & Mitwirkende</string>
|
||||
<string name="licences_title">Lizenzen</string>
|
||||
<string name="licences_desc">Was die App ausmacht (Englisch)</string>
|
||||
<string name="version">Versionsnummer</string>
|
||||
<string name="privacy_policy_title">Datenschutzerklärung</string>
|
||||
<string name="terms_and_conditions_title">AGB</string>
|
||||
<string name="terms_and_conditions_desc">Überprüfe die AGB der App (Englisch)</string>
|
||||
<string name="privacy_policy_desc">Überprüfe die Datenschutzerklärung der App (Englisch)</string>
|
||||
<string name="information">Informationen</string>
|
||||
<string name="made_by_deniz">Entwickelt von Deniz :)</string>
|
||||
<string name="auto_refresh_title">Aktualisiere Plan bei App-Start</string>
|
||||
@@ -47,7 +43,7 @@
|
||||
<string name="courses_help_dialog_title">Wie du deine Kurse eintragen kannst</string>
|
||||
<string name="grade_help_dialog_title">Wie du deine Klasse eintragen kannst</string>
|
||||
<string name="courses_help_dialog_text">Trag die Kürzel für die Kurse ein, welche in deinem persönlichen Plan auftauchen sollen und über welche du benachrichtigt werden möchtest. Du kannst diese auf deinem Stundenplan finden.\n\nHier sind einige Beispiele:\n\nMathe in der 5. Klasse (Mittelstufe) wäre MAT.\n\nDer Englisch-Profilkurs in der E-Phase könnte ENP1 sein.\n\nDer Bio-Grundkurs in der Q1 ist z.B. bio1.\n\nMeist müssen Kurse für Mittelstufenschüler nicht eingetragen werden.\nTrenne mehrere Kurse mit Leerzeichen, Kommas sind optional.\nGroß- und Kleinschreibung wird beachtet.</string>
|
||||
<string name="grade_help_dialog_text">Trage deine derzeitige Klasse ein, damit sie in deinem persönlichen Plan auftaucht und über Aktualisierungen informiert zu werden.\n\nAnmerkung:\n\nIn der Mittelstufe müssen Nummer und Buchstabe zusammen geschrieben werden, Beispiel: \"5a\".\n\nIn der E-Phase müssen diese durch ein Leerzeichen getrennt werden, Beispiel: \"18 a\".\n\nIn der Q1/Q2 sollen nur die Nummern eingetragen werden, Beispiel: \"17\".\n\nMehrere Klassen können nur eingetragen werden, wenn keine Kurse eingetragen sind.</string>
|
||||
<string name="grade_help_dialog_text">Trage deine derzeitige Klasse ein, damit sie in deinem persönlichen Plan auftaucht und über Aktualisierungen informiert zu werden.\n\nAnmerkung:\n\nIn der Mittelstufe müssen Nummer und Buchstabe zusammen geschrieben werden, Beispiel: \"5a\".\n\nIn der E-Phase müssen diese durch ein Leerzeichen getrennt werden, Beispiel: \"18 a\".\n\nIn der Q1/Q2 sollen nur die Nummern eingetragen werden, Beispiel: \"17\".\n\nMehrere Klassen einzutragen ist nicht empfohlen.</string>
|
||||
<string name="experimental_menu_dialog_text">Dieses Menü ist derzeit nur für Tests gedacht. Zusätzliche Funktionalität könnte in der Zukunft hinzugefügt werden. Probier\' gerne zufällige Codes aus.</string>
|
||||
<string name="apply">Anwenden</string>
|
||||
<string name="invalid_code">Ungültiger Code</string>
|
||||
|
||||
@@ -38,23 +38,19 @@
|
||||
<string name="greeting_title">Enable greeting</string>
|
||||
<string name="greeting_desc">If you want me to be nice :)</string>
|
||||
|
||||
<string name="licences_title">Licences & contributors</string>
|
||||
<string name="licences_title">Licences</string>
|
||||
<string name="licences_desc">What went into making this app</string>
|
||||
<string name="version">Version Number</string>
|
||||
|
||||
<string name="terms_and_conditions_title">Terms & Conditions</string>
|
||||
<string name="terms_and_conditions_desc">Review this app\'s Terms & Conditions</string>
|
||||
<string name="privacy_policy_title">Privacy Policy</string>
|
||||
<string name="privacy_policy_desc">Review this app\'s Privacy Policy</string>
|
||||
<string name="information">Information</string>
|
||||
|
||||
<string name="made_by_deniz">Made by Deniz :)</string>
|
||||
<string name="made_by_deniz">Developed by Deniz :)</string>
|
||||
|
||||
<string name="auto_refresh_title">Refresh on startup</string>
|
||||
<string name="auto_refresh_desc">In case the background sync doesn\'t work</string>
|
||||
|
||||
<string name="grade_help_dialog_title">How to enter your grade</string>
|
||||
<string name="grade_help_dialog_text">Enter your current grade to have it appear in your personal plan and be notified about any information.\n\nNote:\n\nIn junior phase, put the number and letter together, as in \"5a\".\n\nIn E-Phase, separate them by a space, as in \"18 a\".\n\nIn Q1/Q2, only put in the number, as in \"17\".\n\nMultiple grades can only be entered when no courses have been entered.</string>
|
||||
<string name="grade_help_dialog_text">Enter your current grade to have it appear in your personal plan and be notified about any information.\n\nNote:\n\nIn junior phase, put the number and letter together, as in \"5a\".\n\nIn E-Phase, separate them by a space, as in \"18 a\".\n\nIn Q1/Q2, only put in the number, as in \"17\".\n\nEntering multiple grades is not recommended.</string>
|
||||
<string name="courses_help_dialog_title">How to enter your courses</string>
|
||||
<string name="courses_help_dialog_text">You need to enter the course abbreviation for every course you want in your personal plan and want to be notified about. You can find them on your time table.\n\nHere\'s a few examples:\n\nMathematics in 5th grade (juniors) would be MAT.\n\nAdvanced English in E-Phase (seniors) for the English profile may be ENP1.\n\nBasic Biology in Q1 could be bio1.\n\nIn most cases, entering courses while in junior phase is redundant.\nSeparate multiple courses by spaces, commas are optional.\nCapitalisation is required.</string>
|
||||
<string name="experimental_menu_dialog_title">Experimental Menu</string>
|
||||
|
||||
Reference in New Issue
Block a user