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

Refactored string resources

Browse Source
This commit is contained in:
Deniz Düzgören
2019-09-22 13:39:20 +02:00
parent 8684e763b1
commit 49eefe8131
18 changed files with 351 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_first_time.xml
+13 -13
View File
@@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/firstSomeThings"
android:text="@string/first_setup_text"
android:textAlignment="center"
android:textColor="@color/colorText"
android:textSize="14sp"
@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:text="@string/tellMeYourName"
android:text="@string/name_text"
android:textAlignment="center"
android:textColor="@color/colorText"
android:textSize="14sp"
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:hint="@string/yourName"
android:hint="@string/your_name"
android:textColorHint="@color/colorHint"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/txttellmename"
@@ -97,7 +97,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/nextGrade"
android:text="@string/grade_text"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
@@ -112,7 +112,7 @@
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_marginTop="8dp"
android:hint="@string/yourGrade"
android:hint="@string/your_grade"
android:textColorHint="@color/colorHint"
app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
app:layout_constraintStart_toStartOf="@+id/txtNextClass"
@@ -152,7 +152,7 @@
android:id="@+id/txtSenior"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/seniorCourses"
android:text="@string/senior_courses_text"
android:gravity="start"
android:layout_marginTop="16dp"
android:textColor="@color/colorText"
@@ -168,7 +168,7 @@
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_marginTop="8dp"
android:hint="@string/yourCourses"
android:hint="@string/your_courses"
android:textColorHint="@color/colorHint"
app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
app:layout_constraintStart_toStartOf="@+id/txtSenior"
@@ -209,7 +209,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/moreSettings"
android:text="@string/more_settings_text"
android:textColor="@color/colorText"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -233,7 +233,7 @@
android:id="@+id/cbGreetings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/enableGreeting"
android:text="@string/greeting_title"
android:textAlignment="viewStart"
android:textColor="@color/colorText"
android:textSize="14sp"/>
@@ -242,7 +242,7 @@
android:id="@+id/cbDark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/enableDarkMode"
android:text="@string/enable_dark_mode"
android:textAlignment="viewStart"
android:textColor="@color/colorText"
android:textSize="14sp"/>
@@ -251,7 +251,7 @@
android:id="@+id/cbNotif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/notificationsAndSync"
android:text="@string/enable_course_notifications"
android:textAlignment="viewStart"
android:textColor="@color/colorText"
android:textSize="14sp"/>
@@ -260,7 +260,7 @@
android:id="@+id/cbPersonalised"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/personalised"
android:text="@string/default_plan_title"
android:textAlignment="viewStart"
android:textColor="@color/colorText"
android:textSize="14sp"/>
@@ -278,7 +278,7 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:backgroundTint="@color/colorAccent"
android:text="@string/letsGo"
android:text="@string/lets_go"
android:textColor="@color/colorBackground"
app:icon="@drawable/ic_tick"
app:iconTint="@color/colorBackground"
app/src/main/res/layout/app_bar_main.xml
+1 -1
View File
@@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_gravity="start"
android:fontFamily="@font/manrope_extrabold"
android:text="@string/appName"
android:text="@string/app_name"
android:textColor="@color/colorAccent"
android:textSize="28sp"
android:layout_marginStart="16dp"
app/src/main/res/layout/content_settings.xml
+26 -26
View File
@@ -54,7 +54,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:hint="@string/yourName"
android:hint="@string/your_name"
android:importantForAutofill="no"
android:textColorHint="@color/colorHint"
app:boxStrokeColor="@color/colorAccent"
@@ -83,7 +83,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/enableGreeting"
android:text="@string/greeting_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtPersonalise"
@@ -93,7 +93,7 @@
android:id="@+id/txtJustnice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/justBeingNice"
android:text="@string/greeting_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtGreeting"
@@ -126,7 +126,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:editable="false"
android:hint="@string/appTheme"
android:hint="@string/app_theme"
android:textColor="@color/colorText"
android:textSize="14sp"/>
@@ -137,7 +137,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/customiseColoursTitle"
android:text="@string/customise_colours_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtJustnice"
@@ -148,7 +148,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/customiseColoursIndividually"
android:text="@string/customise_colours_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@+id/txtNotifications"
@@ -175,7 +175,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/enableNotifications"
android:text="@string/enable_course_notifications_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtCustomiseColours2"
@@ -186,7 +186,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/enablesBackgroundSync"
android:text="@string/enable_course_notifications_desc"
android:textAlignment="textStart"
android:textColor="@color/colorHint"
android:textSize="12sp"
@@ -211,7 +211,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/notReceivingNotifications1"
android:text="@string/no_notifications_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtNotifiedAbout"
@@ -222,7 +222,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/notReceivingNotifications2"
android:text="@string/no_notifications_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@+id/txtCustomiseRingtone"
@@ -249,7 +249,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/setRingtone"
android:text="@string/pick_ringtone_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtNotifiedAbout"
@@ -260,7 +260,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/setRingtone2"
android:text="@string/pick_ringtone_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -436,7 +436,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/personalised"
android:text="@string/default_plan_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtMisc"
@@ -446,7 +446,7 @@
android:id="@+id/txtDefaultsTo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/defaultsToPlan"
android:text="@string/default_plan_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtPersonalised"
@@ -468,7 +468,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/autoRefresh"
android:text="@string/auto_refresh_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtDefaultsTo"
@@ -478,7 +478,7 @@
android:id="@+id/txtAutoRefreshTwo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ifSyncNotWorking"
android:text="@string/auto_refresh_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtAutoRefresh"
@@ -500,7 +500,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/forceRefreshTxt"
android:text="@string/force_refresh_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtAutoRefreshTwo"
@@ -510,7 +510,7 @@
android:id="@+id/txtForceRefresh2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/forceRefreshTxt2"
android:text="@string/force_refresh_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
android:layout_marginEnd="16dp"
@@ -538,7 +538,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/visitWebsite"
android:text="@string/visit_website_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtForceRefresh2"
@@ -548,7 +548,7 @@
android:id="@+id/txtWeb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ifYouNeedTo"
android:text="@string/visit_website_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtForceRefresh"
@@ -575,7 +575,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/licences"
android:text="@string/licences_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtWeb"
@@ -585,7 +585,7 @@
android:id="@+id/txtWhatittook"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/whatItTook"
android:text="@string/licences_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtLicences"
@@ -611,7 +611,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/tac"
android:text="@string/terms_and_conditions_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtLicences"
@@ -621,7 +621,7 @@
android:id="@+id/txtTermsTwo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reviewTac"
android:text="@string/terms_and_conditions_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtTerms"
@@ -648,7 +648,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/privacy"
android:text="@string/privacy_policy_title"
android:textColor="@color/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtTermsTwo"
@@ -658,7 +658,7 @@
android:id="@+id/txtPrivacyPTwo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reviewPrivacy"
android:text="@string/privacy_policy_desc"
android:textColor="@color/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtPrivacyP"
app/src/main/res/layout/course_card.xml
+2 -1
View File
@@ -106,9 +106,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:textAlignment="textEnd"
android:textColor="@color/colorText"
app:layout_constraintEnd_toEndOf="@+id/date"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/date"
app:layout_constraintWidth_max="200dp" />
app/src/main/res/layout/plan.xml
+1 -1
View File
@@ -33,7 +33,7 @@
android:id="@+id/smileydowntext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/noSubstitutionsForYou"
android:text="@string/no_personal_substitutions"
app:layout_anchor="@+id/smileydown"
android:layout_gravity="bottom|center_horizontal"
android:textColor="@color/colorHint"
app/src/main/res/layout/welcome_screen.xml
+1 -1
View File
@@ -25,7 +25,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/haveFun"
android:text="@string/setup_successful"
android:textAlignment="center"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"