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"