Skip to content

Commit 5292906

Browse files
dragos-dobredragos-dobre
committed
Update translations
Update version Update Apache library
1 parent dfbbd35 commit 5292906

File tree

15 files changed

+777
-691
lines changed

15 files changed

+777
-691
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ fastlane/readme.md
7474
.idea/sonarlint
7575

7676
# Visual Studio Code
77-
.vscode/
77+
.vscode/
78+
79+
release/

‎.idea/codeStyles/Project.xml‎

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CaptureActivity/CaptureActivity.iml‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":CaptureActivity" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.0.1" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.0.1" />
79
</configuration>
810
</facet>
911
<facet type="android" name="Android">
@@ -17,7 +19,7 @@
1719
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1820
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1921
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
2123
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2224
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2325
<option name="PROJECT_TYPE" value="1" />
@@ -33,14 +35,14 @@
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3537
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
3840
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3941
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4042
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4143
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4446
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4547
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4648
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
@@ -70,43 +72,25 @@
7072
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7173
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7274
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8075
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8176
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8277
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8378
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8479
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8580
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8681
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
10690
</content>
10791
<orderEntry type="jdk" jdkName="Android API 7 Platform" jdkType="Android SDK" />
10892
<orderEntry type="sourceFolder" forTests="false" />
109-
<orderEntry type="library" name="Gradle: __local_aars__:C.\zClaimsIntegration\claims_android_app_java\CaptureActivity\libs\core.jar:unspecified@jar" level="project" />
93+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Dragos\projects\openimis\Github\claim_android_app_java\CaptureActivity\libs\core.jar:unspecified@jar" level="project" />
11094
</component>
11195
<component name="sonarModuleSettings">
11296
<option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />

‎General/General.iml‎

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":General" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.0.1" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.0.1" />
79
</configuration>
810
</facet>
911
<facet type="android" name="Android">
@@ -17,7 +19,7 @@
1719
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1820
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1921
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
2123
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2224
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2325
<option name="PROJECT_TYPE" value="1" />
@@ -33,14 +35,14 @@
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3537
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
3840
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3941
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4042
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4143
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4446
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4547
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4648
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
@@ -70,44 +72,26 @@
7072
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7173
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7274
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8075
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8176
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8277
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8378
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8479
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8580
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8681
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
10690
</content>
10791
<orderEntry type="jdk" jdkName="Android API 7 Platform" jdkType="Android SDK" />
10892
<orderEntry type="sourceFolder" forTests="false" />
109-
<orderEntry type="library" name="Gradle: __local_aars__:C.\zClaimsIntegration\claims_android_app_java\General\libs\ksoap2-android-assembly-2.4-jar-with-dependencies.jar:unspecified@jar" level="project" />
110-
<orderEntry type="library" name="Gradle: __local_aars__:C.\zClaimsIntegration\claims_android_app_java\General\libs\commons-net-ftp-2.0.jar:unspecified@jar" level="project" />
93+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Dragos\projects\openimis\Github\claim_android_app_java\General\libs\commons-net-ftp-2.0.jar:unspecified@jar" level="project" />
94+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Dragos\projects\openimis\Github\claim_android_app_java\General\libs\ksoap2-android-assembly-2.4-jar-with-dependencies.jar:unspecified@jar" level="project" />
11195
</component>
11296
<component name="sonarModuleSettings">
11397
<option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />

0 commit comments

Comments
 (0)