Merge pull request #486 from fieldsight/485-hotfix/removes-old-survey

removes surveyform old ui; bumped version (#485)
fieldsight · Nov 16, 2019 · 6c47395 · 6c47395
2 parents 2b1f201 + e99b6be
commit 6c47395
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 238 deletions.
diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -23,7 +23,7 @@ def mapboxToken = secrets.getProperty('MAPBOX_ACCESS_TOKEN', '')
 
 def versionMajor = 3
 def versionMinor = 2
-def versionPatch = 14
+def versionPatch = 15
 
 android {
     compileSdkVersion(28)

diff --git a/collect_app/internal/output.json b/collect_app/internal/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3212,"versionName":"3.2.12-beta","enabled":true,"outputFile":"collect-internal3.2.12-beta.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal3.2.12-beta.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3214,"versionName":"3.2.14-beta","enabled":true,"outputFile":"collect-internal3.2.14-beta.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal3.2.14-beta.apk","properties":{}}]
diff --git a/collect_app/release/output.json b/collect_app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3213,"versionName":"3.2.13","enabled":true,"outputFile":"collect-release3.2.13.apk","fullName":"release","baseName":"release"},"path":"collect-release3.2.13.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3214,"versionName":"3.2.14","enabled":true,"outputFile":"collect-release3.2.14.apk","fullName":"release","baseName":"release"},"path":"collect-release3.2.14.apk","properties":{}}]
diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml
@@ -109,7 +109,6 @@ the specific language governing permissions and limitations under the License.
         <activity android:name="org.fieldsight.naxa.site.FragmentHostActivity" />
         <activity android:name="org.fieldsight.naxa.site.ProjectDashboardActivity" />
         <activity android:name="org.fieldsight.naxa.site.CreateSiteActivity" />
-        <activity android:name="org.fieldsight.naxa.survey.SurveyFormsActivity" />
         <activity android:name="org.fieldsight.naxa.submissions.PreviousSubmissionListActivity" />
         <activity android:name="org.fieldsight.naxa.submissions.PreviousSubmissionDetailActivity" />
         <activity android:name="org.fieldsight.naxa.notificationslist.NotificationListActivity" />

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/forms/ui/FieldSightFormListFragment.java b/collect_app/src/main/java/org/fieldsight/naxa/forms/ui/FieldSightFormListFragment.java
@@ -38,6 +38,7 @@ public static FieldSightFormListFragment newInstance(String loadFormType, Site s
         if (site == null) {
             site = new Site();
             site.setSite("0");
+            site.setId("0");
             site.setName(project.getName());
             site.setProject(project.getId());
         }

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormsActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormsActivity.java
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/v3/ProjectListActivityV3.java b/collect_app/src/main/java/org/fieldsight/naxa/v3/ProjectListActivityV3.java
@@ -106,7 +106,7 @@ public void onChanged() {
                         selected++;
                     }
                 }
-                Timber.d("PROJECT list counter is %d", selected);
+                Timber.d("project list counter is %d", selected);
                 if (selected > 0) {
                     tvSyncProject.setVisibility(View.VISIBLE);
                     tvSyncProject.setBackgroundColor(getResources().getColor(R.color.secondaryColor));

diff --git a/collect_app/src/main/res/layouts/fieldsight/layout/activity_survey_forms.xml b/collect_app/src/main/res/layouts/fieldsight/layout/activity_survey_forms.xml