Merge pull request #1423 from HaripriyaB/develop

Fix for #1408 Accessory bug

Author: sammy1997

PowerUp/app/src/main/java/powerup/systers/com/ui/game_activity/GameActivity.java

@@ -416,6 +416,11 @@ public void updateAvatarSkin(int skin) {
         skinAvatar.setImageResource(skin);
     }
 
+    @Override
+    public void updateAvatarAccessory(int accessory) {
+        accessoryImageView.setImageResource(accessory);
+    }
+
     @Override
     public void updateScenarioFromDatabase(Scenario scenario) {
         scene = scenario;

PowerUp/app/src/main/java/powerup/systers/com/ui/game_activity/GameScreenContract.java

@@ -11,6 +11,7 @@ interface IGameScreenView {
         void updateAvatarCloth(int cloth);
         void updateAvatarHair(int hair);
         void updateAvatarSkin(int skin);
+        void updateAvatarAccessory(int accessory);
         void updateScenarioFromDatabase(Scenario scenario);
         void setScenarioBackground(int id);
         void updateQuestion(String question);
@@ -23,6 +24,7 @@ interface IGameScreenPresenter {
         void calculateHairValue(int value);
         void calculateSkinValue(int value);
         void calculateClothValue(int value);
+        void calculateAccessoryValue(int value);
         void setValues();
         void getScenarioBackground();
         void loadQuestion();

PowerUp/app/src/main/java/powerup/systers/com/ui/game_activity/GameScreenPresenter.java

@@ -83,12 +83,32 @@ public void calculateClothValue(int value) {
         }
     }
 
+    @Override
+    public void calculateAccessoryValue(int value) {
+        if(value > 0) {
+            String accessoryImageName = context.getResources().getString(R.string.accessories);
+            accessoryImageName = accessoryImageName + value;
+            R.drawable ourRID = new R.drawable();
+            java.lang.reflect.Field photoNameField;
+            try {
+                photoNameField = ourRID.getClass().getField(accessoryImageName);
+                view.updateAvatarAccessory(photoNameField.getInt(ourRID));
+            } catch (NoSuchFieldException | IllegalAccessException
+                    | IllegalArgumentException error) {
+                Log.e("StorePresenter", "Error due to :" + accessoryImageName);
+            }
+        }
+
+    }
+
     @Override
     public void setValues() {
         calculateEyeValue(source.getCurrentEyeValue());
         calculateClothValue(source.getCurrentClothValue());
         calculateHairValue(source.getCurrentHairValue());
         calculateSkinValue(source.getCurrentSkinValue());
+        calculateAccessoryValue(source.getCurrentAccessoriesValue());
+
     }
 
     @Override

PowerUp/app/src/main/java/powerup/systers/com/ui/game_activity_level2/GameLevel2Activity.java

@@ -411,6 +411,11 @@ public void updateAvatarSkin(int skin) {
         skinAvatar.setImageResource(skin);
     }
 
+    @Override
+    public void updateAvatarAccessory(int accessory) {
+        accessoryImageView.setImageResource(accessory);
+    }
+
     @Override
     public void updateScenarioFromDatabase(Scenario scenario) {
         scene = scenario;

PowerUp/app/src/main/java/powerup/systers/com/ui/game_activity_level2/GameScreenLevel2Contract.java

@@ -11,6 +11,7 @@ interface IGameScreenLevel2View {
         void updateAvatarCloth(int cloth);
         void updateAvatarHair(int hair);
         void updateAvatarSkin(int skin);
+        void updateAvatarAccessory(int accessory);
         void updateScenarioFromDatabase(Scenario scenario);
         void setScenarioBackground(int id);
         void updateQuestion(String question);
@@ -23,6 +24,7 @@ interface IGameScreenLevel2Presenter {
         void calculateHairValue(int value);
         void calculateSkinValue(int value);
         void calculateClothValue(int value);
+        void calculateAccessoryValue(int value);
         void setValues();
         void getScenarioBackground();
         void loadQuestion();

PowerUp/app/src/main/java/powerup/systers/com/ui/game_activity_level2/GameScreenLevel2Presenter.java

@@ -82,13 +82,31 @@ public void calculateClothValue(int value) {
             Log.e("GameLevel2Presenter", "Error due to :" + clothImageName);
         }
     }
+    @Override
+    public void calculateAccessoryValue(int value) {
+        if(value > 0) {
+            String accessoryImageName = context.getResources().getString(R.string.accessories);
+            accessoryImageName = accessoryImageName + value;
+            R.drawable ourRID = new R.drawable();
+            java.lang.reflect.Field photoNameField;
+            try {
+                photoNameField = ourRID.getClass().getField(accessoryImageName);
+                view.updateAvatarAccessory(photoNameField.getInt(ourRID));
+            } catch (NoSuchFieldException | IllegalAccessException
+                    | IllegalArgumentException error) {
+                Log.e("StorePresenter", "Error due to :" + accessoryImageName);
+            }
+        }
 
+    }
     @Override
     public void setValues() {
         calculateEyeValue(source.getCurrentEyeValue());
         calculateClothValue(source.getCurrentClothValue());
         calculateHairValue(source.getCurrentHairValue());
         calculateSkinValue(source.getCurrentSkinValue());
+        calculateAccessoryValue(source.getCurrentAccessoriesValue());
+
     }
 
     @Override