Merge branch 'can-override-package-for-testing' of https://github.com/john-crossley/AppRater into john-crossley-can-override-package-for-testing

Conflicts:
	AppRaterLibrary/src/main/java/org/codechimp/apprater/AppRater.java
	gradle.properties

Author: andrew-codechimp

AppRaterDemo/src/main/java/org/codechimp/appraterdemo/MainActivity.java

@@ -1,17 +1,15 @@
 package org.codechimp.appraterdemo;
 
-import org.codechimp.apprater.AmazonMarket;
-import org.codechimp.apprater.AppRater;
-import org.codechimp.apprater.GoogleMarket;
-
+import android.app.Activity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.app.Activity;
+
+import org.codechimp.apprater.AppRater;
 
 public class MainActivity extends Activity {
 
@@ -20,9 +18,10 @@ public class MainActivity extends Activity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_main);		
-		
-		buttonTest = (Button) findViewById(R.id.button1);
+		setContentView(R.layout.activity_main);
+
+
+        buttonTest = (Button) findViewById(R.id.button1);
 
 		buttonTest.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
@@ -42,6 +41,8 @@ public void onClick(View v) {
 
         // This will keep a track of when the app was first used and whether to show a prompt
 		// It should be the default implementation of AppRater
+
+        AppRater.setPackageName("com.johncrossley");
         AppRater.app_launched(this);
 	}
 

AppRaterLibrary/src/main/java/org/codechimp/apprater/AmazonMarket.java

@@ -3,12 +3,12 @@
 import android.content.Context;
 import android.net.Uri;
 
-public class AmazonMarket implements Market {
+public class AmazonMarket extends Market {
     private static String marketLink = "http://www.amazon.com/gp/mas/dl/android?p=";
 
     @Override
     public Uri getMarketURI(Context context) {
-        return Uri.parse(marketLink + context.getPackageName().toString());
+        return Uri.parse(marketLink + Market.getPackageName(context));
     }
 }
 

AppRaterLibrary/src/main/java/org/codechimp/apprater/AppRater.java

@@ -11,7 +11,6 @@
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.util.Log;
-import android.widget.Toast;
 
 public class AppRater {
     // Preference Constants
@@ -34,6 +33,8 @@ public class AppRater {
     private static boolean isVersionCodeCheckEnabled;
     private static boolean isCancelable = true;
 
+    private static String packageName;
+
     private static Market market = new GoogleMarket();
 
     /**
@@ -200,6 +201,10 @@ public static void rateNow(final Context context) {
         }
     }
 
+    public static void setPackageName(String packageName) {
+        AppRater.market.overridePackageName(packageName);
+    }
+
     /**
      * Set an alternate Market, defaults to Google Play
      *

AppRaterLibrary/src/main/java/org/codechimp/apprater/GoogleMarket.java

@@ -3,11 +3,11 @@
 import android.content.Context;
 import android.net.Uri;
 
-public class GoogleMarket implements Market {
+public class GoogleMarket extends Market {
     private static String marketLink = "market://details?id=";
 
     @Override
     public Uri getMarketURI(Context context) {
-        return Uri.parse(marketLink + context.getPackageName().toString());
+        return Uri.parse(marketLink + Market.getPackageName(context));
     }
 }

AppRaterLibrary/src/main/java/org/codechimp/apprater/Market.java

@@ -3,6 +3,20 @@
 import android.content.Context;
 import android.net.Uri;
 
-public interface Market {
-    public Uri getMarketURI(Context context);
+public abstract class Market {
+
+    protected static String packageName;
+
+    protected abstract Uri getMarketURI(Context context);
+
+    public void overridePackageName(String packageName) {
+        Market.packageName = packageName;
+    }
+
+    protected static String getPackageName(Context context) {
+        if (Market.packageName != null) {
+            return Market.packageName;
+        }
+        return context.getPackageName();
+    }
 }