fix_lint_unused_imports_and_hardcoded_strings

hiatul · Apr 17, 2018 · 2a3a730 · 2a3a730
1 parent 7cfc344
commit 2a3a730
Show file tree

Hide file tree

Showing 33 changed files with 56 additions and 76 deletions.
diff --git a/PowerUp/app/src/main/java/powerup/systers/com/AvatarRoomActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/AvatarRoomActivity.java
@@ -12,9 +12,6 @@
 import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.ImageView;
-
-import java.util.Random;
-
 import powerup.systers.com.datamodel.SessionHistory;
 import powerup.systers.com.db.DatabaseHandler;
 

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/FinalAvatarActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/FinalAvatarActivity.java
@@ -10,10 +10,6 @@
 import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.ImageView;
-
-import java.util.Random;
-
-import powerup.systers.com.datamodel.SessionHistory;
 import powerup.systers.com.db.DatabaseHandler;
 
 public class FinalAvatarActivity extends Activity{

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/GameActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/GameActivity.java
@@ -23,7 +23,6 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.akexorcist.roundcornerprogressbar.IconRoundCornerProgressBar;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/ScenarioOverActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/ScenarioOverActivity.java
@@ -24,20 +24,18 @@
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.akexorcist.roundcornerprogressbar.IconRoundCornerProgressBar;
+
 
 import powerup.systers.com.datamodel.Scenario;
-import powerup.systers.com.datamodel.Score;
+
 import powerup.systers.com.datamodel.SessionHistory;
 import powerup.systers.com.db.DatabaseHandler;
 import powerup.systers.com.powerup.PowerUpUtils;
 
-import static powerup.systers.com.R.string.scenario_description;
-import static powerup.systers.com.R.string.scene;
+
 
 public class ScenarioOverActivity extends AppCompatActivity {
 

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/StartActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/StartActivity.java
@@ -12,15 +12,12 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v7.app.AlertDialog;
-import android.view.Gravity;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.Toast;
 

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/StoreActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/StoreActivity.java
@@ -10,19 +10,17 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.w3c.dom.Text;
+
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/db/AbstractDbAdapter.java b/PowerUp/app/src/main/java/powerup/systers/com/db/AbstractDbAdapter.java
@@ -15,7 +15,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.sql.Array;
 import java.util.Arrays;
 
 public abstract class AbstractDbAdapter {

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/minesweeper/MinesweeperGameActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/minesweeper/MinesweeperGameActivity.java
@@ -19,7 +19,6 @@
 import java.util.Random;
 
 import powerup.systers.com.MinesweeperSound;
-import powerup.systers.com.GameOverActivity;
 import powerup.systers.com.MapActivity;
 import powerup.systers.com.R;
 import powerup.systers.com.powerup.PowerUpUtils;

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/sink_to_swim_game/SinkToSwimEndActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/sink_to_swim_game/SinkToSwimEndActivity.java
@@ -6,10 +6,10 @@
 import android.view.View;
 import android.widget.TextView;
 
-import powerup.systers.com.GameOverActivity;
+
 import powerup.systers.com.MapActivity;
 import powerup.systers.com.R;
-import powerup.systers.com.minesweeper.MinesweeperGameActivity;
+
 import powerup.systers.com.ScenarioOverActivity;
 import powerup.systers.com.powerup.PowerUpUtils;
 

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/sink_to_swim_game/SinkToSwimGame.java b/PowerUp/app/src/main/java/powerup/systers/com/sink_to_swim_game/SinkToSwimGame.java
@@ -20,10 +20,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import powerup.systers.com.GameOverActivity;
 import powerup.systers.com.MapActivity;
 import powerup.systers.com.R;
-import powerup.systers.com.sink_to_swim_game.SinkToSwimSessionManager;
 import powerup.systers.com.powerup.PowerUpUtils;
 import powerup.systers.com.datamodel.SessionHistory;
 

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabBoardTextView.java b/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabBoardTextView.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-import android.widget.TextView;
 
 /**
  * Created by sachinaggarwal on 23/07/17.

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabMatchEndActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabMatchEndActivity.java
@@ -11,8 +11,7 @@
 import powerup.systers.com.R;
 import powerup.systers.com.ScenarioOverActivity;
 import powerup.systers.com.powerup.PowerUpUtils;
-import powerup.systers.com.vocab_match_game.VocabMatchSessionManager;
-import powerup.systers.com.sink_to_swim_game.SinkToSwimGame;
+
 
 public class VocabMatchEndActivity extends AppCompatActivity {
 

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabMatchGameActivity.java b/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabMatchGameActivity.java
@@ -9,7 +9,6 @@
 import android.media.MediaPlayer;
 import android.os.Build;
 import android.os.Handler;
-import android.provider.MediaStore;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
@@ -24,8 +23,7 @@
 import powerup.systers.com.MapActivity;
 import powerup.systers.com.R;
 import powerup.systers.com.powerup.PowerUpUtils;
-import powerup.systers.com.vocab_match_game.VocabMatchSessionManager;
-import powerup.systers.com.sink_to_swim_game.SinkToSwimGame;
+
 import powerup.systers.com.datamodel.SessionHistory;
 
 public class VocabMatchGameActivity extends AppCompatActivity {

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabMatchTutorials.java b/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabMatchTutorials.java
@@ -9,7 +9,6 @@
 import powerup.systers.com.MapActivity;
 import powerup.systers.com.R;
 import powerup.systers.com.powerup.PowerUpUtils;
-import powerup.systers.com.sink_to_swim_game.SinkToSwimGame;
 
 public class VocabMatchTutorials extends AppCompatActivity {
 

diff --git a/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabTileImageView.java b/PowerUp/app/src/main/java/powerup/systers/com/vocab_match_game/VocabTileImageView.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 /**
  * Created by sachinaggarwal on 24/07/17.

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
@@ -53,7 +53,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
@@ -36,7 +36,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
@@ -65,7 +65,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
@@ -94,7 +94,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
@@ -123,7 +123,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/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/score_0"
                 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/letter_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/letter_Q"
                         android:textSize="@dimen/swim_button_textSize" />
 
                     <Button
@@ -112,18 +112,17 @@
                         android:layout_weight="0.9"
                         android:alpha="0"
                         android:onClick="answerChosen"
-                        android:text="F"
+                        android:text="@string/letter_F"
                         android:textSize="@dimen/swim_button_textSize" />
                 </LinearLayout>
             </LinearLayout>
 
             <TextView
                 android:id="@+id/swim_score"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
+                android:layout_width="match_parent" android:layout_height="0dp"
                 android:layout_weight="2"
                 android:gravity="center|top"
-                android:text="Score: 00"
+                android:text="@string/score_00"
                 android:textColor="#FFFFFF"
                 android:textSize="@dimen/question_textSize"
                 android:textStyle="bold" />

diff --git a/PowerUp/app/src/main/res/layout/activity_store.xml b/PowerUp/app/src/main/res/layout/activity_store.xml
@@ -24,7 +24,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
@@ -11,7 +11,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"/>
@@ -59,7 +59,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
@@ -68,15 +68,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/final_avatar.xml b/PowerUp/app/src/main/res/layout/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"
             android:textSize="@dimen/final_scene_text_size" />
     </LinearLayout>
         <LinearLayout