Organization changes

PhenoApps · Jun 14, 2017 · f8b398a · f8b398a
1 parent fbd2b7e
commit f8b398a
Show file tree

Hide file tree

Showing 133 changed files with 4,720 additions and 1,976 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -80,7 +80,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
@@ -90,7 +89,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -108,9 +106,10 @@
     <orderEntry type="library" exported="" name="jxl-2.6.10" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="autofittextview-0.2.1" level="project" />
     <orderEntry type="library" exported="" name="design-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="log4j-1.2.14" level="project" />
-    <orderEntry type="module" module-name="dropboxChooserSDK" exported="" />
+    <orderEntry type="module" module-name="dropbox" exported="" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     compile 'com.android.support:support-v4:22.2.0'
     compile 'com.android.support:design:22.2.0'
     compile 'org.jsoup:jsoup:1.8.1'
+    compile 'me.grantland:autofittextview:0.2.1'
     compile 'net.sourceforge.jexcelapi:jxl:2.6.10'
-    compile project(':dropboxChooserSDK')
+    compile project(':dropbox')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/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="com.fieldbook.tracker"
-    android:versionCode="331"
-    android:versionName="3.3.1">
+    android:versionCode="400"
+    android:versionName="4.0.0">
 
     <uses-feature android:name="android.hardware.location" android:required="false"/>
 
@@ -43,7 +43,7 @@
         </activity>
 
         <activity
-            android:name=".Search.SearchActivity"
+            android:name=".search.SearchActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|locale"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -79,7 +79,16 @@
             android:theme="@style/ActivityDialog" />
 
         <activity
-            android:name=".Trait.TraitEditorActivity"
+            android:name=".traits.TraitEditorActivity"
+            android:alwaysRetainTaskState="false"
+            android:configChanges="keyboardHidden|orientation"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme" />
+
+        <activity
+            android:name=".fields.FieldEditorActivity"
             android:alwaysRetainTaskState="false"
             android:configChanges="keyboardHidden|orientation"
             android:finishOnTaskLaunch="true"
@@ -94,28 +103,28 @@
             android:theme="@style/ActivityDialog" />
 
         <activity
-            android:name=".Tutorial.TutorialMainActivity"
+            android:name=".tutorial.TutorialMainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|locale"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/AppDialog" />
 
         <activity
-            android:name=".Tutorial.TutorialSettingsActivity"
+            android:name=".tutorial.TutorialSettingsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|locale"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/AppDialog" />
 
         <activity
-            android:name=".Tutorial.TutorialTraitsActivity"
+            android:name=".tutorial.TutorialTraitsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|locale"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/AppDialog" />
 
         <activity
-            android:name=".Tutorial.TutorialFieldActivity"
+            android:name=".tutorial.TutorialFieldActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|locale"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"

diff --git a/app/src/main/java/com/fieldbook/tracker/ApiActivity.java b/app/src/main/java/com/fieldbook/tracker/ApiActivity.java
@@ -7,40 +7,43 @@
 import android.net.NetworkInfo;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 /**
  * API test Screen
  */
-public class ApiActivity extends Activity {
+public class ApiActivity extends AppCompatActivity {
 
     ListView settingsList;
-    private SharedPreferences ep;
-
-    TextView etResponse;
+    ListView resultsList;
 
     public static Activity thisActivity;
 
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -56,8 +59,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.api_test);
 
-        ep = getSharedPreferences("Settings", 0);
-        etResponse = (TextView) findViewById(R.id.etResponse);
+        SharedPreferences ep = getSharedPreferences("Settings", 0);
 
         thisActivity = this;
 
@@ -72,44 +74,47 @@ public void onCreate(Bundle savedInstanceState) {
         getBaseContext().getResources().updateConfiguration(config2,
                 getBaseContext().getResources().getDisplayMetrics());
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        getSupportActionBar().setTitle(null);
+        getSupportActionBar().getThemedContext();
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setHomeButtonEnabled(true);
+
+
         loadScreen();
     }
 
     private void loadScreen() {
-        if(getActionBar()!=null) {
-            getActionBar().setHomeButtonEnabled(true);
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-        }
-
         settingsList = (ListView) findViewById(R.id.myList);
 
-        String[] items2 = new String[]{ "Get crops","Get programs","Get studies","Get all traits","Get observation units"}; //TODO cleanup
+        String[] items2 = new String[]{ "Get crops","Get studies","Get all traits"};
 
         settingsList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> av, View arg1, int position, long arg3) {
                 switch (position) {
                     case 0:
-                        new HttpAsyncTask().execute("http://private-anon-33b7a6b43-brapi.apiary-mock.com/brapi/v1/crops");
+                        new HttpAsyncTask().execute("https://private-anon-cf3f621d16-brapi.apiary-mock.com/brapi/v1/crops");
                         break;
                     case 1:
-                        new HttpAsyncTask().execute("http://private-anon-33b7a6b43-brapi.apiary-mock.com/brapi/v1/programs");
+                        new HttpAsyncTask().execute("https://private-anon-cf3f621d16-brapi.apiary-mock.com/brapi/v1/studies-search");
                         break;
                     case 2:
-                        new HttpAsyncTask().execute("http://private-anon-33b7a6b43-brapi.apiary-mock.com/brapi/v1/studies?programId=1");
-                        break;
-                    case 3:
-                        new HttpAsyncTask().execute("http://private-anon-33b7a6b43-brapi.apiary-mock.com/brapi/v1/traits");
-                        break;
-                    case 4:
-                        new HttpAsyncTask().execute("http://private-anon-33b7a6b43-brapi.apiary-mock.com/brapi/v1/study/1/observationunits?observationLevel=plot&studyInstance=1");
+                        new HttpAsyncTask().execute("https://private-anon-cf3f621d16-brapi.apiary-mock.com/brapi/v1/studies/ST012/observationVariables");
                         break;
                 }
             }
         });
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, R.layout.listitem, items2);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.listitem, items2);
         settingsList.setAdapter(adapter);
+    }
 
+    private void createList(String[] items3) {
+        resultsList = (ListView) findViewById(R.id.myList2);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.listitem, items3);
+        resultsList.setAdapter(adapter);
     }
 
     @Override
@@ -123,7 +128,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     public static String GET(String url){
-        InputStream inputStream = null;
+        InputStream inputStream;
         String result = "";
         try {
 
@@ -151,7 +156,7 @@ public static String GET(String url){
 
     private static String convertInputStreamToString(InputStream inputStream) throws IOException {
         BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(inputStream));
-        String line = "";
+        String line;
         String result = "";
         while((line = bufferedReader.readLine()) != null)
             result += line;
@@ -169,17 +174,31 @@ public boolean isConnected(){
         else
             return false;
     }
+
     private class HttpAsyncTask extends AsyncTask<String, Void, String> {
         @Override
         protected String doInBackground(String... urls) {
 
             return GET(urls[0]);
         }
-        // onPostExecute displays the results of the AsyncTask.
+
         @Override
         protected void onPostExecute(String result) {
-            Toast.makeText(getBaseContext(), "Received!", Toast.LENGTH_LONG).show();
-            etResponse.setText(formatString(result));
+            try {
+                JSONObject jsonObj = new JSONObject(result);
+                JSONObject results = jsonObj.getJSONObject("result");
+                JSONArray data = results.getJSONArray("data");
+
+                String[] crops=new String[data.length()];
+                for(int i=0; i<crops.length; i++) {
+                    crops[i]=formatString(data.optString(i));
+                }
+
+                createList(crops);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+
         }
     }