Skip to content

Commit 73147f3

Browse files
avanobberghenavanobberghen
authored
Merge pull request #4 from openimis/v1.2.0
Updated name and logo
2 parents fb8c29c + a3a57b3 commit 73147f3

File tree

13 files changed

+26
-155
lines changed

13 files changed

+26
-155
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
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 & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/sonarIssues.xml‎

Lines changed: 0 additions & 119 deletions
This file was deleted.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To make a copy of this project on your local machine, please clone
2626
the repository.
2727

2828
```
29-
git clone https://github.com/openimis/imis_android_app_java
29+
git clone https://github.com/openimis/openimis_android_app_java
3030
```
3131

3232
### Configuration
@@ -36,11 +36,11 @@ know the openIMIS Web Services domain (DNS or IP address) and to
3636
configure it in the tz.co.exact.imis.AppInformation java file.
3737

3838
```
39-
private static String _Domain = "http://132.148.151.32/";
39+
private static String _Domain = "http://demo.openimis.org/";
4040
```
4141

4242
For demo purposes, the default Web Services domain is set to the openIMIS
43-
demo server: demo.openimis.org (IP: 132.148.151.32).
43+
demo server: demo.openimis.org.
4444

4545
### Running the app
4646

@@ -54,7 +54,7 @@ and to build the APK. Manual deployment is required on each mobile device.
5454

5555
## Versioning
5656

57-
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/openimis/imis_android_app_java/tags).
57+
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/openimis/openimis_android_app_java/tags).
5858

5959
## License
6060

‎app/app.iml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,46 +70,40 @@
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7171
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7272
<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" />
8073
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8578
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8679
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
9594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9795
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
9896
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
10097
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
10298
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
10399
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
104100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
105101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
106102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
108103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
109104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
110105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
111106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
113107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
114108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
115109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
@@ -123,7 +117,6 @@
123117
<orderEntry type="sourceFolder" forTests="false" />
124118
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
125119
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-26.1.0" level="project" />
126-
<orderEntry type="library" name="Gradle: __local_aars__:C.\Dragos\projects\openimis\Github\imis_android_app_java\app\libs\zip4j-1.2.7.jar:unspecified@jar" level="project" />
127120
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
128121
<orderEntry type="library" name="Gradle: com.android.support:transition-26.1.0" level="project" />
129122
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-26.1.0" level="project" />
@@ -155,10 +148,7 @@
155148
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
156149
<orderEntry type="library" name="Gradle: com.android.support:design-26.1.0" level="project" />
157150
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
151+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vanobbea\Documents\GitHub\openimis_android_app_java\app\libs\zip4j-1.2.7.jar:unspecified@jar" level="project" />
158152
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
159153
</component>
160-
<component name="sonarModuleSettings">
161-
<option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />
162-
<option name="serverName" value="&lt;PROJECT&gt;" />
163-
</component>
164154
</module>

‎app/src/main/assets/pages/About.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ <h1 strName="app_name"></h1>
5353
<div>
5454
<ul class="ulList infoOnly">
5555
<li id="liUploadRenewals">
56-
<span class="lbl" id="Version" strName="Version"></span><span class="info" id="beta">18.1.2</span>
56+
<span class="lbl" id="Version" strName="Version"></span><span class="info" id="beta">1.2.0</span>
5757
</li>
5858
<li id="liUploadFeedback">
59-
<span class="lbl" id="ReleaseDate" strName="ReleaseDate"></span><span class="info">11 JULY 2018</span>
59+
<span class="lbl" id="ReleaseDate" strName="ReleaseDate"></span><span class="info">12 OCTOBER 2018</span>
6060
</li>
6161
</ul>
6262
</div>

‎app/src/main/res/mipmap-hdpi/ic_launcher.png‎

-2.01 KB
Loading

‎app/src/main/res/mipmap-mdpi/ic_launcher.png‎

-593 Bytes
Loading

‎app/src/main/res/mipmap-xhdpi/ic_launcher.png‎

-2.33 KB
Loading

‎app/src/main/res/mipmap-xxhdpi/ic_launcher.png‎

-5.89 KB
Loading

0 commit comments

Comments
 (0)