Skip to content

Commit 67d4ac0

Browse files
wbrunettewbrunette
authored
Merge pull request #184 from odk-x/demo
release 2.1.8
2 parents 2683c74 + c7cb16c commit 67d4ac0

13 files changed

+224
-23
lines changed

‎LICENSE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:4.1.3'
1010
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8'
11-
classpath 'com.google.gms:google-services:4.3.4'
12-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
11+
classpath 'com.google.gms:google-services:4.3.5'
12+
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
1313
}
1414
}
1515

‎settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gradle.ext.gradleConfigVersion = 146
1+
gradle.ext.gradleConfigVersion = 150
22

33
if ( !gradle.ext.has('workspacePath') ) {
44
def env = System.getProperties();

‎tables_app/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,17 @@ allprojects {
124124
}
125125

126126
dependencies {
127-
implementation 'androidx.annotation:annotation:1.1.0'
127+
implementation 'androidx.annotation:annotation:1.2.0'
128128
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
129-
implementation 'androidx.fragment:fragment:1.2.5'
129+
implementation 'androidx.fragment:fragment:1.3.2'
130130
implementation 'androidx.preference:preference:1.1.1'
131131
implementation 'androidx.appcompat:appcompat:1.2.0'
132132
implementation 'androidx.recyclerview:recyclerview:1.1.0'
133-
implementation 'androidx.fragment:fragment:1.3.0-beta01'
133+
implementation 'com.google.android.material:material:1.3.0'
134134
implementation 'com.github.wbrunette:ProgressWheel:3.4'
135135

136-
implementation 'com.google.firebase:firebase-analytics:18.0.0'
137-
implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
136+
implementation 'com.google.firebase:firebase-analytics:18.0.2'
137+
implementation 'com.google.firebase:firebase-crashlytics:17.4.1'
138138

139139
implementation 'androidx.multidex:multidex:2.0.1'
140140

@@ -169,7 +169,7 @@ dependencies {
169169
androidTestUitestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
170170
androidTestUitestImplementation 'androidx.test.espresso:espresso-web:3.3.0'
171171
androidTestUitestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
172-
androidTestUitestImplementation 'androidx.annotation:annotation:1.1.0'
172+
androidTestUitestImplementation 'androidx.annotation:annotation:1.2.0'
173173

174174
//for UI Automator
175175
androidTestUitestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'

‎tables_app/src/androidTestUitest/AndroidManifest.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="org.opendatakit.tables.test">
4-
4+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
55
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
66
<uses-permission android:name="android.permission.INTERNET"/>
77
<uses-permission android:name="android.permission.SET_ANIMATION_SCALE"/>
88
<!--Use with adb shell pm grant org.opendatakit.tables android.permission.SET_ANIMATION_SCALE-->
9+
10+
<application
11+
android:requestLegacyExternalStorage="true"></application>
912
</manifest>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import androidx.preference.EditTextPreference;
2121
import androidx.preference.Preference;
2222
import android.widget.Toast;
23-
import org.apache.commons.lang3.StringUtils;
23+
2424
import org.opendatakit.activities.BaseActivity;
2525
import org.opendatakit.data.ColorRuleGroup;
2626
import org.opendatakit.data.utilities.ColumnUtil;
@@ -195,7 +195,7 @@ private void initializeElementKey() {
195195
*/
196196
private void initializeColumnType() {
197197
EditTextPreference pref = this.findEditTextPreference(Constants.PreferenceKeys.Column.TYPE);
198-
pref.setSummary(StringUtils.capitalize(retrieveColumnDefinition().getType().getElementType()));
198+
pref.setSummary(retrieveColumnDefinition().getType().getElementType().toUpperCase());
199199
}
200200

201201
/**

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -361,14 +361,14 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
361361
}
362362

363363
private void initializeTextColor() {
364-
EditColorPreference pref = (EditColorPreference) this
364+
EditColorPreference pref = this
365365
.findPreference(Constants.PreferenceKeys.ColorRule.TEXT_COLOR);
366366
pref.initColorPickerListener(this, COLOR_PREF_KEY_TEXT,
367367
getActivity().getString(R.string.text_color), this.mTextColor);
368368
}
369369

370370
private void initializeBackgroundColor() {
371-
EditColorPreference pref = (EditColorPreference) this
371+
EditColorPreference pref = this
372372
.findPreference(Constants.PreferenceKeys.ColorRule.BACKGROUND_COLOR);
373373
pref.initColorPickerListener(this, COLOR_PREF_KEY_BACKGROUND,
374374
getActivity().getString(R.string.background_color), this.mBackgroundColor);

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
396396
* Sets EditTextPreference for Survey form
397397
*/
398398
private void initializeDefaultForm() {
399-
EditTextPreference editFormPref = (EditTextPreference) this
399+
EditTextPreference editFormPref = this
400400
.findPreference(Constants.PreferenceKeys.Table.DEFAULT_FORM);
401401
final AbsTableActivity mActivity = ((AbsTableActivity) getActivity());
402402

@@ -492,7 +492,7 @@ public boolean onPreferenceClick(Preference preference) {
492492
* @throws ServicesAvailabilityException if the database is down
493493
*/
494494
private void initializeListFile(DbHandle db) throws ServicesAvailabilityException {
495-
FileSelectorPreference listPref = (FileSelectorPreference) this
495+
FileSelectorPreference listPref = this
496496
.findPreference(Constants.PreferenceKeys.Table.LIST_FILE);
497497
listPref.setFields(this, RequestCodeConsts.RequestCodes.CHOOSE_LIST_FILE,
498498
((IAppAwareActivity) getActivity()).getAppName());
@@ -508,7 +508,7 @@ private void initializeListFile(DbHandle db) throws ServicesAvailabilityExceptio
508508
* @throws ServicesAvailabilityException if the database is down
509509
*/
510510
private void initializeMapListFile(DbHandle db) throws ServicesAvailabilityException {
511-
FileSelectorPreference mapListPref = (FileSelectorPreference) this
511+
FileSelectorPreference mapListPref = this
512512
.findPreference(Constants.PreferenceKeys.Table.MAP_LIST_FILE);
513513
mapListPref.setFields(this, RequestCodeConsts.RequestCodes.CHOOSE_MAP_FILE,
514514
((IAppAwareActivity) getActivity()).getAppName());
@@ -527,7 +527,7 @@ private void initializeMapListFile(DbHandle db) throws ServicesAvailabilityExcep
527527
* @throws ServicesAvailabilityException if the database is down
528528
*/
529529
private void initializeDetailFile(DbHandle db) throws ServicesAvailabilityException {
530-
FileSelectorPreference detailPref = (FileSelectorPreference) this
530+
FileSelectorPreference detailPref = this
531531
.findPreference(Constants.PreferenceKeys.Table.DETAIL_FILE);
532532
detailPref.setFields(this, RequestCodeConsts.RequestCodes.CHOOSE_DETAIL_FILE,
533533
((IAppAwareActivity) getActivity()).getAppName());

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

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import android.content.Context;
1919
import androidx.preference.ListPreference;
2020
import android.util.AttributeSet;
21-
import android.view.ContextThemeWrapper;
2221
import org.opendatakit.activities.IAppAwareActivity;
2322
import org.opendatakit.data.TableViewType;
2423
import org.opendatakit.data.utilities.TableUtil;

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

-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@
2323
import android.util.DisplayMetrics;
2424
import android.view.ContextMenu;
2525
import android.view.View;
26-
import org.opendatakit.activities.IAppAwareActivity;
2726
import org.opendatakit.data.ColorGuide;
2827
import org.opendatakit.data.ColorGuideGroup;
2928
import org.opendatakit.data.ColorRuleGroup;
3029
import org.opendatakit.database.data.ColumnDefinition;
31-
import org.opendatakit.database.data.Row;
3230
import org.opendatakit.database.data.TypedRow;
3331
import org.opendatakit.logging.WebLogger;
3432
import org.opendatakit.provider.DataTableColumns;

‎tables_app/src/main/res/raw/configzip

0 Bytes
Binary file not shown.

‎tables_app/src/main/res/raw/systemzip

0 Bytes
Binary file not shown.

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

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

0 commit comments

Comments
 (0)