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

Refactored string and colour resources

Browse Source
This commit is contained in:
Deniz Düzgören
2019-07-31 19:48:21 +02:00
parent dbea6a60eb
commit 6cf4c44880
37 changed files with 392 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_first_time.xml
+50 -38
View File
@@ -5,7 +5,7 @@
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:background="@color/colorBackground"
android:fitsSystemWindows="true"
tools:context=".FirstTime">
@@ -35,7 +35,7 @@
android:layout_marginStart="16dp"
android:text="@string/welcome"
android:textAlignment="center"
android:textColor="@color/textcolor"
android:textColor="@color/colorAccent"
android:fontFamily="@font/manrope_extrabold"
android:textSize="24sp"
app:layout_constraintStart_toStartOf="parent"
@@ -46,9 +46,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/firstsomethings"
android:text="@string/firstSomeThings"
android:textAlignment="center"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtWelcome"
app:layout_constraintTop_toBottomOf="@+id/txtWelcome" />
@@ -59,9 +59,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:text="@string/tellmename"
android:text="@string/tellMeYourName"
android:textAlignment="center"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtsetupthings"
app:layout_constraintTop_toBottomOf="@+id/txtsetupthings" />
@@ -69,14 +69,14 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClasses"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/accent"
app:boxStrokeColor="@color/colorAccent"
app:boxStrokeWidth="1dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:hint="@string/yourname"
android:textColorHint="@color/hintcolor"
android:hint="@string/yourName"
android:textColorHint="@color/colorHint"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/txttellmename"
app:layout_constraintTop_toBottomOf="@+id/txttellmename"
@@ -94,7 +94,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="16sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -105,8 +105,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/nextclass"
android:textColor="@color/textcolor"
android:text="@string/nextGrade"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -115,13 +115,13 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClass"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/accent"
app:boxStrokeColor="@color/colorAccent"
app:boxStrokeWidth="1dp"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_marginTop="8dp"
android:hint="@string/yourclass"
android:textColorHint="@color/hintcolor"
android:hint="@string/yourGrade"
android:textColorHint="@color/colorHint"
app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
app:layout_constraintStart_toStartOf="@+id/txtNextClass"
app:layout_constraintTop_toBottomOf="@+id/txtNextClass"
@@ -139,7 +139,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="16sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -151,7 +151,7 @@
android:layout_marginEnd="8dp"
android:backgroundTint="@android:color/transparent"
android:src="@drawable/ic_qmark"
android:tint="@color/textcolor"
android:tint="@color/colorText"
app:layout_constraintBottom_toBottomOf="@+id/txtLayoutClass"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/txtLayoutClass" />
@@ -161,9 +161,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/seniorsetup"
android:text="@string/seniorCourses"
android:gravity="start"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutClass" />
@@ -171,13 +171,13 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutCourses"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/accent"
app:boxStrokeColor="@color/colorAccent"
app:boxStrokeWidth="1dp"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_marginTop="8dp"
android:hint="@string/yourcourses"
android:textColorHint="@color/hintcolor"
android:hint="@string/yourCourses"
android:textColorHint="@color/colorHint"
app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
app:layout_constraintStart_toStartOf="@+id/txtSenior"
app:layout_constraintTop_toBottomOf="@+id/txtSenior">
@@ -194,7 +194,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="16sp"
android:importantForAutofill="no"/>
@@ -207,7 +207,7 @@
android:layout_marginEnd="8dp"
android:backgroundTint="@android:color/transparent"
android:src="@drawable/ic_qmark"
android:tint="@color/textcolor"
android:tint="@color/colorText"
app:layout_constraintBottom_toBottomOf="@+id/txtLayoutCourses"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/txtLayoutCourses" />
@@ -217,32 +217,44 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/moresettings"
android:textColor="@color/textcolor"
android:text="@string/moreSettings"
android:textColor="@color/colorText"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutCourses" />
<CheckBox
android:id="@+id/cbDark"
android:id="@+id/cbGreetings"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/enabledarkmode"
android:text="@string/enableGreeting"
android:textAlignment="viewStart"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtMore" />
<CheckBox
android:id="@+id/cbDark"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/enableDarkMode"
android:textAlignment="viewStart"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/cbGreetings" />
<CheckBox
android:id="@+id/cbNotif"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/wantnotif"
android:text="@string/notificationsAndSync"
android:textAlignment="viewStart"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -254,7 +266,7 @@
android:layout_height="wrap_content"
android:text="@string/personalised"
android:textAlignment="viewStart"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -270,11 +282,11 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:backgroundTint="@color/accent"
android:text="@string/letsgo"
android:textColor="@color/background"
android:backgroundTint="@color/colorAccent"
android:text="@string/letsGo"
android:textColor="@color/colorBackground"
app:icon="@drawable/ic_tick"
app:iconTint="@color/background"
app:iconTint="@color/colorBackground"
android:layout_gravity="bottom|end"
android:translationZ="-1dp"/>
@@ -282,7 +294,7 @@
android:id="@+id/linearInflation"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:background="@color/colorBackground"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app/src/main/res/layout/app_bar_main.xml
+8 -8
View File
@@ -10,14 +10,14 @@
android:id="@+id/appbarlayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:background="@color/colorBackground"
android:elevation="0dp">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="84dp"
app:titleTextColor="@color/accent"
app:titleTextColor="@color/colorAccent"
app:contentInsetStart="0dp"
android:elevation="0dp"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
@@ -32,8 +32,8 @@
android:layout_height="wrap_content"
android:layout_gravity="start"
android:fontFamily="@font/manrope_extrabold"
android:text="@string/app_name"
android:textColor="@color/accent"
android:text="@string/appName"
android:textColor="@color/colorAccent"
android:textSize="24sp"
android:singleLine="true"
android:layout_marginStart="16dp"
@@ -51,7 +51,7 @@
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="16dp"
android:layout_marginBottom="4dp"
android:textColor="@color/accent"
android:textColor="@color/colorAccent"
android:textSize="18sp"
android:fontFamily="@font/manrope_semibold"/>
@@ -71,7 +71,7 @@
android:layout_marginEnd="8dp"
app:layout_anchor="@+id/bottom_nav"
android:layout_gravity="top"
android:background="@color/lighthintcolor"
android:background="@color/colorHintLight"
android:clickable="false"
android:focusable="false"/>
@@ -83,10 +83,10 @@
app:elevation="0dp"
android:layout_gravity="bottom"
app:menu="@menu/nav_items"
android:background="@color/background"
android:background="@color/colorBackground"
app:itemIconTint="@color/bottom_nav_color"
app:itemTextColor="@color/bottom_nav_color"
app:itemRippleColor="@color/accent"/>
app:itemRippleColor="@color/colorAccent"/>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordination"
app/src/main/res/layout/bg_colour_picker.xml
+13 -13
View File
@@ -16,7 +16,7 @@
android:id="@+id/def"
android:layout_margin="8dp"
android:layout_weight="1"
app:strokeColor="@color/bggrey"
app:strokeColor="@color/bgGrey"
app:strokeWidth="2dp"
app:cornerRadius="16dp"/>
@@ -25,7 +25,7 @@
android:id="@+id/red"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgred"
android:backgroundTint="@color/bgRed"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
@@ -33,7 +33,7 @@
android:id="@+id/orange"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgorange"
android:backgroundTint="@color/bgOrange"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
@@ -41,7 +41,7 @@
android:id="@+id/yellow"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgyellow"
android:backgroundTint="@color/bgYellow"
app:cornerRadius="16dp"/>
</TableRow>
@@ -55,7 +55,7 @@
android:id="@+id/green"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bggreen"
android:backgroundTint="@color/bgGreen"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
@@ -63,7 +63,7 @@
android:id="@+id/teal"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgteal"
android:backgroundTint="@color/bgTeal"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
@@ -71,7 +71,7 @@
android:id="@+id/cyan"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgcyan"
android:backgroundTint="@color/bgCyan"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
@@ -79,7 +79,7 @@
android:id="@+id/blue"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgblue"
android:backgroundTint="@color/bgBlue"
app:cornerRadius="16dp"/>
</TableRow>
@@ -93,7 +93,7 @@
android:id="@+id/purple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgpurple"
android:backgroundTint="@color/bgPurple"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
@@ -101,7 +101,7 @@
android:id="@+id/pink"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgpink"
android:backgroundTint="@color/bgPink"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
@@ -109,7 +109,7 @@
android:id="@+id/brown"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgbrown"
android:backgroundTint="@color/bgBrown"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
@@ -117,9 +117,9 @@
android:id="@+id/grey"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bggrey"
android:backgroundTint="@color/bgGrey"
app:cornerRadius="16dp"/>
</TableRow>
</TableLayout>
</TableLayout>
app/src/main/res/layout/content_main.xml
+2 -2
View File
@@ -7,7 +7,7 @@
tools:context=".Main"
tools:showIn="@layout/app_bar_main"
android:id="@+id/content"
android:background="@color/background"
android:background="@color/colorBackground"
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="@color/background"
android:background="@color/colorBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app/src/main/res/layout/content_settings.xml
+61 -61
View File
@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/background"
android:background="@color/colorBackground"
tools:context=".SettingsFragment">
<androidx.core.widget.NestedScrollView
@@ -29,7 +29,7 @@
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
app:cardElevation="2dp"
android:backgroundTint="@color/lightbackground"
android:backgroundTint="@color/colorBackgroundLight"
app:cardCornerRadius="12dp">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -43,22 +43,22 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/personalise"
android:textColor="@color/accent"
android:textColor="@color/colorAccent"
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="@color/accent"
app:boxStrokeColor="@color/colorAccent"
app:boxStrokeWidth="1dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:hint="@string/yourname"
android:textColorHint="@color/hintcolor"
android:hint="@string/yourName"
android:textColorHint="@color/colorHint"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtPersonalise"
@@ -74,7 +74,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -84,8 +84,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/disablegreeting"
android:textColor="@color/textcolor"
android:text="@string/enableGreeting"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtPersonalise"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutName" />
@@ -94,8 +94,8 @@
android:id="@+id/txtJustnice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/justnice"
android:textColor="@color/hintcolor"
android:text="@string/justBeingNice"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtGreeting"
app:layout_constraintTop_toBottomOf="@+id/txtGreeting" />
@@ -116,8 +116,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/darkbg"
android:textColor="@color/textcolor"
android:text="@string/darkBackground"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtGreeting"
app:layout_constraintTop_toBottomOf="@+id/txtJustnice" />
@@ -126,8 +126,8 @@
android:id="@+id/txtRestart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/darkmode2"
android:textColor="@color/hintcolor"
android:text="@string/nightMode"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtDark"
app:layout_constraintTop_toBottomOf="@+id/txtDark" />
@@ -148,8 +148,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/customisecolor1"
android:textColor="@color/textcolor"
android:text="@string/customiseColoursTitle"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtRestart"
app:layout_constraintTop_toBottomOf="@+id/txtRestart" />
@@ -159,8 +159,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/customisecolor2"
android:textColor="@color/hintcolor"
android:text="@string/customiseColoursIndividually"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/txtCustomiseColours1"
@@ -193,7 +193,7 @@
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
app:cardElevation="2dp"
android:backgroundTint="@color/lightbackground"
android:backgroundTint="@color/colorBackgroundLight"
app:cardCornerRadius="12dp">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -206,23 +206,23 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/filter"
android:textColor="@color/accent"
android:text="@string/filters"
android:textColor="@color/colorAccent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClasses"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/accent"
app:boxStrokeColor="@color/colorAccent"
app:boxStrokeWidth="1dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:hint="@string/classes"
android:textColorHint="@color/hintcolor"
android:hint="@string/grade"
android:textColorHint="@color/colorHint"
app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtFilter"
@@ -238,7 +238,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -249,7 +249,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@drawable/ic_qmark"
android:tint="@color/textcolor"
android:tint="@color/colorText"
android:backgroundTint="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="@+id/txtLayoutClasses"
app:layout_constraintEnd_toEndOf="parent"
@@ -264,8 +264,8 @@
android:layout_marginEnd="8dp"
android:hint="@string/courses"
android:importantForAutofill="no"
android:textColorHint="@color/hintcolor"
app:boxStrokeColor="@color/accent"
android:textColorHint="@color/colorHint"
app:boxStrokeColor="@color/colorAccent"
app:boxStrokeWidth="1dp"
app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -281,7 +281,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp" />
</com.google.android.material.textfield.TextInputLayout>
@@ -292,7 +292,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@drawable/ic_qmark"
android:tint="@color/textcolor"
android:tint="@color/colorText"
android:backgroundTint="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="@+id/txtLayoutCourses"
app:layout_constraintEnd_toEndOf="parent"
@@ -303,8 +303,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/notifications"
android:textColor="@color/textcolor"
android:text="@string/enableNotifications"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtFilter"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutCourses" />
@@ -314,9 +314,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/notifiedabout"
android:text="@string/enablesBackgroundSync"
android:textAlignment="textStart"
android:textColor="@color/hintcolor"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtNotifications"
app:layout_constraintTop_toBottomOf="@+id/txtNotifications"
@@ -346,7 +346,7 @@
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
app:cardElevation="2dp"
android:backgroundTint="@color/lightbackground"
android:backgroundTint="@color/colorBackgroundLight"
app:cardCornerRadius="12dp">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -360,7 +360,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/misc"
android:textColor="@color/accent"
android:textColor="@color/colorAccent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -370,7 +370,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/personalised"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtMisc"
app:layout_constraintTop_toBottomOf="@+id/txtMisc" />
@@ -379,8 +379,8 @@
android:id="@+id/txtDefaultsTo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/defplan"
android:textColor="@color/hintcolor"
android:text="@string/defaultsToPlan"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtPersonalised"
app:layout_constraintTop_toBottomOf="@+id/txtPersonalised" />
@@ -402,7 +402,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/openInfo"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtDefaultsTo"
app:layout_constraintTop_toBottomOf="@+id/txtDefaultsTo" />
@@ -411,8 +411,8 @@
android:id="@+id/txtOpenInfoTwo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/openInfoTwo"
android:textColor="@color/hintcolor"
android:text="@string/openInfoNoUserInput"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtOpenInfo"
app:layout_constraintTop_toBottomOf="@+id/txtOpenInfo" />
@@ -434,7 +434,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/autoRefresh"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtOpenInfoTwo"
app:layout_constraintTop_toBottomOf="@+id/txtOpenInfoTwo" />
@@ -443,8 +443,8 @@
android:id="@+id/txtAutoRefreshTwo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/autoRefreshTwo"
android:textColor="@color/hintcolor"
android:text="@string/ifSyncNotWorking"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtAutoRefresh"
app:layout_constraintTop_toBottomOf="@+id/txtAutoRefresh" />
@@ -465,8 +465,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/visitweb"
android:textColor="@color/textcolor"
android:text="@string/visitWebsite"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtAutoRefreshTwo"
app:layout_constraintTop_toBottomOf="@+id/txtAutoRefreshTwo" />
@@ -475,8 +475,8 @@
android:id="@+id/txtWeb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/butwhy"
android:textColor="@color/hintcolor"
android:text="@string/ifYouNeedTo"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtVisitWeb"
app:layout_constraintTop_toBottomOf="@+id/txtVisitWeb" />
@@ -503,7 +503,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/licences"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtWeb"
app:layout_constraintTop_toBottomOf="@+id/txtWeb" />
@@ -512,8 +512,8 @@
android:id="@+id/txtWhatittook"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/whatittook"
android:textColor="@color/hintcolor"
android:text="@string/whatItTook"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtLicences"
app:layout_constraintTop_toBottomOf="@+id/txtLicences" />
@@ -539,7 +539,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/tac"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtLicences"
app:layout_constraintTop_toBottomOf="@+id/txtWhatittook"/>
@@ -548,8 +548,8 @@
android:id="@+id/txtTermsTwo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tactwo"
android:textColor="@color/hintcolor"
android:text="@string/reviewTac"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtTerms"
app:layout_constraintTop_toBottomOf="@+id/txtTerms" />
@@ -577,7 +577,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/privacy"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtTermsTwo"
app:layout_constraintTop_toBottomOf="@+id/txtTermsTwo" />
@@ -586,8 +586,8 @@
android:id="@+id/txtPrivacyPTwo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/privacytwo"
android:textColor="@color/hintcolor"
android:text="@string/reviewPrivacy"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtPrivacyP"
app:layout_constraintTop_toBottomOf="@+id/txtPrivacyP" />
@@ -614,7 +614,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/version"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtPrivacyPTwo"
app:layout_constraintTop_toBottomOf="@+id/txtPrivacyPTwo" />
@@ -624,7 +624,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:textColor="@color/hintcolor"
android:textColor="@color/colorHint"
android:textSize="12sp"
android:fontFeatureSettings="tnum"
app:layout_constraintStart_toStartOf="@+id/txtVersion"
app/src/main/res/layout/course_card.xml
+8 -8
View File
@@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/lightbackground"
app:cardBackgroundColor="@color/colorBackgroundLight"
app:cardCornerRadius="12dp"
android:clickable="true"
android:focusable="true"
@@ -29,7 +29,7 @@
app:layout_constraintEnd_toStartOf="@+id/date"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textColor="@color/textcolor"/>
android:textColor="@color/colorText"/>
<TextView
android:id="@+id/date"
@@ -38,7 +38,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:textAlignment="textEnd"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="200dp"/>
@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAlignment="textEnd"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
app:layout_constraintEnd_toEndOf="@+id/date"
app:layout_constraintTop_toBottomOf="@+id/date"
app:layout_constraintWidth_max="200dp" />
@@ -61,7 +61,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
app:layout_constraintEnd_toStartOf="@+id/time"
app:layout_constraintStart_toEndOf="@+id/iconView"
app:layout_constraintTop_toBottomOf="@+id/group" />
@@ -73,7 +73,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:textAlignment="textEnd"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/time"
app:layout_constraintTop_toBottomOf="@+id/time"
@@ -87,7 +87,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/room"
app:layout_constraintStart_toStartOf="parent"
@@ -98,7 +98,7 @@
android:layout_width="20dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:tint="@color/textcolor"
android:tint="@color/colorText"
app:layout_constraintBottom_toBottomOf="@+id/course"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/course" />
app/src/main/res/layout/diagnostics_dialog.xml
+6 -6
View File
@@ -15,7 +15,7 @@
android:textSize="22sp"
android:fontFamily="@font/manrope_semibold"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
@@ -32,7 +32,7 @@
android:id="@+id/dialogtext"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingBottom="24dp"
@@ -42,8 +42,8 @@
android:id="@+id/btnResetLaunch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/accent"
app:strokeColor="@color/accent"
android:textColor="@color/colorAccent"
app:strokeColor="@color/colorAccent"
app:strokeWidth="2dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
@@ -54,8 +54,8 @@
android:id="@+id/btnResetNotif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/accent"
app:strokeColor="@color/accent"
android:textColor="@color/colorAccent"
app:strokeColor="@color/colorAccent"
app:strokeWidth="2dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
app/src/main/res/layout/edittext_dialog.xml
+8 -8
View File
@@ -15,7 +15,7 @@
android:textSize="22sp"
android:fontFamily="@font/manrope_semibold"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
@@ -36,24 +36,24 @@
android:id="@+id/dialogtext"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:textColor="@color/textcolor"/>
android:textColor="@color/colorText"/>
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/accent"
app:boxStrokeColor="@color/colorAccent"
app:boxStrokeWidth="1dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:textColorHint="@color/hintcolor"
android:textColorHint="@color/colorHint"
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="@color/textcolor"
android:textColor="@color/colorText"
android:ems="10"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
@@ -65,10 +65,10 @@
android:id="@+id/dialog_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/accent"
android:text="@string/positivebutton"
android:textColor="@color/colorAccent"
android:text="@string/apply"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
app:strokeColor="@color/accent"
app:strokeColor="@color/colorAccent"
app:strokeWidth="2dp"/>
</LinearLayout>
app/src/main/res/layout/empty_dialog.xml
+1 -1
View File
@@ -13,7 +13,7 @@
android:textSize="22sp"
android:fontFamily="@font/manrope_semibold"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
app/src/main/res/layout/food_layout.xml
+1 -1
View File
@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/background">
android:background="@color/colorBackground">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/linear_food"
app/src/main/res/layout/forever_alone_button.xml
-22
View File
@@ -1,22 +0,0 @@
<?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">
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonclearallcolours"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:strokeColor="@color/textcolor"
app:strokeWidth="2dp"
android:textColor="@color/textcolor"
android:text="@string/clearall"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
</LinearLayout>
app/src/main/res/layout/just_a_card.xml
+2 -2
View File
@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:backgroundTint="@color/lightbackground"
android:backgroundTint="@color/colorBackgroundLight"
app:cardCornerRadius="12dp"
android:clickable="true"
android:focusable="true"
@@ -22,7 +22,7 @@
android:id="@+id/cardInfoText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
app/src/main/res/layout/list_item.xml
+3 -3
View File
@@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/lightbackground"
app:cardBackgroundColor="@color/colorBackgroundLight"
app:cardCornerRadius="8dp"
android:clickable="true"
android:focusable="true"
@@ -25,7 +25,7 @@
android:layout_height="24dp"
android:layout_margin="16dp"
android:layout_marginStart="8dp"
android:tint="@color/textcolor"
android:tint="@color/colorText"
app:layout_constraintBottom_toBottomOf="@+id/item_text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/item_text" />
@@ -39,7 +39,7 @@
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
android:textAlignment="viewStart"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/item_image"
app/src/main/res/layout/plan.xml
+4 -4
View File
@@ -5,7 +5,7 @@
android:layout_height="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/background">
android:background="@color/colorBackground">
<LinearLayout
android:layout_width="match_parent"
@@ -26,17 +26,17 @@
android:text=":("
android:textSize="60dp"
android:layout_gravity="center"
android:textColor="@color/hintcolor"
android:textColor="@color/colorHint"
android:visibility="gone"/>
<TextView
android:id="@+id/smileydowntext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/nosubst"
android:text="@string/noSubstitutionsForYou"
app:layout_anchor="@+id/smileydown"
android:layout_gravity="bottom|center_horizontal"
android:textColor="@color/hintcolor"
android:textColor="@color/colorHint"
android:visibility="gone"/>
</LinearLayout>
app/src/main/res/layout/recycler_dialog.xml
+1 -1
View File
@@ -13,7 +13,7 @@
android:textSize="22sp"
android:fontFamily="@font/manrope_semibold"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textAlignment="center"/>
<androidx.recyclerview.widget.RecyclerView
app/src/main/res/layout/secret_dialog.xml
+2 -2
View File
@@ -13,7 +13,7 @@
android:fontFamily="@font/manrope_semibold"
android:textSize="22sp"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
@@ -30,7 +30,7 @@
android:id="@+id/dialogtext"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingBottom="4dp"
app/src/main/res/layout/simple_dialog.xml
+3 -3
View File
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/lightbackground">
android:background="@color/colorBackgroundLight">
<TextView
android:id="@+id/textviewtitle"
@@ -14,7 +14,7 @@
android:fontFamily="@font/manrope_semibold"
android:textSize="22sp"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
@@ -26,7 +26,7 @@
android:id="@+id/dialogtext"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:textColor="@color/textcolor"
android:textColor="@color/colorText"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingBottom="24dp"
app/src/main/res/layout/welcome_screen.xml
+2 -2
View File
@@ -28,7 +28,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/havefun"
android:text="@string/haveFun"
android:textAlignment="center"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -44,6 +44,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@color/accent"/>
android:background="@color/colorAccent"/>
</androidx.constraintlayout.widget.ConstraintLayout>