MainActivity building

Author: JakeSteam

.gitignore

@@ -1,14 +1,33 @@
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-sh.exe.stackdump
-Blacksmith/Blacksmith.iml
-BaseGameUtils/BaseGameUtils.iml
-.idea/misc.xml
-Blacksmith.iml
-Blacksmith/Blacksmith-Blacksmith.iml
-.idea/modules.xml
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof

Blacksmith/build.gradle

@@ -22,6 +22,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.pro'
         }
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 repositories {
@@ -39,6 +42,8 @@ dependencies {
     implementation "com.android.support:percent:$supportLibraryVersion"
     implementation "com.google.android.gms:play-services-ads:$playLibraryVersion"
     implementation "com.google.android.gms:play-services-gcm:$playLibraryVersion"
+    implementation "com.google.android.gms:play-services-games:$playLibraryVersion"
+    implementation "com.google.android.gms:play-services-drive:$playLibraryVersion"
     implementation 'com.github.satyan:sugar:1.5'
     implementation 'com.google.code.gson:gson:2.7'
     implementation 'com.anjlab.android.iab.v3:library:1.0.31'

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/helper/GooglePlayHelper.java

@@ -85,22 +85,6 @@ public static void ActivityResult(Activity activity, int requestCode, int result
         }
     }
 
-    public static String CompleteQuest(Quest quest) {
-        Games.Quests.claim(mGoogleApiClient, quest.getQuestId(),
-                quest.getCurrentMilestone().getMilestoneId());
-        Context context = mGoogleApiClient.getContext();
-
-        String questName = quest.getName();
-        String questDifficulty = new String(quest.getCurrentMilestone().getCompletionRewardData(), Charset.forName("UTF-8"));
-        String questReward = QuestHelper.getQuestReward(context, questDifficulty);
-
-        Player_Info.increaseByOne(Player_Info.Statistic.QuestsCompleted);
-        return String.format(context.getString(R.string.questComplete),
-                questName,
-                questDifficulty,
-                questReward);
-    }
-
     public static void UpdateEvent(String eventId, int quantity) {
         if (!IsConnected() || quantity <= 0) {
             return;
@@ -502,30 +486,4 @@ private static String[] splitBackupData(String backupData) {
         return splitData;
     }
 
-    public void onResult(com.google.android.gms.common.api.Result result) {
-        Quests.LoadQuestsResult r = (Quests.LoadQuestsResult) result;
-        QuestBuffer qb = r.getQuests();
-
-        int current = 0;
-        int max = 1;
-        String event = "";
-        if (qb.getCount() > 0) {
-            Quest q = qb.get(0);
-            current = (int) q.getCurrentMilestone().getCurrentProgress();
-            max = (int) q.getCurrentMilestone().getTargetProgress();
-            event = q.getCurrentMilestone().getEventId();
-        }
-
-        DisplayHelper.updateQuest(current, max, event);
-        qb.close();
-    }
-
-    public void UpdateQuest() {
-        if (!IsConnected()) {
-            return;
-        }
-
-        PendingResult<Quests.LoadQuestsResult> quests = Games.Quests.load(mGoogleApiClient, new int[]{Quest.STATE_ACCEPTED}, Quests.SORT_ORDER_ENDING_SOON_FIRST, false);
-        quests.setResultCallback(this);
-    }
 }

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/main/MainActivity.java

@@ -6,6 +6,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Gravity;
@@ -21,8 +22,6 @@
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.drive.Drive;
 import com.google.android.gms.games.Games;
-import com.google.android.gms.games.quest.Quest;
-import com.google.android.gms.games.quest.QuestUpdateListener;
 import com.orm.query.Condition;
 import com.orm.query.Select;
 import com.tapjoy.TJPlacement;
@@ -66,10 +65,8 @@
 
 public class MainActivity extends AppCompatActivity implements
         GoogleApiClient.ConnectionCallbacks,
-        GoogleApiClient.OnConnectionFailedListener,
-        QuestUpdateListener{
+        GoogleApiClient.OnConnectionFailedListener {
     private static final Handler handler = new Handler();
-    public static RelativeLayout questContainer;
     public static VariableHelper vh;
     public static boolean needToRedrawVisitors = false;
     public static boolean needToRedrawSlots = false;
@@ -79,7 +76,6 @@ public class MainActivity extends AppCompatActivity implements
     private int newVisitors;
     private Intent musicService;
     private boolean musicServiceIsStarted = false;
-    private GooglePlayHelper gph;
     public static TJPlacement adPlacement;
 
     @Override
@@ -91,7 +87,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         dh = DisplayHelper.getInstance(getApplicationContext());
         vh = new VariableHelper();
-        gph = new GooglePlayHelper();
         musicService = new Intent(this, MusicService.class);
         prefs = getSharedPreferences("uk.co.jakelee.blacksmith", MODE_PRIVATE);
         LanguageHelper.updateLanguage(getApplicationContext());
@@ -101,8 +96,6 @@ protected void onCreate(Bundle savedInstanceState) {
             TutorialHelper.currentStage = prefs.getInt("tutorialStage", 0);
         }
 
-        assignUIElements();
-
         try {
             GooglePlayHelper.mGoogleApiClient = new GoogleApiClient.Builder(this)
                     .addConnectionCallbacks(this)
@@ -138,8 +131,11 @@ protected void onCreate(Bundle savedInstanceState) {
                 AlertDialogHelper.displayUpdateMessage(this, this);
             }
         }
+    }
+
+    @Override
+    public void onConnected(@Nullable Bundle bundle) {
 
-        gph.UpdateQuest();
     }
 
     private void ratingPrompt() {
@@ -153,18 +149,13 @@ private void ratingPrompt() {
         AppRate.showRateDialogIfMeetsConditions(this);
     }
 
-    private void assignUIElements() {
-        questContainer = (RelativeLayout) findViewById(R.id.questContainer);
-    }
-
     public void startFirstTutorial() {
         // Stage 1
         findViewById(mainScroller).scrollTo(0, 0);
 
         TutorialHelper th = new TutorialHelper(this, Constants.STAGE_1_MAIN);
         th.addTutorialNoOverlay(findViewById(R.id.visitors_container), R.string.tutorialIntro, R.string.tutorialIntroText, false);
         th.addTutorial(findViewById(R.id.coinCount), R.string.tutorialCoins, R.string.tutorialCoinsText, false);
-        th.addTutorial(findViewById(R.id.questContainer), R.string.tutorialQuest, R.string.tutorialQuestText, false);
         th.addTutorial(findViewById(R.id.currentLevel), R.string.tutorialLevel, R.string.tutorialLevelText, false);
         th.addTutorialRectangle(findViewById(R.id.visitors_container), R.string.tutorialVisitor, R.string.tutorialVisitorText, true);
         th.start();
@@ -437,7 +428,6 @@ public void run() {
                     ToastHelper.showToast(null, ToastHelper.LONG, String.format(getString(R.string.visitorsArriving), newVisitors), true);
                 }
                 DisplayHelper.updateBonusChest((ImageView) activity.findViewById(R.id.bonus_chest));
-                gph.UpdateQuest();
                 handler.postDelayed(this, DateHelper.MILLISECONDS_IN_SECOND * 10);
             }
         };
@@ -579,14 +569,6 @@ public void openBuyCoins(View view) {
         startActivity(new Intent(this, BuyCoinsActivity.class).addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT));
     }
 
-    public void openQuests(View view) {
-        if (GooglePlayHelper.mGoogleApiClient.isConnected()) {
-            startActivity(new Intent(this, QuestActivity.class).addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT));
-        } else {
-            ToastHelper.showErrorToast(null, ToastHelper.LONG, getString(R.string.questsNoConnection), false);
-        }
-    }
-
     public void openMessages(View view) {
         Intent intent = new Intent(this, MessagesActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -622,13 +604,6 @@ public void clickBookcase(View view) {
         prefs.edit().putInt("nextTip", ++thisTip).apply();
     }
 
-    @Override
-    public void onConnected(Bundle connectionHint) {
-        if (GooglePlayHelper.IsConnected()) {
-            Games.Quests.registerQuestUpdateListener(GooglePlayHelper.mGoogleApiClient, this);
-        }
-    }
-
     @Override
     public void onConnectionFailed(ConnectionResult connectionResult) {
         GooglePlayHelper.ConnectionFailed(this, connectionResult);
@@ -639,10 +614,6 @@ public void onConnectionSuspended(int i) {
         GooglePlayHelper.mGoogleApiClient.connect();
     }
 
-    public void onQuestCompleted(Quest quest) {
-        ToastHelper.showPositiveToast(null, ToastHelper.LONG, GooglePlayHelper.CompleteQuest(quest), true);
-    }
-
     protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
         GooglePlayHelper.ActivityResult(this, requestCode, resultCode);
     }