Merge branch 'develop' into OP-2615

Author: zikani03

.github/workflows/main.yml

@@ -6,16 +6,20 @@ on:
       - '*'
 #    tags:
 #      - '!v*'
+  pull_request:
+    branches:
+      - '*'
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -31,7 +35,10 @@ jobs:
 
       - name: build
         run: |
-          ./gradlew assembleDebug --stacktrace
+          ./gradlew assembleDemoProdDebug --stacktrace
+
+      - name: Run gradle tests
+        run: ./gradlew testDemoProdDebugUnitTest
 
       - name: Environment info
         run: |
@@ -44,7 +51,7 @@ jobs:
 
       - name: build
         run: |
-          ./gradlew bundleDebug --stacktrace
+          ./gradlew bundleDemoProdDebug --stacktrace
 
       - name: Environment info
         run: |

.github/workflows/manual.yml

@@ -11,6 +11,10 @@ on:
         description: Display name of the application
         required: false
         default: Policies Manual
+      app_version:
+        description: Version of the application
+        required: true
+        default: v1.0.0
       app_dir:
         description: Name of the folder in Documents, default IMIS-CLI
         required: false
@@ -34,23 +38,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           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
@@ -88,11 +92,27 @@ jobs:
         run: |
           gradle --version
 
+      # Run Tests Build
+      - name: Run gradle tests
+        run: ./gradlew testCliDebugUnitTest
+
       - uses: actions/upload-artifact@v4
         with:
           name: openimis-policies-apk-${{github.run_number}}-${{github.sha}}
           path: ./app/build/outputs/**/*.apk
 
+      #publish in release
+      - name: Edit release ${{ github.event.inputs.app_version }}
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ github.event.inputs.app_version }} # Sets the release tag to the pushed tag name (e.g., v1.0.0)
+          name: ${{ github.event.inputs.app_version }} # Sets the release name to the pushed tag name (e.g., Release v1.0.0)
+          files: ./app/build/outputs/**/*.apk
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 #      - name: build
 #        run: |
 #          ./gradlew bundleDebug --stacktrace

.gitignore

@@ -60,12 +60,14 @@ fastlane/test_output
 fastlane/readme.md
 
 app/release/output.json
-.DS_Store
-*.DS_Store
-./.DS_Store
-./.git/.DS_Store
 
 # Custom product flavours
 
 *custom-flavours.gradle
 *.aab
+
+#DS_Store files
+*.DS_Store
+.DS_Store
+./.DS_Store
+./.git/.DS_Store

README.md

@@ -49,6 +49,7 @@ Parameters:
 * ```RAR_PASSWORD``` represents the password to be used for the offline extract. 
 * ```SHOW_CONTROL_NUMBER_MENU``` allow to show or hide the Control Number menu item in case the implementation does not implement the ePayment module. 
 * ```app_name_policies``` is a resource string allowing to change the name of the application.
+* ```sentry_dsn``` allow to define the sentry dsn of your project where error and exception events from your application will be sent
 
 Escape procedures can be configured and language resource files can be changed. Please follow the ```sourceSets``` record. Look in ```app\src\demo``` folder for an example. 
 

app/build.gradle

