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/activity_first_time.xml
+22 -22
View File
@@ -5,7 +5,7 @@
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorBackground"
android:background="@color/background"
android:fitsSystemWindows="true"
tools:context=".FirstTime">
@@ -34,7 +34,7 @@
android:layout_marginTop="16dp"
android:text="@string/welcome"
android:textAlignment="center"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -48,7 +48,7 @@
android:layout_marginEnd="8dp"
android:text="@string/firstsomethings"
android:textAlignment="center"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
android:layout_marginEnd="8dp"
android:text="@string/tellmename"
android:textAlignment="center"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -78,7 +78,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="56dp"
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/txttellmename"
@@ -99,7 +99,7 @@
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="16sp"
android:theme="@style/EditTextTheme" />
@@ -114,7 +114,7 @@
android:layout_marginEnd="8dp"
android:text="@string/nextclass"
android:textAlignment="center"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -128,7 +128,7 @@
android:layout_marginStart="56dp"
android:layout_marginTop="8dp"
android:hint="@string/yourclass"
android:textColorHint="?attr/colorHint"
android:textColorHint="@color/hintcolor"
app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -150,7 +150,7 @@
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="16sp"
android:theme="@style/EditTextTheme" />
@@ -163,7 +163,7 @@
android:layout_marginEnd="8dp"
android:backgroundTint="@android:color/transparent"
android:src="@drawable/ic_qmark"
android:tint="?attr/colorText"
android:tint="@color/textcolor"
app:layout_constraintBottom_toBottomOf="@+id/txtLayoutClass"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/txtLayoutClass" />
@@ -177,7 +177,7 @@
android:layout_marginEnd="32dp"
android:text="@string/seniorsetup"
android:textAlignment="center"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutClass" />
@@ -190,7 +190,7 @@
android:layout_marginStart="56dp"
android:layout_marginTop="8dp"
android:hint="@string/yourcourses"
android:textColorHint="?attr/colorHint"
android:textColorHint="@color/hintcolor"
app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -211,7 +211,7 @@
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="16sp"
android:theme="@style/EditTextTheme"
android:importantForAutofill="no"/>
@@ -225,7 +225,7 @@
android:layout_marginEnd="8dp"
android:backgroundTint="@android:color/transparent"
android:src="@drawable/ic_qmark"
android:tint="?attr/colorText"
android:tint="@color/textcolor"
app:layout_constraintBottom_toBottomOf="@+id/txtLayoutCourses"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/txtLayoutCourses" />
@@ -238,7 +238,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:text="@string/moresettings"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutCourses" />
@@ -252,7 +252,7 @@
android:layout_marginEnd="32dp"
android:text="@string/enabledarkmode"
android:textAlignment="viewStart"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@@ -267,7 +267,7 @@
android:layout_marginEnd="32dp"
android:text="@string/wantnotif"
android:textAlignment="viewStart"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@@ -282,7 +282,7 @@
android:layout_marginEnd="32dp"
android:text="@string/personalised"
android:textAlignment="viewStart"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@@ -297,11 +297,11 @@
android:layout_marginTop="32dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="32dp"
android:backgroundTint="?attr/colorAccent"
android:backgroundTint="@color/accent"
android:text="@string/letsgo"
android:textColor="?attr/colorBackground"
android:textColor="@color/background"
app:icon="@drawable/ic_tick"
app:iconTint="?attr/colorBackground"
app:iconTint="@color/background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -315,7 +315,7 @@
android:id="@+id/linearInflation"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorBackground"
android:background="@color/background"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app/src/main/res/layout/activity_main.xml
+1 -1
View File
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:openDrawer="start"
android:background="?attr/colorBackground">
android:background="@color/background">
<include
layout="@layout/app_bar_main"
app/src/main/res/layout/app_bar_main.xml
+14 -12
View File
@@ -18,9 +18,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorBackground"
android:background="@color/background"
app:popupTheme="@style/AppThemeLight.PopupOverlay"
app:titleTextColor="?attr/colorAccent"
app:titleTextColor="@color/accent"
app:contentInsetStart="0dp"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
@@ -38,7 +38,7 @@
android:layoutAnimation="@anim/layout_animation_fall_down"
android:text="@string/app_name"
android:textAlignment="center"
android:textColor="?attr/colorAccent"
android:textColor="@color/accent"
android:textSize="22sp"
android:singleLine="true"
app:layout_constraintBottom_toBottomOf="parent"
@@ -51,7 +51,7 @@
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="2dp"
android:progressTint="?attr/colorAccent"
android:progressTint="@color/accent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -66,7 +66,9 @@
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:elevation="4dp"/>
android:elevation="4dp"
android:background="@color/lightbackground"
android:textColor="@color/textcolor"/>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -93,11 +95,11 @@
app:elevation="0dp"
app:layout_anchor="@+id/bottom_sheet"
android:layout_gravity="bottom"
app:menu="@menu/nav_items"/>
<!-- app:itemIconTint="@drawable/tintlist_light"-->
<!-- app:itemTextColor="@drawable/tintlist_light"-->
app:menu="@menu/nav_items"
android:background="@color/background"
app:itemIconTint="@color/bottom_nav_color"
app:itemTextColor="@color/bottom_nav_color"
app:itemRippleColor="@color/accent"/>
<View
android:id="@+id/bottom_nav_divider"
@@ -106,9 +108,9 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:layout_anchor="@+id/bottom_sheet"
android:layout_gravity="top"/>
android:layout_gravity="top"
android:background="@color/lighthintcolor"/>
<!-- include bottom sheet -->
<include layout="@layout/bottom_sheet" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
app/src/main/res/layout/bottom_sheet.xml
+8 -4
View File
@@ -20,7 +20,8 @@
android:id="@+id/bottom_sheet_linear"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@color/background">
<LinearLayout
android:layout_width="match_parent"
@@ -34,7 +35,8 @@
android:id="@+id/info_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_information"/>
android:src="@drawable/ic_information"
android:tint="@color/textcolor"/>
<TextView
android:id="@+id/bottom_sheet_header"
@@ -43,7 +45,8 @@
android:layout_marginStart="8dp"
android:gravity="top|start"
android:text="@string/information"
android:textSize="16sp"/>
android:textSize="16sp"
android:textColor="@color/textcolor"/>
</LinearLayout>
@@ -54,7 +57,8 @@
android:layout_margin="16dp"
android:gravity="top|start"
android:text="@string/noinfo"
android:textSize="12sp"/>
android:textSize="12sp"
android:textColor="@color/textcolor"/>
</LinearLayout>
app/src/main/res/layout/colour_picker.xml
+4 -4
View File
@@ -113,7 +113,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/neoncolours"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:layout_marginStart="8dp"/>
<TableRow
@@ -189,8 +189,8 @@
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_margin="8dp"
android:text="@string/clearcolour"
android:textColor="?attr/colorText"
app:strokeColor="?attr/colorText"
app:strokeWidth="1dp"/>
android:textColor="@color/textcolor"
app:strokeColor="@color/textcolor"
app:strokeWidth="2dp"/>
</TableLayout>
app/src/main/res/layout/content_main.xml
+2 -2
View File
@@ -7,7 +7,7 @@
tools:context=".MainActivity"
tools:showIn="@layout/app_bar_main"
android:id="@+id/content"
android:background="?attr/colorBackground"
android:background="@color/background"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="56dp"
android:background="?attr/colorBackground"
android:background="@color/background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
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"
app/src/main/res/layout/course_card.xml
+8 -12
View File
@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?attr/colorBackgroundCard"
android:backgroundTint="@color/lightbackground"
app:cardCornerRadius="8dp"
android:clickable="true"
android:focusable="true"
@@ -15,8 +15,6 @@
android:layout_marginBottom="3dp"
app:cardElevation="2dp">
<!--app:cardUseCompatPadding="true"-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -31,7 +29,7 @@
app:layout_constraintEnd_toStartOf="@+id/date"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?attr/colorText"/>
android:textColor="@color/textcolor"/>
<TextView
android:id="@+id/date"
@@ -40,7 +38,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:textAlignment="textEnd"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -53,7 +51,7 @@
app:layout_constraintEnd_toEndOf="@+id/date"
app:layout_constraintStart_toStartOf="@+id/date"
app:layout_constraintTop_toBottomOf="@+id/date"
android:textColor="?attr/colorText" />
android:textColor="@color/textcolor" />
<TextView
android:id="@+id/course"
@@ -62,7 +60,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
app:layout_constraintEnd_toStartOf="@+id/time"
app:layout_constraintStart_toEndOf="@+id/iconView"
app:layout_constraintTop_toBottomOf="@+id/group" />
@@ -76,7 +74,7 @@
app:layout_constraintEnd_toEndOf="@+id/time"
app:layout_constraintStart_toStartOf="@+id/time"
app:layout_constraintTop_toBottomOf="@+id/time"
android:textColor="?attr/colorText" />
android:textColor="@color/textcolor" />
<TextView
android:id="@+id/additional"
@@ -86,7 +84,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/room"
app:layout_constraintStart_toStartOf="parent"
@@ -102,9 +100,7 @@
app:layout_constraintBottom_toTopOf="@+id/room"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/group"
android:tint="?attr/colorText"/>
<!--tools:srcCompat="@tools:sample/avatars"-->
android:tint="@color/textcolor"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/dating_dialog.xml
+9 -9
View File
@@ -34,7 +34,7 @@
android:id="@+id/dating_txt"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:text="@string/havefun"/>
<LinearLayout
@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:textColorHint="?attr/colorHint"
android:textColorHint="@color/hintcolor"
android:hint="@string/boy"
android:importantForAutofill="no">
@@ -60,7 +60,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -70,7 +70,7 @@
android:layout_width="0px"
android:layout_weight="3"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:text="Shuffle"/>
</LinearLayout>
@@ -89,7 +89,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:textColorHint="?attr/colorHint"
android:textColorHint="@color/hintcolor"
android:hint="@string/girl"
android:importantForAutofill="no">
@@ -98,7 +98,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -108,7 +108,7 @@
android:layout_width="0px"
android:layout_weight="3"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:text="Shuffle"/>
</LinearLayout>
@@ -126,7 +126,7 @@
android:text="@string/calculate"
android:textColor="@color/datingPink"
app:strokeColor="@color/datingPink"
app:strokeWidth="1dp"
app:strokeWidth="2dp"
android:layout_gravity="start|center_vertical"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
@@ -136,7 +136,7 @@
android:layout_weight="5"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:layout_marginStart="24dp"
android:layout_gravity="end|center_vertical"/>
app/src/main/res/layout/diagnostics_dialog.xml
+8 -8
View File
@@ -14,7 +14,7 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="?attr/colorText"/>
android:textColor="@color/textcolor"/>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
@@ -30,7 +30,7 @@
android:id="@+id/dialogtext"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingBottom="24dp"
@@ -40,9 +40,9 @@
android:id="@+id/btnResetLaunch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
app:strokeColor="?attr/colorAccent"
app:strokeWidth="1dp"
android:textColor="@color/accent"
app:strokeColor="@color/accent"
app:strokeWidth="2dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="Reset launch counter"
@@ -52,9 +52,9 @@
android:id="@+id/btnResetNotif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
app:strokeColor="?attr/colorAccent"
app:strokeWidth="1dp"
android:textColor="@color/accent"
app:strokeColor="@color/accent"
app:strokeWidth="2dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp"
app/src/main/res/layout/edittext_dialog.xml
+8 -8
View File
@@ -14,7 +14,7 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="?attr/colorText"/>
android:textColor="@color/textcolor"/>
<androidx.core.widget.NestedScrollView
android:layout_width="wrap_content"
@@ -34,24 +34,24 @@
android:id="@+id/dialogtext"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:textColor="?attr/colorText"/>
android:textColor="@color/textcolor"/>
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeColor="@color/accent"
app:boxStrokeWidth="1dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:textColorHint="?attr/colorHint"
android:textColorHint="@color/hintcolor"
android:importantForAutofill="no">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/dialog_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:ems="10"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
@@ -63,11 +63,11 @@
android:id="@+id/dialog_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
android:textColor="@color/accent"
android:text="@string/positivebutton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
app:strokeColor="?attr/colorAccent"
app:strokeWidth="1dp"/>
app:strokeColor="@color/accent"
app:strokeWidth="2dp"/>
</LinearLayout>
app/src/main/res/layout/empty_dialog.xml
+1 -1
View File
@@ -12,7 +12,7 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="?attr/colorText"/>
android:textColor="@color/textcolor"/>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
app/src/main/res/layout/food_layout.xml
+1 -1
View File
@@ -13,7 +13,7 @@
app:layout_constraintTop_toTopOf="parent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/colorBackground">
android:background="@color/background">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/linear_food"
app/src/main/res/layout/forever_alone_button.xml
+3 -3
View File
@@ -9,9 +9,9 @@
android:id="@+id/buttonclearallcolours"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:strokeColor="?attr/colorText"
app:strokeWidth="1dp"
android:textColor="?attr/colorText"
app:strokeColor="@color/textcolor"
app:strokeWidth="2dp"
android:textColor="@color/textcolor"
android:text="@string/clearall"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
app/src/main/res/layout/just_a_card.xml
+2 -2
View File
@@ -2,7 +2,7 @@
<com.google.android.material.card.MaterialCardView android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:backgroundTint="?attr/colorBackgroundCard"
android:backgroundTint="@color/lightbackground"
app:cardCornerRadius="4dp"
android:clickable="true"
android:focusable="true"
@@ -21,7 +21,7 @@
android:id="@+id/cardInfoText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
app/src/main/res/layout/list_item.xml
+2 -2
View File
@@ -12,13 +12,13 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="16dp"
android:tint="?attr/colorText"/>
android:tint="@color/textcolor"/>
<TextView
android:id="@+id/item_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:layout_gravity="center_vertical"/>
</LinearLayout>
app/src/main/res/layout/no_substitutions.xml
-1
View File
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app/src/main/res/layout/plan.xml
+3 -3
View File
@@ -13,7 +13,7 @@
app:layout_constraintTop_toTopOf="parent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/colorBackground">
android:background="@color/background">
<LinearLayout
android:layout_width="match_parent"
@@ -34,7 +34,7 @@
android:text=":("
android:textSize="60dp"
android:layout_gravity="center"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:visibility="gone"/>
<TextView
@@ -44,7 +44,7 @@
android:text="@string/nosubst"
app:layout_anchor="@+id/smileydown"
android:layout_gravity="bottom|center_horizontal"
android:textColor="?attr/colorHint"
android:textColor="@color/hintcolor"
android:visibility="gone"/>
</LinearLayout>
app/src/main/res/layout/search.xml
+2 -2
View File
@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/colorBackground"
android:background="@color/background"
android:layoutAnimation="@anim/layout_animation_fall_down">
@@ -22,7 +22,7 @@
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/accent"
android:textColorHint="?attr/colorHint"
android:textColorHint="@color/hintcolor"
android:textSize="20sp"
android:theme="@style/EditTextTheme"
app:layout_constraintEnd_toEndOf="parent"
app/src/main/res/layout/secret_dialog.xml
+2 -12
View File
@@ -12,7 +12,7 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="?attr/colorText"/>
android:textColor="@color/textcolor"/>
<androidx.core.widget.NestedScrollView
android:layout_width="wrap_content"
@@ -28,23 +28,13 @@
android:id="@+id/dialogtext"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingBottom="4dp"
android:paddingTop="8dp"
android:layout_marginBottom="24dp"/>
<!--<TextView-->
<!--android:id="@+id/secrettext"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textColor="?attr/colorText"-->
<!--android:paddingStart="24dp"-->
<!--android:paddingEnd="24dp"-->
<!--android:textSize="3dp"-->
<!--android:layout_marginBottom="24dp"/>-->
</LinearLayout>
</androidx.core.widget.NestedScrollView>
app/src/main/res/layout/simple_dialog.xml
+2 -2
View File
@@ -12,7 +12,7 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="?attr/colorText"/>
android:textColor="@color/textcolor"/>
<androidx.core.widget.NestedScrollView
android:layout_width="wrap_content"
@@ -23,7 +23,7 @@
android:id="@+id/dialogtext"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:textColor="?attr/colorText"
android:textColor="@color/textcolor"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingBottom="24dp"
app/src/main/res/layout/welcome_screen.xml
+1 -1
View File
@@ -44,6 +44,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="?attr/colorAccent"/>
android:background="@color/accent"/>
</androidx.constraintlayout.widget.ConstraintLayout>