Merge pull request #184 from odk-x/demo

release 2.1.8

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

build.gradle

@@ -6,10 +6,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8'
-        classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
+        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
     }
 }
 

settings.gradle

@@ -1,4 +1,4 @@
-gradle.ext.gradleConfigVersion = 146
+gradle.ext.gradleConfigVersion = 150
 
 if ( !gradle.ext.has('workspacePath') ) {
 	def env = System.getProperties();

tables_app/build.gradle

@@ -124,17 +124,17 @@ allprojects {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.fragment:fragment:1.2.5'
+    implementation 'androidx.fragment:fragment:1.3.2'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.fragment:fragment:1.3.0-beta01'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'com.github.wbrunette:ProgressWheel:3.4'
 
-    implementation 'com.google.firebase:firebase-analytics:18.0.0'
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
+    implementation 'com.google.firebase:firebase-analytics:18.0.2'
+    implementation 'com.google.firebase:firebase-crashlytics:17.4.1'
 
     implementation 'androidx.multidex:multidex:2.0.1'
 
@@ -169,7 +169,7 @@ dependencies {
     androidTestUitestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
     androidTestUitestImplementation 'androidx.test.espresso:espresso-web:3.3.0'
     androidTestUitestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
-    androidTestUitestImplementation 'androidx.annotation:annotation:1.1.0'
+    androidTestUitestImplementation 'androidx.annotation:annotation:1.2.0'
 
     //for UI Automator
     androidTestUitestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'

tables_app/src/androidTestUitest/AndroidManifest.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.opendatakit.tables.test">
-
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.SET_ANIMATION_SCALE"/>
     <!--Use with adb shell pm grant org.opendatakit.tables android.permission.SET_ANIMATION_SCALE-->
+
+    <application
+        android:requestLegacyExternalStorage="true"></application>
 </manifest>

tables_app/src/main/java/org/opendatakit/tables/fragments/ColumnPreferenceFragment.java

@@ -20,7 +20,7 @@
 import androidx.preference.EditTextPreference;
 import androidx.preference.Preference;
 import android.widget.Toast;
-import org.apache.commons.lang3.StringUtils;
+
 import org.opendatakit.activities.BaseActivity;
 import org.opendatakit.data.ColorRuleGroup;
 import org.opendatakit.data.utilities.ColumnUtil;
@@ -195,7 +195,7 @@ private void initializeElementKey() {
    */
   private void initializeColumnType() {
     EditTextPreference pref = this.findEditTextPreference(Constants.PreferenceKeys.Column.TYPE);
-    pref.setSummary(StringUtils.capitalize(retrieveColumnDefinition().getType().getElementType()));
+    pref.setSummary(retrieveColumnDefinition().getType().getElementType().toUpperCase());
   }
 
   /**

tables_app/src/main/java/org/opendatakit/tables/fragments/EditColorRuleFragment.java

@@ -361,14 +361,14 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
   }
 
   private void initializeTextColor() {
-    EditColorPreference pref = (EditColorPreference) this
+    EditColorPreference pref = this
         .findPreference(Constants.PreferenceKeys.ColorRule.TEXT_COLOR);
     pref.initColorPickerListener(this, COLOR_PREF_KEY_TEXT,
         getActivity().getString(R.string.text_color), this.mTextColor);
   }
 
   private void initializeBackgroundColor() {
-    EditColorPreference pref = (EditColorPreference) this
+    EditColorPreference pref = this
         .findPreference(Constants.PreferenceKeys.ColorRule.BACKGROUND_COLOR);
     pref.initColorPickerListener(this, COLOR_PREF_KEY_BACKGROUND,
         getActivity().getString(R.string.background_color), this.mBackgroundColor);

tables_app/src/main/java/org/opendatakit/tables/fragments/TablePreferenceFragment.java

@@ -396,7 +396,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
    * Sets EditTextPreference for Survey form
    */
   private void initializeDefaultForm() {
-    EditTextPreference editFormPref = (EditTextPreference) this
+    EditTextPreference editFormPref = this
         .findPreference(Constants.PreferenceKeys.Table.DEFAULT_FORM);
     final AbsTableActivity mActivity = ((AbsTableActivity) getActivity());
 
@@ -492,7 +492,7 @@ public boolean onPreferenceClick(Preference preference) {
    * @throws ServicesAvailabilityException if the database is down
    */
   private void initializeListFile(DbHandle db) throws ServicesAvailabilityException {
-    FileSelectorPreference listPref = (FileSelectorPreference) this
+    FileSelectorPreference listPref = this
         .findPreference(Constants.PreferenceKeys.Table.LIST_FILE);
     listPref.setFields(this, RequestCodeConsts.RequestCodes.CHOOSE_LIST_FILE,
         ((IAppAwareActivity) getActivity()).getAppName());
@@ -508,7 +508,7 @@ private void initializeListFile(DbHandle db) throws ServicesAvailabilityExceptio
    * @throws ServicesAvailabilityException if the database is down
    */
   private void initializeMapListFile(DbHandle db) throws ServicesAvailabilityException {
-    FileSelectorPreference mapListPref = (FileSelectorPreference) this
+    FileSelectorPreference mapListPref = this
         .findPreference(Constants.PreferenceKeys.Table.MAP_LIST_FILE);
     mapListPref.setFields(this, RequestCodeConsts.RequestCodes.CHOOSE_MAP_FILE,
         ((IAppAwareActivity) getActivity()).getAppName());
@@ -527,7 +527,7 @@ private void initializeMapListFile(DbHandle db) throws ServicesAvailabilityExcep
    * @throws ServicesAvailabilityException if the database is down
    */
   private void initializeDetailFile(DbHandle db) throws ServicesAvailabilityException {
-    FileSelectorPreference detailPref = (FileSelectorPreference) this
+    FileSelectorPreference detailPref = this
         .findPreference(Constants.PreferenceKeys.Table.DETAIL_FILE);
     detailPref.setFields(this, RequestCodeConsts.RequestCodes.CHOOSE_DETAIL_FILE,
         ((IAppAwareActivity) getActivity()).getAppName());

tables_app/src/main/java/org/opendatakit/tables/preferences/DefaultViewTypePreference.java

@@ -18,7 +18,6 @@
 import android.content.Context;
 import androidx.preference.ListPreference;
 import android.util.AttributeSet;
-import android.view.ContextThemeWrapper;
 import org.opendatakit.activities.IAppAwareActivity;
 import org.opendatakit.data.TableViewType;
 import org.opendatakit.data.utilities.TableUtil;

tables_app/src/main/java/org/opendatakit/tables/views/TabularView.java

@@ -23,12 +23,10 @@
 import android.util.DisplayMetrics;
 import android.view.ContextMenu;
 import android.view.View;
-import org.opendatakit.activities.IAppAwareActivity;
 import org.opendatakit.data.ColorGuide;
 import org.opendatakit.data.ColorGuideGroup;
 import org.opendatakit.data.ColorRuleGroup;
 import org.opendatakit.database.data.ColumnDefinition;
-import org.opendatakit.database.data.Row;
 import org.opendatakit.database.data.TypedRow;
 import org.opendatakit.logging.WebLogger;
 import org.opendatakit.provider.DataTableColumns;

tables_app/src/main/res/values-es/strings.xml

@@ -386,7 +386,7 @@
     <string name="file_not_under_app_dir">Archivo no se encuentra dentro del directorio %1$s</string>
     <string name="no_form_id_specified">Se debe especificar el Id de formularios</string>
     <string name="survey_not_installed">ODK-X Survey no esta instalado</string>
-    <string name="collect_not_installed">ODK Collect no installado</string>
+    <string name="collect_not_installed">ODK Collect no instalado</string>
     <string name="unable_to_save_db_changes">No se puede guardar cambios en el base de datos</string>
     <string name="unable_to_retrieve_form_type">No se puede encontrar el tipo de formulario</string>
     <!-- TODO should probably be "select app" or similar -->