From 1daf057df6369ddb4c56141619bea65486536123 Mon Sep 17 00:00:00 2001
From: JuliusAlphonso <JadeMaveric@users.noreply.github.com>
Date: Sun, 24 Nov 2019 15:01:56 +0530
Subject: [PATCH] * Fixed typo in @string/workout_hint (English) * Pointed
 hardcoded strings in "update user info" to use string resource * Added new
 strings (and translations) required for the above change

---
 .idea/codeStyles/Project.xml                  | 112 +++++++++++++++++
 .../main/res/layout/bottom_sheet_fragment.xml | 114 +++++++++++-------
 app/src/main/res/values-pt-rBR/strings.xml    |   6 +
 app/src/main/res/values-ru/strings.xml        |   6 +
 app/src/main/res/values/strings.xml           |   8 +-
 5 files changed, 199 insertions(+), 47 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 1bec35e..a88ded0 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,120 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </codeStyleSettings>
diff --git a/app/src/main/res/layout/bottom_sheet_fragment.xml b/app/src/main/res/layout/bottom_sheet_fragment.xml
index ed8b7e8..717a3e5 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment.xml
@@ -2,30 +2,38 @@
 <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:background="@color/colorSecondaryDark"
         android:id="@+id/bottomSheetParent"
         android:layout_width="match_parent" android:layout_height="wrap_content"
         android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginTop="8dp" app:layout_constraintTop_toBottomOf="@+id/textView3">
+
     <TextView
-            android:text="Edit Your Info"
-            android:textSize="24sp"
-            android:textColor="@color/colorWhite"
+            android:id="@+id/textView7"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" android:id="@+id/textView7"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="24dp"
-            android:layout_marginStart="16dp"/>
-    <Button
-            android:text="Update"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="32dp"
             android:textColor="@color/colorWhite"
+            android:textSize="24sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@string/edit_info_text" />
+
+    <Button
+            android:id="@+id/btnUpdate"
             style="@android:style/Widget.Material.Button.Borderless"
-            android:drawableEnd="@drawable/ic_checked"
             android:layout_width="140dp"
             android:layout_height="wrap_content"
-            android:id="@+id/btnUpdate" android:layout_marginTop="16dp"
-            app:layout_constraintTop_toTopOf="parent" android:layout_marginEnd="8dp"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:drawableEnd="@drawable/ic_checked"
+            android:text="@string/update"
+            android:textColor="@color/colorWhite"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@string/update" />
 
     <com.google.android.material.textfield.TextInputLayout
             android:layout_width="0dp"
@@ -40,11 +48,12 @@
         <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingStart="10dp"
-                android:paddingBottom="10dp"
                 android:background="@null"
+                android:hint="@string/weight_hint"
+                android:inputType="numberSigned"
                 android:maxLength="3"
-                android:hint="Enter your weight in Kg" android:inputType="numberSigned"/>
+                android:paddingStart="10dp"
+                android:paddingBottom="10dp" />
     </com.google.android.material.textfield.TextInputLayout>
     <com.google.android.material.textfield.TextInputLayout
             android:layout_width="0dp"
@@ -58,11 +67,12 @@
         <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingStart="10dp"
-                android:paddingBottom="10dp"
                 android:background="@null"
+                android:hint="@string/workout_hint"
+                android:inputType="numberSigned"
                 android:maxLength="3"
-                android:hint=" Your daily work time in min/day" android:inputType="numberSigned"/>
+                android:paddingStart="10dp"
+                android:paddingBottom="10dp" />
     </com.google.android.material.textfield.TextInputLayout>
     <com.google.android.material.textfield.TextInputLayout
             android:layout_width="0dp"
@@ -76,12 +86,13 @@
         <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingStart="10dp"
+                android:background="@null"
                 android:clickable="true"
                 android:focusable="false"
-                android:paddingBottom="10dp"
-                android:background="@null"
-                android:hint="Your wake up time" android:inputType="numberSigned"/>
+                android:hint="@string/wakeup_hint"
+                android:inputType="numberSigned"
+                android:paddingStart="10dp"
+                android:paddingBottom="10dp" />
     </com.google.android.material.textfield.TextInputLayout>
     <com.google.android.material.textfield.TextInputLayout
             android:layout_width="0dp"
@@ -95,22 +106,27 @@
         <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingStart="10dp"
-                android:paddingBottom="10dp"
+                android:background="@null"
                 android:clickable="true"
                 android:focusable="false"
-                android:background="@null"
-                android:hint="Your Sleep time" android:inputType="numberSigned"/>
+                android:hint="@string/wakeup_hint"
+                android:inputType="numberSigned"
+                android:paddingStart="10dp"
+                android:paddingBottom="10dp" />
     </com.google.android.material.textfield.TextInputLayout>
+
     <TextView
-            android:text="Notification Settings"
-            android:textSize="24sp"
-            android:textColor="@color/colorWhite"
+            android:id="@+id/totalIntakePercentage"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" android:id="@+id/totalIntakePercentage"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/notif_setting_header"
+            android:textColor="@color/colorWhite"
+            android:textSize="24sp"
             app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="16dp" android:layout_marginTop="16dp"
