#OICI-7#OICI-8#OICI-5#OICI-19#OICI-14

.github/workflows/build.yml

@@ -0,0 +1,50 @@
+name: develop-comores
+
+on:
+  push:
+    branches: [ "develop-comores" ]
+  pull_request:
+    branches: [ "develop-comores" ]
+
+jobs:
+  build:
+    name: Build APK
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Decode keystore
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > policies_comores.jks
+
+      - name: Set up Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-disabled: true
+
+      - name: Build release APK
+        run: ./gradlew assembleComoresDevDebug
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Rename APK
+        run: mv app/build/outputs/apk/comoresDev/debug/app-comoresDev-debug.apk policies-comores-test.apk
+
+      - name: List APK files
+        run: ls -l policies-comores-test.apk
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: policies-comores-test.apk
+          path: policies-comores-test.apk

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - '*'
+      - 'develop-comores'
 #    tags:
 #      - '!v*'
 
@@ -27,26 +27,26 @@ jobs:
 
       - name: build
         run: |
-          ./gradlew assembleDebug --stacktrace
+          ./gradlew assemblecomoresDevDebug --stacktrace
 
       - name: Environment info
         run: |
           gradle --version
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: openimis-policies-apk-${{github.run_number}}-${{github.sha}}
+          name: policies-comores-apk-${{github.run_number}}.apk
           path: ./app/build/outputs/**/*.apk
 
       - name: build
         run: |
-          ./gradlew bundleDebug --stacktrace
+          ./gradlew bundlecomoresDevDebug --stacktrace
 
       - name: Environment info
         run: |
           gradle --version
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: openimis-policies-aab-${{github.run_number}}-${{github.sha}}
+          name: policies-comores-aab-${{github.run_number}}.aab
           path: ./app/build/outputs/**/*.aab

.github/workflows/manual.yml

@@ -6,35 +6,15 @@ on:
       api_base_url:
         description: URL of the REST API
         required: true
-        default: https://release.openimis.org/rest/
-      app_name:
-        description: Display name of the application
-        required: false
-        default: Policies Manual
-      app_dir:
-        description: Name of the folder in Documents, default IMIS-CLI
-        required: false
-      application_id:
-        description: Fully qualified name of the app
-        required: true
-        default: org.openimis.imispolicies.cli
-      cli_java_dir:
-        description: java source folder for custom functions. Only works with application_id_suffix .cli
-        required: false
-      cli_res_dir:
-        description: Resources folder for icons. Only works with application_id_suffix .cli
-        required: false
-      cli_assets_dir:
-        description: Asserts folder for images, json files.... Only works with .cli
-        required: false
+        default: https://test.amg.km/rest/
 # Branch is chosen by default in github manual actions
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup JDK 17
         uses: actions/setup-java@v2
@@ -43,14 +23,14 @@ jobs:
           java-version: '17'
           cache: 'gradle'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-${{ github.event.inputs.application_id }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.android
@@ -62,31 +42,19 @@ jobs:
           echo url ${{ github.event.inputs.api_base_url }}
           echo app name ${{ github.event.inputs.app_name }}
 
-          echo app dir ${{ github.event.inputs.app_dir }}
-          echo CLI_JAVA_DIR "${{ github.event.inputs.cli_java_dir }}"
-          echo CLI_RES_DIR "${{ github.event.inputs.cli_res_dir }}"
-          echo CLI_ASSETS_DIR "${{ github.event.inputs.cli_assets_dir }}"
-          echo APPLICATION_ID "${{ github.event.inputs.application_id }}"
-
       - name: build
         run: |
-          ./gradlew assembleCliDebug --stacktrace
+          ./gradlew assembleComoresDevDebug --stacktrace
         env:
           API_BASE_URL: "${{ github.event.inputs.api_base_url }}"
-          CLI_APP_NAME: "${{ github.event.inputs.app_name }}"
-          CLI_APP_DIR: "${{ github.event.inputs.app_dir }}"
-          CLI_JAVA_DIR: "${{ github.event.inputs.cli_java_dir }}"
-          CLI_RES_DIR: "${{ github.event.inputs.cli_res_dir }}"
-          CLI_ASSETS_DIR: "${{ github.event.inputs.cli_assets_dir }}"
-          APPLICATION_ID: "${{ github.event.inputs.application_id }}"
 
       - name: Environment info
         run: |
           gradle --version
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: openimis-policies-apk-${{github.run_number}}-${{github.sha}}
+          name: policies-comores-apk-${{github.run_number}}.apk
           path: ./app/build/outputs/**/*.apk
 
 #      - name: build

.gitignore

@@ -60,7 +60,7 @@ fastlane/test_output
 fastlane/readme.md
 
 app/release/output.json
-**/.DS_Store
+.DS_Store
 
 # Custom product flavours
 

LICENSE.md

@@ -11,3 +11,4 @@ Limitation of Liability
 In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who modifies and/or conveys the program as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the program to operate with any other programs), even if such holder or other party has been advised of the possibility of such damages.
 
 In case of dispute arising out or in relation to the use of the program, it is subject to the public law of Switzerland. The place of jurisdiction is Berne.
