Merge pull request #34 from caseydavenport/google-drive

Google Drive support
caseydavenport · Jan 7, 2016 · 6aac669 · 6aac669
2 parents bbb66e6 + f566345
commit 6aac669
Show file tree

Hide file tree

Showing 19 changed files with 265 additions and 92 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest
     package="com.biermacht.brews"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="19"
-    android:versionName="1.1.0">
+    android:versionCode="20"
+    android:versionName="1.1.1">
 
     <uses-sdk
         android:minSdkVersion="15"
@@ -26,6 +26,10 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="com.google.android.apps.drive.DRIVE_OPEN"/>
+                <data android:mimeType="application/vnd.google-apps.drive-sdk.1234567890"/>
+            </intent-filter>
         </activity>
         <activity
             android:name=".frontend.DisplayRecipeActivity"

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,8 @@ apply plugin: 'com.android.application'
 dependencies {
     compile "com.android.support:support-v4:22.2.0"
     compile "com.android.support:appcompat-v7:21.0.+"
-    compile 'com.android.support:design:22.2.0'
+    compile "com.android.support:design:22.2.0"
+    compile "com.google.android.gms:play-services-drive:8.3.0"
     compile files("libs/commons-lang3-3.4/commons-lang3-3.4.jar")
 }
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -39,6 +39,7 @@
     <string name="calculate">Calculate</string>
     <string name="export">Export</string>
     <string name="cancel">Cancel</string>
+    <string name="browse">Browse</string>
     <string name="done">Done</string>
     <string name="ok">OK</string>
     <string name="reset">Reset</string>
@@ -113,4 +114,9 @@
     <string name="recipe_copied">1 Recipe Copied</string>
     <string name="recipe_exported">1 Recipe Exported</string>
 
+    <!-- Alert Dialog Messages -->
+    <string name="import_recipes_title">Import Recipe(s) from XML</string>
+    <string name="import_recipes_msg">Select a BeerXML (.xml) or BeerSmith2 (.bsmx) file to import recipes.</string>
+    <string name="import_recipes_drive_button">GDrive</string>
+
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
@@ -11,7 +11,8 @@
 
         <!-- Settings for ContextActionBar -->
         <item name="android:windowActionModeOverlay">true</item>
-        <item name="actionModeBackground">@color/context_action_bar_bg</item> (or)
+        <item name="actionModeBackground">@color/context_action_bar_bg</item>
+        (or)
         <item name="android:actionModeBackground">@color/context_action_bar_bg</item>
 
         <!-- Use custom AlertDialog theme -->

diff --git a/src/com/biermacht/brews/database/DatabaseAPI.java b/src/com/biermacht/brews/database/DatabaseAPI.java
@@ -17,7 +17,7 @@
 public class DatabaseAPI {
 
   public static DatabaseInterface newDatabaseInterface(Context c) {
-        return new DatabaseInterface(c);
+    return new DatabaseInterface(c);
   }
 
   // Get all recipes in database, sorted

diff --git a/src/com/biermacht/brews/frontend/DisplayRecipeActivity.java b/src/com/biermacht/brews/frontend/DisplayRecipeActivity.java
@@ -76,8 +76,8 @@ public void onPageScrollStateChanged(int state) {
   }
 
   /**
-   * TODO: This creates an entire new pager adapter adapter in order to update the UI.  It would be nice
-   * if we could just update things in place, without having to create / destroy so many
+   * TODO: This creates an entire new pager adapter adapter in order to update the UI.  It would be
+   * nice if we could just update things in place, without having to create / destroy so many
    * objects.
    */
   public void updatePagerAdater() {

diff --git a/src/com/biermacht/brews/frontend/IngredientActivities/AddCustomHopsActivity.java b/src/com/biermacht/brews/frontend/IngredientActivities/AddCustomHopsActivity.java
@@ -18,12 +18,12 @@ public void onCreate(Bundle savedInstanceState) {
 
     // Set views
     this.setViews(Arrays.asList(nameView,
-            amountView,
-            timeView,
-            formSpinner,
-            useSpinner,
-            alphaAcidView,
-            descriptionView));
+                                amountView,
+                                timeView,
+                                formSpinner,
+                                useSpinner,
+                                alphaAcidView,
+                                descriptionView));
     if (! haveRecipe()) {
       timeView.setVisibility(View.GONE);
       amountView.setVisibility(View.GONE);

diff --git a/src/com/biermacht/brews/frontend/IngredientActivities/EditCustomHopActivity.java b/src/com/biermacht/brews/frontend/IngredientActivities/EditCustomHopActivity.java
@@ -14,10 +14,10 @@ public void onCreate(Bundle savedInstanceState) {
 
     // Set views
     this.setViews(Arrays.asList(nameView,
-            formSpinner,
-            useSpinner,
-            alphaAcidView,
-            descriptionView));
+                                formSpinner,
+                                useSpinner,
+                                alphaAcidView,
+                                descriptionView));
 
     // Set values for the given hop
     setValues(hop);