-            app:layout_constraintTop_toBottomOf="@+id/etSleepTime"/>
+            app:layout_constraintTop_toBottomOf="@+id/etSleepTime"
+            tools:text="@string/notif_setting_header" />
     <com.google.android.material.textfield.TextInputLayout
             android:layout_width="0dp"
             android:theme="@style/TextInputLayoutAppearance"
@@ -123,10 +139,11 @@
         <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingStart="10dp"
-                android:paddingBottom="10dp"
                 android:background="@null"
-                android:hint="Notification message" android:inputType="text"/>
+                android:hint="@string/notif_messsage_hint"
+                android:inputType="text"
+                android:paddingStart="10dp"
+                android:paddingBottom="10dp" />
     </com.google.android.material.textfield.TextInputLayout>
     <com.google.android.material.textfield.TextInputLayout
             android:layout_width="0dp"
@@ -140,21 +157,25 @@
         <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingStart="10dp"
-                android:clickable="true"
-                android:paddingBottom="10dp"
                 android:background="@null"
-                android:hint="Notification tone" android:inputType="text" android:focusable="false"/>
+                android:clickable="true"
+                android:focusable="false"
+                android:hint="@string/notif_tone_hint"
+                android:inputType="text"
+                android:paddingStart="10dp"
+                android:paddingBottom="10dp" />
     </com.google.android.material.textfield.TextInputLayout>
+
     <TextView
-            android:text="Notification Frequency"
-            android:textColor="@color/colorWhite"
+            android:id="@+id/textView2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/textView2"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:textColor="@color/colorWhite"
             app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="16dp" android:layout_marginTop="8dp"
-            app:layout_constraintTop_toBottomOf="@+id/etRingtone"/>
+            app:layout_constraintTop_toBottomOf="@+id/etRingtone"
+            tools:text="@string/notif_freq_hint" />
     <co.ceryle.radiorealbutton.RadioRealButtonGroup
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -196,7 +217,8 @@
                 app:rrb_ripple="true"
                 app:rrb_rippleColor="@color/colorBlack"
                 app:rrb_text="45 Mins"
-                app:rrb_textColor="@color/colorBlack"/>
+                app:rrb_textColor="@color/colorBlack" />
+
         <co.ceryle.radiorealbutton.RadioRealButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f5b5393..ecc15a9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -11,6 +11,12 @@
     <string name="sleeping_hint">Que horas costuma dormir</string>
     <string name="tagline_text">Vamos mantê-lo hidratado...</string>
     <string name="get_started">Iniciar</string>
+    <string name="edit_info_text">Edite suas informações</string>
+    <string name="update">Atualizar</string>
+    <string name="notif_setting_header">Configurações de notificação</string>
+    <string name="notif_messsage_hint">Mensagem de notificação</string>
+    <string name="notif_tone_hint">Tom da notificação</string>
+    <string name="notif_freq_hint">Frequência de notificações</string>
     <string name="walkthrough_text_one">60% da sua massa corporal é água. Seu corpo depende de água para sobreviver.
     </string>
     <string name="walkthough_text_two">A falta de água pode levar a desidratação. Até a desidratação leve pode deixá-lo sem energia e cansado.
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f67f066..d2fff2f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -11,6 +11,12 @@
     <string name="sleeping_hint">Ваше время сна</string>
     <string name="tagline_text">Позволяет держать вас гидратированными...</string>
     <string name="get_started">Начать</string>
+    <string name="edit_info_text">Изменить вашу информацию</string>
+    <string name="update">Обновить</string>
+    <string name="notif_setting_header">Настройки уведомлений</string>
+    <string name="notif_messsage_hint">Уведомление</string>
+    <string name="notif_tone_hint">Тон уведомления</string>
+    <string name="notif_freq_hint">Частота уведомлений</string>
     <string name="walkthrough_text_one">Вода составляет 60 процентов вашего веса тела. Ваше тело зависит от воды, чтобы выжить.</string>
     <string name="walkthough_text_two">Недостаток воды может привести к обезвоживанию организма. Даже легкое обезвоживание может истощить и ослабить вас.</string>
     <string name="walkthrough_text_three">Каждая клетка, ткань и орган вашего тела нуждаются в воде для правильной работы.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c25966e..a13c7c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,11 +6,17 @@
     <string name="enter_your_name_hint">Enter your name</string>
     <string name="age_hint">Enter your age</string>
     <string name="weight_hint">Enter your weight in Kg</string>
-    <string name="workout_hint">You daily work out time in min/day</string>
+    <string name="workout_hint">Your daily work out time in min/day</string>
     <string name="wakeup_hint">Your wake up time</string>
     <string name="sleeping_hint">Your Sleep time</string>
     <string name="tagline_text">Lets keep you hydrated...</string>
     <string name="get_started">Get Started</string>
+    <string name="edit_info_text">Edit Your Info</string>
+    <string name="update">Update</string>
+    <string name="notif_setting_header">Notification Settings</string>
+    <string name="notif_messsage_hint">Notification Message</string>
+    <string name="notif_tone_hint">Notification Tone</string>
+    <string name="notif_freq_hint">Notification Frequency</string>
     <string name="walkthrough_text_one">Water is 60 percent of your body weight. Your body depends on water to
         survive.
     </string>