fix: Hardcoded text lint error anitab-org#1102

hridyakrishna · Jan 28, 2019 · 172df7a · 172df7a
1 parent 5870699
commit 172df7a
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 31 deletions.
diff --git a/PowerUp/app/src/main/java/powerup/systers/com/ui/avatar_room/AvatarRoomPresenter.java b/PowerUp/app/src/main/java/powerup/systers/com/ui/avatar_room/AvatarRoomPresenter.java
@@ -54,7 +54,7 @@ public void calculateHairValue(int value) {
 
     @Override
     public void calculateSkinValue(int value) {
-        String skinmageName = context.getResources().getString(R.string.skin);
+        String skinmageName = context.getResources().getString(R.string.lowercase_skin);
         skinmageName = skinmageName + value;
         R.drawable ourRID = new R.drawable();
         java.lang.reflect.Field photoNameField;

diff --git a/.../app/src/main/java/powerup/systers/com/ui/final_avatar_room/FinalAvatarRoomPresenter.java b/.../app/src/main/java/powerup/systers/com/ui/final_avatar_room/FinalAvatarRoomPresenter.java
@@ -49,7 +49,7 @@ public void calculateHairValue(int value) {
 
     @Override
     public void calculateSkinValue(int value) {
-        String skinmageName = context.getResources().getString(R.string.skin);
+        String skinmageName = context.getResources().getString(R.string.lowercase_skin);
         skinmageName = skinmageName + value;
         R.drawable ourRID = new R.drawable();
         java.lang.reflect.Field photoNameField;

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/ui/game_activity/GameScreenPresenter.java b/PowerUp/app/src/main/java/powerup/systers/com/ui/game_activity/GameScreenPresenter.java
@@ -55,7 +55,7 @@ public void calculateHairValue(int value) {
 
     @Override
     public void calculateSkinValue(int value) {
-        String skinmageName = context.getResources().getString(R.string.skin);
+        String skinmageName = context.getResources().getString(R.string.lowercase_skin);
         skinmageName = skinmageName + value;
         R.drawable ourRID = new R.drawable();
         java.lang.reflect.Field photoNameField;

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/ui/store_screen/StorePresenter.java b/PowerUp/app/src/main/java/powerup/systers/com/ui/store_screen/StorePresenter.java
@@ -55,7 +55,7 @@ public void calculateHairValue(int value) {
 
     @Override
     public void calculateSkinValue(int value) {
-        String skinmageName = context.getResources().getString(R.string.skin);
+        String skinmageName = context.getResources().getString(R.string.lowercase_skin);
         skinmageName = skinmageName + value;
         R.drawable ourRID = new R.drawable();
         java.lang.reflect.Field photoNameField;

diff --git a/PowerUp/app/src/main/res/layout-land/activity_scenario_over.xml b/PowerUp/app/src/main/res/layout-land/activity_scenario_over.xml
@@ -52,7 +52,7 @@
         android:layout_toRightOf="@id/karma_star"
         android:layout_toEndOf="@id/karma_star"
         android:gravity="center"
-        android:text="0"
+        android:text="@string/zero"
         android:textSize="@dimen/karma_points_textSize"
         android:textColor="@color/powerup_black"/>
 

diff --git a/PowerUp/app/src/main/res/layout-land/avatar_room.xml b/PowerUp/app/src/main/res/layout-land/avatar_room.xml
@@ -37,7 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
-                android:text="Skin"
+                android:text="@string/skin"
                 android:textSize="@dimen/selection_text_size" />
 
             <ImageView
@@ -68,7 +68,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
-                android:text="Eyes"
+                android:text="@string/eyes"
                 android:textSize="@dimen/selection_text_size" />
 
             <ImageView
@@ -99,7 +99,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
-                android:text="Clothes"
+                android:text="@string/clothes"
                 android:textSize="@dimen/selection_text_size" />
 
             <ImageView
@@ -130,7 +130,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
-                android:text="Hair"
+                android:text="@string/_hair"
                 android:textSize="@dimen/selection_text_size" />
 
             <ImageView

diff --git a/PowerUp/app/src/main/res/layout-land/completed_game.xml b/PowerUp/app/src/main/res/layout-land/completed_game.xml
@@ -15,7 +15,7 @@
         android:layout_height="@dimen/karma_star_height"
         android:layout_toRightOf="@id/karma_star"
         android:gravity="center"
-        android:text="0"
+        android:text="@string/zero"
         android:textSize="@dimen/karma_points_textSize"
         android:textColor="@color/powerup_black"/>
     <TextView

diff --git a/PowerUp/app/src/main/res/layout-land/final_avatar.xml b/PowerUp/app/src/main/res/layout-land/final_avatar.xml
@@ -23,7 +23,7 @@
             android:gravity="center"
             android:textStyle="bold"
             android:textColor="@color/powerup_dark_blue"
-            android:text="This is your final avatar! Press continue to start your Journey..."
+            android:text="@string/final_avatar_message"
             android:textSize="@dimen/final_scene_text_size" />
     </LinearLayout>
         <LinearLayout

diff --git a/PowerUp/app/src/main/res/layout/activity_minesweeper_game.xml b/PowerUp/app/src/main/res/layout/activity_minesweeper_game.xml
@@ -356,7 +356,7 @@
                 android:layout_weight="1.5"
                 android:paddingRight="@dimen/score_padding_right"
                 android:paddingEnd="@dimen/score_padding_right"
-                android:text="Score: 0"
+                android:text="@string/score0"
                 android:textColor="@color/score_color"
                 android:textSize="@dimen/score_text_size"
                 android:textStyle="bold" />

diff --git a/PowerUp/app/src/main/res/layout/activity_sink_to_swim_end.xml b/PowerUp/app/src/main/res/layout/activity_sink_to_swim_end.xml
@@ -38,7 +38,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:textColor="@color/score_text"
-                android:text="0"
+                android:text="@string/zero"
                 android:gravity="center_horizontal"
                 android:textSize="@dimen/swim_score_text_size"/>
             <TextView
@@ -47,7 +47,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:textColor="@color/correct_answer"
-                android:text="0"
+                android:text="@string/zero"
                 android:gravity="center_horizontal"
                 android:textSize="@dimen/swim_answer_textSize"/>
             <TextView
@@ -56,7 +56,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:textColor="@color/wrong_answer"
-                android:text="0"
+                android:text="@string/zero"
                 android:gravity="center_horizontal"
                 android:textSize="@dimen/swim_answer_textSize"/>
         </LinearLayout>

diff --git a/PowerUp/app/src/main/res/layout/activity_sink_to_swim_game.xml b/PowerUp/app/src/main/res/layout/activity_sink_to_swim_game.xml
@@ -92,7 +92,7 @@
                         android:layout_weight="0.8"
                         android:alpha="0"
                         android:onClick="answerChosen"
-                        android:text="T"
+                        android:text="@string/t"
                         android:textSize="@dimen/swim_button_textSize" />
 
                     <Button
@@ -102,7 +102,7 @@
                         android:layout_weight="0.3"
                         android:alpha="0"
                         android:onClick="answerChosen"
-                        android:text="Q"
+                        android:text="@string/q"
                         android:textSize="@dimen/swim_button_textSize" />
 
                     <Button
@@ -112,7 +112,7 @@
                         android:layout_weight="0.9"
                         android:alpha="0"
                         android:onClick="answerChosen"
-                        android:text="F"
+                        android:text="@string/f"
                         android:textSize="@dimen/swim_button_textSize" />
                 </LinearLayout>
             </LinearLayout>

diff --git a/PowerUp/app/src/main/res/layout/activity_store.xml b/PowerUp/app/src/main/res/layout/activity_store.xml
@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="@dimen/karma_star_height"
             android:gravity="center"
-            android:text="0"
+            android:text="@string/zero"
             android:textColor="@color/powerup_black"
             android:textSize="@dimen/karma_points_textSize" />
         <ImageView

diff --git a/PowerUp/app/src/main/res/layout/activity_vocab_match_end.xml b/PowerUp/app/src/main/res/layout/activity_vocab_match_end.xml
@@ -38,7 +38,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:textColor="@color/score_text"
-                android:text="0"
+                android:text="@string/zero"
                 android:gravity="center_horizontal"
                 android:textSize="@dimen/swim_score_text_size"/>
             <TextView
@@ -47,7 +47,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:textColor="@color/correct_answer"
-                android:text="0"
+                android:text="@string/zero"
                 android:gravity="center_horizontal"
                 android:textSize="@dimen/swim_answer_textSize"/>
             <TextView
@@ -56,7 +56,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:textColor="@color/wrong_answer"
-                android:text="0"
+                android:text="@string/zero"
                 android:gravity="center_horizontal"
                 android:textSize="@dimen/swim_answer_textSize"/>
         </LinearLayout>

diff --git a/PowerUp/app/src/main/res/layout/activity_vocab_match_game.xml b/PowerUp/app/src/main/res/layout/activity_vocab_match_game.xml
@@ -10,7 +10,7 @@
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:background="@drawable/vocab_score"
-        android:text="0"
+        android:text="@string/zero"
         android:gravity="center"
         android:textSize="25sp"
         android:textStyle="bold"/>
@@ -58,7 +58,7 @@
                android:layout_height="0dp"
                android:layout_weight="1"
                android:background="@drawable/vocab_clipboard_yellow"
-               android:text="Pimples"
+               android:text="@string/pimples"
                android:gravity="center"
                />
             <powerup.systers.com.vocab_match_game.VocabBoardTextView
@@ -67,15 +67,15 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:background="@drawable/vocab_clipboard_yellow"
-                android:text="Bra"
+                android:text="@string/bra"
                 android:gravity="center"/>
             <powerup.systers.com.vocab_match_game.VocabBoardTextView
                 android:id="@+id/tv3"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:background="@drawable/vocab_clipboard_yellow"
-                android:text="Periods"
+                android:text="@string/periods"
                 android:gravity="center"/>
         </LinearLayout>
     </LinearLayout>

diff --git a/PowerUp/app/src/main/res/layout/minesweeper_pros_cons.xml b/PowerUp/app/src/main/res/layout/minesweeper_pros_cons.xml
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="14"
             android:gravity="bottom"
-            android:text="=> Better Success Rate "
+            android:text="@string/better_success_rate"
             android:textColor="@color/powerup_blue_green"
             android:textSize="@dimen/pros_cons_textSize"
             android:textStyle="bold" />
@@ -51,7 +51,7 @@
             android:layout_weight="14"
             android:gravity="top"
             android:paddingTop="@dimen/pros_cons_paddingTop"
-            android:text="=> Cheapest Contraceptive"
+            android:text="@string/cheapest_contraceptive"
             android:textColor="@color/powerup_blue_green"
             android:textSize="@dimen/pros_cons_textSize"
             android:textStyle="bold" />
@@ -62,7 +62,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="5"
             android:gravity="bottom"
-            android:text="=> No protection against STDs"
+            android:text="@string/no_protection_against_stds"
             android:textColor="@color/cons_text"
             android:textSize="@dimen/pros_cons_textSize"
             android:textStyle="bold" />

diff --git a/PowerUp/app/src/main/res/layout/store_selection_view.xml b/PowerUp/app/src/main/res/layout/store_selection_view.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:text="5"
+        android:text="@string/_5"
         android:textSize="20sp"
         android:gravity="bottom"
         android:layout_gravity="center_horizontal|bottom"

diff --git a/PowerUp/app/src/main/res/values/strings.xml b/PowerUp/app/src/main/res/values/strings.xml
@@ -27,7 +27,7 @@
     <string name="eye">"eyes"</string>
     <string name="hair">"hair"</string>
     <string name="cloth">"dress_avatar"</string>
-    <string name="skin">"skin"</string>
+    <string name="lowercase_skin">"skin"</string>
     <string name="face">"face"</string>
     <string name="accessory">"accessory"</string>
     <string name="accessories">"acc_avatar"</string>
@@ -133,4 +133,21 @@
     <string name="save_blood_tutorial_3">Try to choose all the correct options before the time runs out!</string>
     <string name="msg1_level_complete">Happy Birthday! You have completed the middle school level!</string>
     <string name="msg2_level_complete">Congratulations! Let\'s now proceed to high school.</string>
+    <string name="f">F</string>
+    <string name="score0">Score: 0</string>
+    <string name="zero">0</string>
+    <string name="t">T</string>
+    <string name="q">Q</string>
+    <string name="pimples">Pimples</string>
+    <string name="bra">Bra</string>
+    <string name="periods">Periods</string>
+    <string name="skin">Skin</string>
+    <string name="eyes">Eyes</string>
+    <string name="clothes">Clothes</string>
+    <string name="_hair">Hair</string>
+    <string name="final_avatar_message">This is your final avatar! Press continue to start your Journey...</string>
+    <string name="better_success_rate"><![CDATA[=> Better Success Rate]]></string>
+    <string name="cheapest_contraceptive"><![CDATA[=> Cheapest Contraceptive]]></string>
+    <string name="no_protection_against_stds"><![CDATA[=> No protection against STDs]]></string>
+    <string name="_5">5</string>
 </resources>