Merge pull request #62 from danielkutik/gradle-appcompat-wip

Updated for AndroidStudio

Author: donnfelker

.gitignore

@@ -19,6 +19,10 @@ local.properties
 # Eclipse project files
 .classpath
 .project
+.settings/
+*/.classpath
+*/.project
+*/.settings/
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -50,4 +54,4 @@ temp-testng-customsuite.xml
 release.properties
 project.properties
 */seed.txt
-gen-external-apklibs
+gen-external-apklibs

app/build.gradle

@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:18.0.+'
+    compile 'com.android.support:appcompat-v7:19.0.+'
     compile 'com.google.code.gson:gson:2.2.4'
     compile 'com.squareup.dagger:dagger:1.0.1'
     compile 'com.squareup.dagger:dagger-compiler:1.0.1'
@@ -36,12 +36,12 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion '18.0.1'
+    compileSdkVersion 19
+    buildToolsVersion '19.0.0'
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 18
+        targetSdkVersion 19
         versionCode 102
         versionName '1.0'
     }

app/default.properties

@@ -1,3 +1,3 @@
 
 # Project target.
-target=android-18
+target=android-19

app/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
+        android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -67,4 +67,4 @@
 
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/donnfelker/android/bootstrap/AndroidModule.java

@@ -19,54 +19,41 @@
 /**
  * Module for all Android related provisions
  */
