Task: Remove BuyEqupment Activity and Amazon Associates Dependecy

mazurio · Apr 15, 2016 · 1392d12 · 1392d12
1 parent 6bd67a6
commit 1392d12
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 467 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,14 +7,6 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'realm-android'
 apply plugin: 'io.fabric'
 
-def getApiKey() {
-    def Properties properties = new Properties()
-
-    properties.load(new FileInputStream(new File('api.properties')))
-
-    return properties['AMAZON_API_KEY']
-}
-
 android {
     compileSdkVersion 23
     buildToolsVersion '24.0.0 rc2'
@@ -44,21 +36,17 @@ android {
     productFlavors {
         pro {
             applicationId 'com.bodyweight.fitness.pro'
-            versionCode 119
-            versionName "1.1.9"
+            versionCode 120
+            versionName "1.2.0"
         }
 
         free {
             applicationId 'com.bodyweight.fitness.free'
-            versionCode 119
-            versionName "1.1.9"
+            versionCode 120
+            versionName "1.2.0"
         }
     }
     buildTypes {
-        applicationVariants.all { variant ->
-            variant.buildConfigField "String", "AMAZON_API_KEY", "\"" + getApiKey() + "\""
-        }
-
         release {
             minifyEnabled false
         }
@@ -121,8 +109,6 @@ dependencies {
         transitive = true;
     }
 
-    compile files('libs/amazon-mobile-associates-1.0.73.0.jar')
-
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

diff --git a/app/libs/amazon-mobile-associates-1.0.73.0.jar b/app/libs/amazon-mobile-associates-1.0.73.0.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -40,16 +40,6 @@
                 android:value=".ui.MainActivity" />
         </activity>
 
-        <activity
-            android:name=".ui.BuyEquipmentActivity"
-            android:parentActivityName=".ui.MainActivity"
-            android:theme="@style/AppTheme.Activity">
-
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.MainActivity" />
-        </activity>
-
         <activity
             android:name=".ui.ProgressActivity"
             android:parentActivityName=".ui.MainActivity"
@@ -72,6 +62,6 @@
 
         <meta-data
             android:name="io.fabric.ApiKey"
-            android:value="REPLACE_HERE" />
+            android:value="5dcec45142f2b7beb83af419bcb06344e8598390" />
     </application>
 </manifest>
diff --git a/app/src/main/java/com/bodyweight/fitness/presenter/ActionPresenter.java b/app/src/main/java/com/bodyweight/fitness/presenter/ActionPresenter.java
@@ -13,7 +13,6 @@
 
 import com.bodyweight.fitness.R;
 import com.bodyweight.fitness.stream.RoutineStream;
-import com.bodyweight.fitness.ui.BuyEquipmentActivity;
 import com.bodyweight.fitness.ui.ProgressActivity;
 import com.bodyweight.fitness.view.dialog.ProgressDialog;
 
@@ -82,12 +81,6 @@ public void onClickLogWorkoutButton() {
         mLogWorkoutDialog.show();
     }
 
-    public void onClickBuyEquipment() {
-        getContext().startActivity(
-                new Intent(getContext(), BuyEquipmentActivity.class)
-        );
-    }
-
     public void onClickWatchOnYouTube() {
         String id = RoutineStream.getInstance().getExercise().getYouTubeId();
 

diff --git a/app/src/main/java/com/bodyweight/fitness/ui/BuyEquipmentActivity.java b/app/src/main/java/com/bodyweight/fitness/ui/BuyEquipmentActivity.java
diff --git a/app/src/main/java/com/bodyweight/fitness/view/ActionView.java b/app/src/main/java/com/bodyweight/fitness/view/ActionView.java
@@ -175,13 +175,6 @@ public void onClickLogWorkoutButton(View view) {
         mPresenter.onClickLogWorkoutButton();
     }
 
-    @OnClick(R.id.action_view_action_sheet_buy_equipment)
-    @SuppressWarnings("unused")
-    public void onClickBuyEquipment(View view) {
-        mMaterialSheet.hideSheet();
-        mPresenter.onClickBuyEquipment();
-    }
-
     @OnClick(R.id.action_view_action_sheet_watch_on_youtube)
     @SuppressWarnings("unused")
     public void onClickWatchOnYouTube(View view) {

diff --git a/app/src/main/res/drawable/state_shopping.xml b/app/src/main/res/drawable/state_shopping.xml