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

Switched to DayNight for styling -> great code reduction, further Kotlin conversion

Browse Source
This commit is contained in:
Deniz Düzgören
2019-05-21 18:55:29 +02:00
parent 3b7a89b512
commit 2cec9ebd67
50 changed files with 550 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/content_settings.xml
+43 -43
View File
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorBackground">
android:background="@color/background">
<androidx.core.widget.NestedScrollView
android:id="@+id/nsvsettings"
@@ -25,14 +25,14 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/personalise"
android:textColor="?attr/colorAccent"
android:textColor="@color/accent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutName"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeColor="@color/accent"
app:boxStrokeWidth="1dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:hint="@string/yourname"
android:textColorHint="?attr/colorHint"
android:textColorHint="@color/hintcolor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtPersonalise"
@@ -56,7 +56,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/disablegreeting"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtPersonalise"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutName" />
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/justnice"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtGreeting"
app:layout_constraintTop_toBottomOf="@+id/txtGreeting" />
@@ -99,7 +99,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/darkbg"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtGreeting"
app:layout_constraintTop_toBottomOf="@+id/txtJustnice" />
@@ -108,8 +108,8 @@
android:id="@+id/txtRestart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/restart"
android:textColor="?attr/colorHint"
android:text="@string/darkmode2"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtDark"
app:layout_constraintTop_toBottomOf="@+id/txtDark" />
@@ -132,7 +132,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/showinfo"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtRestart"
app:layout_constraintTop_toBottomOf="@+id/txtRestart" />
@@ -142,7 +142,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/swipeindependent"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtHideInfo"
app:layout_constraintTop_toBottomOf="@+id/txtHideInfo" />
@@ -165,7 +165,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/customisecolor1"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtHideInfo2"
app:layout_constraintTop_toBottomOf="@+id/txtHideInfo2" />
@@ -175,7 +175,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/customisecolor2"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtCustomiseColours1"
app:layout_constraintTop_toBottomOf="@+id/txtCustomiseColours1" />
@@ -203,14 +203,14 @@
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:text="@string/filter"
android:textColor="?attr/colorAccent"
android:textColor="@color/accent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtCustomiseColours2" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClasses"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeColor="@color/accent"
app:boxStrokeWidth="1dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -218,7 +218,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:hint="@string/classes"
android:textColorHint="?attr/colorHint"
android:textColorHint="@color/hintcolor"
app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtFilter"
@@ -234,7 +234,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -245,7 +245,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@drawable/ic_qmark"
android:tint="?attr/colorText"
android:tint="@color/textcolor"
android:backgroundTint="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="@+id/txtLayoutClasses"
app:layout_constraintEnd_toEndOf="parent"
@@ -260,8 +260,8 @@
android:layout_marginEnd="8dp"
android:hint="@string/courses"
android:importantForAutofill="no"
android:textColorHint="?attr/colorHint"
app:boxStrokeColor="?attr/colorAccent"
android:textColorHint="@color/hintcolor"
app:boxStrokeColor="@color/accent"
app:boxStrokeWidth="1dp"
app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -277,7 +277,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp" />
</com.google.android.material.textfield.TextInputLayout>
@@ -288,7 +288,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@drawable/ic_qmark"
android:tint="?attr/colorText"
android:tint="@color/textcolor"
android:backgroundTint="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="@+id/txtLayoutCourses"
app:layout_constraintEnd_toEndOf="parent"
@@ -300,7 +300,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/notifications"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtFilter"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutCourses" />
@@ -311,7 +311,7 @@
android:layout_height="wrap_content"
android:text="@string/notifiedabout"
android:textAlignment="textStart"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtNotifications"
app:layout_constraintTop_toBottomOf="@+id/txtNotifications" />
@@ -334,7 +334,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:text="@string/misc"
android:textColor="?attr/colorAccent"
android:textColor="@color/accent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtNotifiedAbout" />
@@ -344,7 +344,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/personalised"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtMisc"
app:layout_constraintTop_toBottomOf="@+id/txtMisc" />
@@ -354,7 +354,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/defplan"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtPersonalised"
app:layout_constraintTop_toBottomOf="@+id/txtPersonalised" />
@@ -376,7 +376,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/openInfo"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtDefaultsTo"
app:layout_constraintTop_toBottomOf="@+id/txtDefaultsTo" />
@@ -386,7 +386,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/openInfoTwo"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtOpenInfo"
app:layout_constraintTop_toBottomOf="@+id/txtOpenInfo" />
@@ -408,7 +408,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/autoRefresh"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtOpenInfoTwo"
app:layout_constraintTop_toBottomOf="@+id/txtOpenInfoTwo" />
@@ -418,7 +418,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/autoRefreshTwo"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtAutoRefresh"
app:layout_constraintTop_toBottomOf="@+id/txtAutoRefresh" />
@@ -440,7 +440,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/visitweb"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtAutoRefreshTwo"
app:layout_constraintTop_toBottomOf="@+id/txtAutoRefreshTwo" />
@@ -450,7 +450,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/butwhy"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtVisitWeb"
app:layout_constraintTop_toBottomOf="@+id/txtVisitWeb" />
@@ -477,7 +477,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/licences"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtWeb"
app:layout_constraintTop_toBottomOf="@+id/txtWeb" />
@@ -487,7 +487,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/whatittook"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtLicences"
app:layout_constraintTop_toBottomOf="@+id/txtLicences" />
@@ -513,7 +513,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/tac"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtLicences"
app:layout_constraintTop_toBottomOf="@+id/txtWhatittook" />
@@ -523,7 +523,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tactwo"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtTerms"
app:layout_constraintTop_toBottomOf="@+id/txtTerms" />
@@ -550,7 +550,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/privacy"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtTermsTwo"
app:layout_constraintTop_toBottomOf="@+id/txtTermsTwo" />
@@ -560,7 +560,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/privacytwo"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtPrivacyP"
app:layout_constraintTop_toBottomOf="@+id/txtPrivacyP" />
@@ -587,7 +587,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/version"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtPrivacyPTwo"
app:layout_constraintTop_toBottomOf="@+id/txtPrivacyPTwo" />
@@ -597,7 +597,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtVersion"
app:layout_constraintTop_toBottomOf="@+id/txtVersion" />
@@ -626,7 +626,7 @@
android:layout_marginTop="64dp"
android:layout_marginEnd="8dp"
android:text="@string/devby"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="10sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"