@@ -21,25 +21,25 @@ static def getDate() {
 }
 
 android {
-    compileSdk 34
+    compileSdk = 34
     namespace = "org.openimis.imispolicies"
     if (keystorePropertiesFile.exists()) {
         signingConfigs {
             releaseConfig {
-                storeFile file(keystoreProperties['storeFile'])
-                storePassword keystoreProperties['storePassword']
-                keyAlias keystoreProperties['keyAlias']
-                keyPassword keystoreProperties['keyPassword']
+                storeFile = file(keystoreProperties['storeFile'])
+                storePassword = keystoreProperties['storePassword']
+                keyAlias = keystoreProperties['keyAlias']
+                keyPassword = keystoreProperties['keyPassword']
             }
         }
     }
     defaultConfig {
-        applicationId "org.openimis.imispolicies"
-        minSdkVersion 21
-        targetSdkVersion 33
-        versionCode gitVersionCode
-        versionName gitVersionName
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        applicationId = "org.openimis.imispolicies"
+        minSdkVersion = 21
+        targetSdkVersion = 33
+        versionCode = gitVersionCode
+        versionName = gitVersionName
+        testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -52,11 +52,12 @@ android {
         buildConfigField "boolean", "IS_PAYMENT_ENABLED", 'false'
         resValue "string", "app_name_policies", "Policies"
         resValue "string", "ReleaseDateValue", getDate()
+        resValue "string", "sentry_dsn", ""
     }
     buildTypes {
         release {
-            minifyEnabled false
-            shrinkResources false
+            minifyEnabled = false
+            shrinkResources = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             debuggable = false
             if (keystorePropertiesFile.exists()) {
@@ -81,19 +82,19 @@ android {
     flavorDimensions = ['std']
     productFlavors {
         demoProd {
-            applicationId "org.openimis.imispolicies.demoProd"
+            applicationId = "org.openimis.imispolicies.demoProd"
             buildConfigField "String", "API_BASE_URL", '"https://demo.openimis.org/"'
             resValue "string", "app_name_policies", "Policies Demo"
             dimension = 'std'
         }
         demoRelease {
-            applicationId "org.openimis.imispolicies.demoRelease"
+            applicationId = "org.openimis.imispolicies.demoRelease"
             buildConfigField "String", "API_BASE_URL", '"https://release.openimis.org/"'
             resValue "string", "app_name_policies", "Policies Release"
             dimension = 'std'
         }
         chfDev {
-            applicationId "org.openimis.imispolicies.chfdev"
+            applicationId = "org.openimis.imispolicies.chfdev"
             buildConfigField "String", "API_BASE_URL", '"http://chf-dev.swisstph-mis.ch/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'true'
@@ -102,36 +103,36 @@ android {
             dimension = 'std'
         }
         mvDev {
-            applicationId "org.openimis.imispolicies.mv"
+            applicationId = "org.openimis.imispolicies.mv"
             buildConfigField "String", "API_BASE_URL", '"http://imis-mv.swisstph-mis.ch/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             buildConfigField "String", "API_VERSION", '"3"'
             resValue "string", "app_name_policies", "Policies MV DEV"
             dimension = 'std'
         }
         bephaDev {
-            applicationId "org.openimis.imispolicies.bepha"
+            applicationId = "org.openimis.imispolicies.bepha"
             buildConfigField "String", "API_BASE_URL", '"http://149.210.235.40/devupgrade/"'
             buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en-cm"'
             resValue "string", "app_name_policies", "Policies BEPHA DEV"
             dimension = 'std'
         }
         tchadDev {
-            applicationId "org.openimis.imispolicies.tchadDev"
+            applicationId = "org.openimis.imispolicies.tchadDev"
             buildConfigField "String", "API_BASE_URL", '"http://imis-tchad-dev.swisstph-mis.ch/"'
             resValue "string", "app_name_policies", "Policies TCHAD DEV"
             dimension = 'std'
         }
         local {
-            applicationId "org.openimis.imispolicies.local"
+            applicationId = "org.openimis.imispolicies.local"
             buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             resValue "string", "app_name_policies", "Policies Local"
             dimension = 'std'
             versionCode = gitVersionCodeTime
         }
         niger {
-            applicationId "org.openimis.imispolicies.niger"
+            applicationId = "org.openimis.imispolicies.niger"
             buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://192.168.0.100/') + '"'
             resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Polices Niger"
             dimension = 'std'
@@ -140,10 +141,10 @@ android {
             applicationIdSuffix System.getenv("APPLICATION_ID") ?: "org.openimis.imispolicies.cli"
             buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://10.0.2.2:35787/') + '"'
             resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Policies CLI"
-            dimension 'std'
+            dimension = 'std'
         }
         mauritaniaTrain {
-            applicationId "org.openimis.policies.mauritaniaTrain"
+            applicationId = "org.openimis.policies.mauritaniaTrain"
             buildConfigField "String", "API_BASE_URL", '"https://formation.cnass-mauritanie.swisstph-mis.ch/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'false'
             buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'false'
@@ -192,8 +193,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     packagingOptions {
@@ -203,7 +204,14 @@ android {
     }
 
     buildFeatures {
-        buildConfig true
+        buildConfig = true
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            returnDefaultValues = true
+        }
     }
 }
 
@@ -218,6 +226,14 @@ apollo {
     ]
 }
 
+tasks.withType(Test).configureEach {
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat = "full"
+        showStandardStreams = false
+    }
+}
+
 dependencies {
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
@@ -240,9 +256,16 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'cz.msebera.android:httpclient:4.5.8'
+    implementation 'androidx.test:core:1.7.0'
 
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+
+    // unit tests
     testImplementation 'junit:junit:4.13.2'
+    implementation 'io.sentry:sentry-android:8.25.0'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
+    testImplementation 'org.robolectric:robolectric:4.11.1'
 }
+

app/custom-flavours.gradle.dist

@@ -2,7 +2,7 @@
 android {
     productFlavors {
         example {
-            applicationId [APPLICATION_ID]
+            applicationId = [APPLICATION_ID]
             buildConfigField "String", "API_BASE_URL", [API_BASE_URL]
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", [SHOW_PAYMENT_MENU]
             buildConfigField "boolean", "SHOW_BULK_CN_MENU", [SHOW_BULK_CN_MENU]

app/robolectric.properties

@@ -0,0 +1,5 @@
+# app/src/test/resources/robolectric.properties
+
+# this line force Robolectric to use the legacy SQLite implementation
+# which is more stable and does not depend on native binaries.
+sqliteMode=LEGACY

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

@@ -482,4 +482,5 @@
     <string name="pay_type_cash">Cash</string>
     <string name="pay_type_mobile_phone">Téléphone portable</string>
     <string name="pay_type_bank_transfer">Virement banquaire</string>
+    <string name="Close">Fermer</string>
 </resources>

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

@@ -477,4 +477,5 @@
     <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="Close">Close</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -63,6 +63,8 @@
                 android:resource="@xml/paths" />
         </provider>
 
+        <meta-data android:name="io.sentry.dsn" android:value="@string/sentry_dsn" />
+
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|locale"