-@Module
-(
-        complete = false,
-        library = true
-)
+@Module(complete = false, library = true)
 public class AndroidModule {
 
     @Provides
     @Singleton
-    Context provideAppContext()
-    {
+    Context provideAppContext() {
         return BootstrapApplication.getInstance().getApplicationContext();
     }
 
     @Provides
-    SharedPreferences provideDefaultSharedPreferences(final Context context)
-    {
+    SharedPreferences provideDefaultSharedPreferences(final Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context);
     }
 
     @Provides
-    PackageInfo providePackageInfo(Context context)
-    {
-        try
-        {
+    PackageInfo providePackageInfo(Context context) {
+        try {
             return context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-        }
-        catch (PackageManager.NameNotFoundException e)
-        {
+        } catch (PackageManager.NameNotFoundException e) {
             throw new RuntimeException(e);
         }
     }
 
     @Provides
-    TelephonyManager provideTelephonyManager(Context context)
-    {
+    TelephonyManager provideTelephonyManager(Context context) {
         return getSystemService(context, Context.TELEPHONY_SERVICE);
     }
 
     @SuppressWarnings("unchecked")
-    public <T> T getSystemService(Context context, String serviceConstant)
-    {
+    public <T> T getSystemService(Context context, String serviceConstant) {
         return (T) context.getSystemService(serviceConstant);
     }
 
     @Provides
-    InputMethodManager provideInputMethodManager(final Context context)
-    {
+    InputMethodManager provideInputMethodManager(final Context context) {
         return (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 

app/src/main/java/com/donnfelker/android/bootstrap/BootstrapApplication.java

@@ -2,15 +2,14 @@
 
 package com.donnfelker.android.bootstrap;
 
-import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Build.VERSION_CODES.FROYO;
 import android.app.Application;
 import android.app.Instrumentation;
 import android.content.Context;
 
 import com.github.kevinsawicki.http.HttpRequest;
 
-import dagger.ObjectGraph;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.Build.VERSION_CODES.FROYO;
 
 /**
  * Android Bootstrap application

app/src/main/java/com/donnfelker/android/bootstrap/BootstrapModule.java

@@ -5,12 +5,10 @@
 
 import com.donnfelker.android.bootstrap.authenticator.BootstrapAuthenticatorActivity;
 import com.donnfelker.android.bootstrap.authenticator.LogoutService;
-import com.donnfelker.android.bootstrap.core.CheckIn;
 import com.donnfelker.android.bootstrap.core.TimerService;
 import com.donnfelker.android.bootstrap.ui.BootstrapTimerActivity;
 import com.donnfelker.android.bootstrap.ui.CarouselActivity;
 import com.donnfelker.android.bootstrap.ui.CheckInsListFragment;
-import com.donnfelker.android.bootstrap.ui.ItemListFragment;
 import com.donnfelker.android.bootstrap.ui.NewsActivity;
 import com.donnfelker.android.bootstrap.ui.NewsListFragment;
 import com.donnfelker.android.bootstrap.ui.UserActivity;
@@ -26,25 +24,23 @@
  * Dagger module for setting up provides statements.
  * Register all of your entry points below.
  */
-@Module
-(
-        complete = false,
-
-        injects = {
-                BootstrapApplication.class,
-                BootstrapAuthenticatorActivity.class,
-                CarouselActivity.class,
-                BootstrapTimerActivity.class,
-                CheckInsListFragment.class,
-                NewsActivity.class,
-                NewsListFragment.class,
-                UserActivity.class,
-                UserListFragment.class,
-                TimerService.class
-        }
-
+@Module(
+    complete = false,
+
+    injects = {
+        BootstrapApplication.class,
+        BootstrapAuthenticatorActivity.class,
+        CarouselActivity.class,
+        BootstrapTimerActivity.class,
+        CheckInsListFragment.class,
+        NewsActivity.class,
+        NewsListFragment.class,
+        UserActivity.class,
+        UserListFragment.class,
+        TimerService.class
+    }
 )
-public class BootstrapModule  {
+public class BootstrapModule {
 
     @Singleton
     @Provides

app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java

@@ -7,10 +7,11 @@
 import com.donnfelker.android.bootstrap.authenticator.ApiKeyProvider;
 import com.donnfelker.android.bootstrap.core.BootstrapService;
 import com.donnfelker.android.bootstrap.core.UserAgentProvider;
-import javax.inject.Inject;
 
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 /**
  * Provider for a {@link com.donnfelker.android.bootstrap.core.BootstrapService} instance
  */
@@ -21,7 +22,7 @@ public class BootstrapServiceProvider {
 
     /**
      * Get service for configured key provider
-     * <p>
+     * <p/>
      * This method gets an auth key and so it blocks and shouldn't be called on the main thread.
      *
      * @return bootstrap service

app/src/main/java/com/donnfelker/android/bootstrap/Injector.java

@@ -2,19 +2,15 @@
 
 import dagger.ObjectGraph;
 
-public final class Injector
-{
+public final class Injector {
     public static ObjectGraph objectGraph = null;
 
 
     public static void init(final Object rootModule) {
 
-        if(objectGraph == null)
-        {
+        if (objectGraph == null) {
             objectGraph = ObjectGraph.create(rootModule);
-        }
-        else
-        {
+        } else {
             objectGraph = objectGraph.plus(rootModule);
         }
 
@@ -23,19 +19,16 @@ public static void init(final Object rootModule) {
 
     }
 
-    public static void init(final Object rootModule, final Object target)
-    {
+    public static void init(final Object rootModule, final Object target) {
         init(rootModule);
         inject(target);
     }
 
-    public static final void inject(final Object target)
-    {
+    public static void inject(final Object target) {
         objectGraph.inject(target);
     }
 
-    public static <T> T resolve(Class<T> type)
-    {
+    public static <T> T resolve(Class<T> type) {
         return objectGraph.get(type);
     }
 }

app/src/main/java/com/donnfelker/android/bootstrap/RootModule.java

@@ -5,11 +5,10 @@
 /**
  * Add all the other modules to this one.
  */
-@Module
-(
+@Module(
     includes = {
-            AndroidModule.class,
-            BootstrapModule.class
+        AndroidModule.class,
+        BootstrapModule.class
     }
 )
 public class RootModule {

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/AccountAuthenticatorService.java

@@ -1,11 +1,12 @@
 
 package com.donnfelker.android.bootstrap.authenticator;
 
-import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 
+import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT;
+
 /**
  * Authenticator service that returns a subclass of AbstractAccountAuthenticator in onBind()
  */
@@ -15,7 +16,7 @@ public class AccountAuthenticatorService extends Service {
 
     @Override
     public IBinder onBind(Intent intent) {
-        return intent.getAction().equals(ACTION_AUTHENTICATOR_INTENT) ? getAuthenticator().getIBinder() : null;
+        return ACTION_AUTHENTICATOR_INTENT.equals(intent.getAction()) ? getAuthenticator().getIBinder() : null;
     }
 
     private BootstrapAccountAuthenticator getAuthenticator() {

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java

@@ -2,19 +2,20 @@
 
 package com.donnfelker.android.bootstrap.authenticator;
 
-import static android.accounts.AccountManager.KEY_AUTHTOKEN;
-
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
 import android.accounts.AccountsException;
 import android.app.Activity;
 import android.os.Bundle;
 
 import com.donnfelker.android.bootstrap.core.Constants;
-import javax.inject.Inject;
 
 import java.io.IOException;
 
+import javax.inject.Inject;
+
+import static android.accounts.AccountManager.KEY_AUTHTOKEN;
+
 /**
  * Bridge class that obtains a API key for the currently configured account
  */

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAccountAuthenticator.java

@@ -1,13 +1,6 @@
 
 package com.donnfelker.android.bootstrap.authenticator;
 
-import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE;
-import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
-import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE;
-import static android.accounts.AccountManager.KEY_AUTHTOKEN;
-import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT;
-import static android.accounts.AccountManager.KEY_INTENT;
-import static com.donnfelker.android.bootstrap.authenticator.BootstrapAuthenticatorActivity.PARAM_AUTHTOKEN_TYPE;
 import android.accounts.AbstractAccountAuthenticator;
 import android.accounts.Account;
 import android.accounts.AccountAuthenticatorResponse;
@@ -16,9 +9,18 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+
 import com.donnfelker.android.bootstrap.core.Constants;
 import com.donnfelker.android.bootstrap.util.Ln;
 
+import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE;
+import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
+import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE;
+import static android.accounts.AccountManager.KEY_AUTHTOKEN;
+import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT;
+import static android.accounts.AccountManager.KEY_INTENT;
+import static com.donnfelker.android.bootstrap.authenticator.BootstrapAuthenticatorActivity.PARAM_AUTHTOKEN_TYPE;
+
 class BootstrapAccountAuthenticator extends AbstractAccountAuthenticator {
 
     private static final String DESCRIPTION_CLIENT = "Bootstrap for Android";
@@ -38,7 +40,7 @@ public BootstrapAccountAuthenticator(Context context) {
      */
     @Override
     public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType,
-            String[] requiredFeatures, Bundle options) throws NetworkErrorException {
+                             String[] requiredFeatures, Bundle options) throws NetworkErrorException {
         final Intent intent = new Intent(context, BootstrapAuthenticatorActivity.class);
         intent.putExtra(PARAM_AUTHTOKEN_TYPE, authTokenType);
         intent.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
@@ -61,6 +63,7 @@ public Bundle editProperties(AccountAuthenticatorResponse response, String accou
      * This method gets called when the
      * {@link com.donnfelker.android.bootstrap.authenticator.ApiKeyProvider#getAuthKey()} methods gets invoked.
      * This happens on a different process, so debugging it can be a beast.
+     *
      * @param response
      * @param account
      * @param authTokenType
@@ -70,7 +73,7 @@ public Bundle editProperties(AccountAuthenticatorResponse response, String accou
      */
     @Override
     public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType,
-            Bundle options) throws NetworkErrorException {
+                               Bundle options) throws NetworkErrorException {
 
         Ln.d("Attempting to get authToken");
 
@@ -97,7 +100,7 @@ public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account
 
     @Override
     public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType,
-            Bundle options) {
+                                    Bundle options) {
         return null;
     }
 }