Skip to content

Commit

Permalink
Merge pull request #4 from openimis/v1.2.0
Browse files Browse the repository at this point in the history
Updated name and logo
  • Loading branch information
avanobberghen authored Oct 4, 2018
2 parents fb8c29c + a3a57b3 commit 73147f3
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 155 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

119 changes: 0 additions & 119 deletions .idea/sonarIssues.xml

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ To make a copy of this project on your local machine, please clone
the repository.

```
git clone https://github.com/openimis/imis_android_app_java
git clone https://github.com/openimis/openimis_android_app_java
```

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

```
private static String _Domain = "http://132.148.151.32/";
private static String _Domain = "http://demo.openimis.org/";
```

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

### Running the app

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

## Versioning

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).
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).

## License

Expand Down
26 changes: 8 additions & 18 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -70,46 +70,40 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
Expand All @@ -123,7 +117,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-26.1.0" level="project" />
<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" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:transition-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-26.1.0" level="project" />
Expand Down Expand Up @@ -155,10 +148,7 @@
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:design-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
<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" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
</component>
<component name="sonarModuleSettings">
<option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />
<option name="serverName" value="&lt;PROJECT&gt;" />
</component>
</module>
4 changes: 2 additions & 2 deletions app/src/main/assets/pages/About.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ <h1 strName="app_name"></h1>
<div>
<ul class="ulList infoOnly">
<li id="liUploadRenewals">
<span class="lbl" id="Version" strName="Version"></span><span class="info" id="beta">18.1.2</span>
<span class="lbl" id="Version" strName="Version"></span><span class="info" id="beta">1.2.0</span>
</li>
<li id="liUploadFeedback">
<span class="lbl" id="ReleaseDate" strName="ReleaseDate"></span><span class="info">11 JULY 2018</span>
<span class="lbl" id="ReleaseDate" strName="ReleaseDate"></span><span class="info">12 OCTOBER 2018</span>
</li>
</ul>
</div>
Expand Down
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">IMIS</string>
<string name="app_name">openIMIS</string>

<string name="navigation_drawer_open">Ouvrir le menu de navigation</string>
<string name="navigation_drawer_close">Fermer le menu de navigation</string>
<string name="action_settings">Réglages</string>

<string name="Pleasewait">Veuillez patienter...</string>
<string name="PageLoading">La page se charge...</string>
<string name="HeaderTitle">IMIS</string>
<string name="HeaderTitle">openIMIS</string>
<string name="HeaderEmail">[email protected]</string>
<string name="Home">Accueil</string>
<string name="Enrolment">Adhesion</string>
Expand Down Expand Up @@ -133,7 +133,7 @@
<string name="Scan">Scanner</string>
<string name="InsureeName">Nom d\'assuré</string>
<string name="ReadOnly">La carte SD est en mode lecture seule. Veuillez régler le mode de lecture/écriture et redémarrer l\'application.</string>
<string name="NoSDCard">IMIS a besoin d\'une carte mémoire externe pour fonctionner. Veuillez insérer la carte mémoire et redémarrer l\'application.</string>
<string name="NoSDCard">openIMIS a besoin d\'une carte mémoire externe pour fonctionner. Veuillez insérer la carte mémoire et redémarrer l\'application.</string>
<string name="ForceClose">Fermeture forcée</string>
<string name="MissingInsuranceNumber">Veuillez entrer le numéro d\'assurance</string>
<string name="InvalidInsuranceNumber">Invalid Insurance number</string>
Expand Down Expand Up @@ -221,7 +221,7 @@
<string name="AddEditPolicy">Ajouter/Modifier le contrat</string>
<string name="Premiums">Contributions</string>
<string name="AddEditPremium">Ajouter/Modifier la contribution</string>
<string name="QuitAppQuestion">Voulez-vous quitter IMIS ?</string>
<string name="QuitAppQuestion">Voulez-vous quitter openIMIS ?</string>
<string name="Go">OK</string>
<string name="Insuree">Assuré</string>
<string name="DuplicateHOF">Une famille avec ce numéro d\'assurance existe déjà.</string>
Expand Down Expand Up @@ -272,7 +272,7 @@
<string name="Confirm">Supprimer</string>
<string name="Logout">Déconnexion</string>
<string name="FamilyExists">La famille existe déjà dans le téléphone</string>
<string name="ContentTitle">La nouvelle version du IMIS est maintenant disponible.</string>
<string name="ContentTitle">La nouvelle version du openIMIS est maintenant disponible.</string>
<string name="ContentText">Cliquez ici pour télécharger.</string>
<string name="saving">Enregistrement...</string>
<string name="Interuption">Le processus a été interrompu. Veuillez vérifier votre connexion Internet.</string>
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<resources>
<string name="app_name">IMIS</string>
<string name="app_name">openIMIS</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="action_settings">Settings</string>
<string name="Pleasewait">Please wait…</string>
<string name="PageLoading">Page is loading…</string>
<string name="HeaderTitle">IMIS</string>
<string name="HeaderTitle">openIMIS</string>
<string name="HeaderEmail">[email protected]</string>
<string name="Home">Home</string>
<string name="Enrolment">Enrol</string>
Expand Down Expand Up @@ -129,7 +129,7 @@
<string name="Scan">Scan</string>
<string name="InsureeName">Insuree Name</string>
<string name="ReadOnly">SD Card is set to readonly mode. Please set the mode to read/write and restart the application.</string>
<string name="NoSDCard">IMIS needs external memory card to run. Please insert memory card and restart the application.</string>
<string name="NoSDCard">openIMIS needs external memory card to run. Please insert memory card and restart the application.</string>
<string name="ForceClose">Force Close</string>
<string name="MissingInsuranceNumber">Please enter Insurance number</string>
<string name="InvalidInsuranceNumber">Invalid Insurance number</string>
Expand Down Expand Up @@ -224,7 +224,7 @@
<string name="AddEditPolicy">Add/Edit Policy</string>
<string name="Premiums">Contributions</string>
<string name="AddEditPremium">Add/Edit Contribution</string>
<string name="QuitAppQuestion">Do you want to quit IMIS?</string>
<string name="QuitAppQuestion">Do you want to quit openIMIS?</string>
<string name="UploadFailureReport">Upload report</string>
<string name="Go">Go</string>
<string name="Insuree">Insuree</string>
Expand Down Expand Up @@ -274,7 +274,7 @@
<string name="Confirm">Delete</string>
<string name="Logout">Logout</string>
<string name="FamilyExists">Family already exists in phone</string>
<string name="ContentTitle">New release of IMIS is now available.</string>
<string name="ContentTitle">New release of openIMIS is now available.</string>
<string name="ContentText">Click here to download.</string>
<string name="saving">Saving...</string>
<string name="Interuption">Process has been Interuption please check your internet connection</string>
Expand Down

0 comments on commit 73147f3

Please sign in to comment.