+

README.md

@@ -17,8 +17,6 @@ In order to use and develop the openIMIS IMIS Android Application
 on your local machine, you first need to install:
 
 * [Android Studio with Android SDK](https://developer.android.com/studio)
-* [openIMIS Web Services](https://github.com/openimis/web_service_vb)
-
 
 ### Installation
 

app/build.gradle

@@ -38,7 +38,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 33
         versionCode gitVersionCode
-        versionName gitVersionName
+        versionName "1.3.5"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables {
             useSupportLibrary = true
@@ -92,6 +92,13 @@ android {
             resValue "string", "app_name_policies", "Policies Release"
             dimension = 'std'
         }
+        comoresDev {
+            applicationId "org.openimis.imispolicies.comoresDev"
+            buildConfigField "String", "API_BASE_URL", '"https://dev.amg.km/"'
+            resValue "string", "app_name_policies", "Policies Comores Dev"
+            dimension = 'std'
+            resValue "string", "release_tag", "comores-dev"
+        }
         chfDev {
             applicationId "org.openimis.imispolicies.chfdev"
             buildConfigField "String", "API_BASE_URL", '"http://chf-dev.swisstph-mis.ch/"'
@@ -152,6 +159,9 @@ android {
         }
     }
     sourceSets {
+        comoresDev.java.srcDir 'src/master/java'
+        comoresDev.res.srcDirs = ['src/master/res', 'src/localeMv/res']
+
         chfDev.java.srcDir 'src/chf/java'
         chfDev.res.srcDirs = ['src/chf/res', 'src/localeChf/res']
 
@@ -244,5 +254,4 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testImplementation 'junit:junit:4.13.2'
 }

app/src/localeMv/res/values-en/strings.xml

@@ -207,6 +207,7 @@
     <string name="ReleaseDate">Release Date</string>
     <string name="TotalFamily">Total Families</string>
     <string name="TotalInsuree">Total Insurees</string>
+    <string name="TotalAttachments">Total Attachments</string>
     <string name="TotalPolicy">Total Policies</string>
     <string name="TotalPremium">Total Contributions</string>
     <string name="UploadEnrollment">Upload Enrolments</string>
@@ -477,4 +478,16 @@
     <string name="CurrentResourceLanguage">Current resource language: %1$s</string>
     <string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
     <string name="SupportedLanguages">Supported languages:\n%1$s</string>
+    <string name="PaymentDay">Payment day</string>
+    <string name="Periodicity">Periodicity</string>
+    <string name="CheckUpdate">Check for updates</string>
+
+    <!-- New dropdown selection strings -->
+    <string name="SelectNoDisability">Select disability</string>
+    <string name="SelectNonDisablingDisease">Select disease</string>
+    <string name="SelectMutualInsuranceCoverage">Select coverage</string>
+    <string name="SelectHousingType">Select housing</string>
+
+    <string name="MonogamousFamilyMember">Members of the monogamous household</string>
+    <string name="PolygamousHead">Heads of polygamous sub-households</string>
 </resources>