Reset + next step buttons (close #47)

inaturalist · Sep 10, 2015 · 163af94 · 163af94
1 parent faa20eb
commit 163af94
Show file tree

Hide file tree

Showing 43 changed files with 546 additions and 154 deletions.
diff --git a/androidswitchbackport/androidswitchbackport.iml b/androidswitchbackport/androidswitchbackport.iml
@@ -85,7 +85,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/iNaturalist/build.gradle b/iNaturalist/build.gradle
@@ -14,7 +14,6 @@ repositories {
     maven { url 'https://maven.fabric.io/public' }
 }
 
-
 android {
     compileSdkVersion 'Google Inc.:Google APIs:19'
     buildToolsVersion "22.0.1"

diff --git a/iNaturalist/iNaturalist.iml b/iNaturalist/iNaturalist.iml
@@ -95,7 +95,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.4.2 Google APIs" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android 4.4.2 Google APIs (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="floatingactionbutton-1.3.0" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-core-2.3.3" level="project" />

diff --git a/iNaturalist/src/main/AndroidManifest.xml b/iNaturalist/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.inaturalist.android"
-    android:versionCode="56"
-    android:versionName="1.3.23" >
+    android:versionCode="57"
+    android:versionName="1.4.0" >
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="15" />
 
@@ -189,8 +189,6 @@
             android:name=".TaxonTagPhotosViewer" >
         </activity>
 
-
-
         <provider
             android:authorities="org.inaturalist.android.observation;org.inaturalist.android.observation_photo;org.inaturalist.android.project;org.inaturalist.android.project_observation;org.inaturalist.android.project_field;org.inaturalist.android.project_field_value"
             android:name=".ObservationProvider" >
@@ -200,4 +198,4 @@
         <meta-data android:name="com.crashlytics.ApiKey" android:value="7baaee0ca8a376b3d129b908c1e03be6ecbe5786"/>
     </application>
 
-</manifest>
+</manifest>
diff --git a/iNaturalist/src/main/java/org/inaturalist/android/ActivityHelper.java b/iNaturalist/src/main/java/org/inaturalist/android/ActivityHelper.java
@@ -46,18 +46,6 @@ public void onClick(DialogInterface dialogInterface, int i) {
                 dialogInterface.cancel();
             }
         }, null);
-        /*
-        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-        builder.setMessage(msg)
-        .setTitle(title)
-        .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
-                dialog.cancel();
-            }
-        });
-        AlertDialog alert = builder.create();
-        alert.show();
-        */
     }
 
     public void confirm(int titleRes, Object msg, DialogInterface.OnClickListener okListener, DialogInterface.OnClickListener cancelListener) {