fix conflicts

Author: vaneck237

.github/workflows/main.yml

@@ -6,19 +6,22 @@ on:
       - '*'
 #    tags:
 #      - '!v*'
+  pull_request:
+    branches:
+      - '*'
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v5
+      - name: Setup JDK 17
+        uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: 'zulu'
+          java-version: '17'
           cache: 'gradle'
 
       - name: Environment info
@@ -37,6 +40,9 @@ jobs:
         run: |
           gradle --version
 
+      - name: Run gradle tests
+        run: ./gradlew testDemoProdDebugUnitTest --stacktrace
+
       - uses: actions/upload-artifact@v4
         with:
           name: openimis-claims-apk-${{github.run_number}}-${{github.sha}}

.github/workflows/manual.yml

@@ -11,6 +11,10 @@ on:
         description: Display name of the application
         required: false
         default: Claims 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
@@ -30,13 +34,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Setup JDK 11
-        uses: actions/setup-java@v2
+      - name: Setup JDK 17
+        uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: 'zulu'
+          java-version: '17'
           cache: 'gradle'
 
       - name: Environment info
@@ -64,11 +68,27 @@ jobs:
         run: |
           gradle --version
 
+      # Run Tests Build
+      - name: Run gradle tests
+        run: ./gradlew testCliDebugUnitTest --stacktrace
+
       - uses: actions/upload-artifact@v4
         with:
           name: openimis-claims-apk-${{github.run_number}}-${{github.sha}}
           path: ./claimManagement/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

@@ -26,6 +26,9 @@ proguard/
 # Log Files
 *.log
 
+# Java heap dump files
+*.hprof
+
 # Android Studio Navigation editor temp files
 .navigation/
 
@@ -76,9 +79,13 @@ fastlane/readme.md
 
 # Visual Studio Code
 .vscode/
+./.DS_Store
+./.git/.DS_Store
+*.DS_Store
 
 
 # Custom product flavours
 *custom-flavours.gradle
-
 .DS_Store
+*.properties
+./gradle

README.md

@@ -39,7 +39,10 @@ private String _Domain = "http://132.148.151.32/";
 ```
 
 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 (IP: 132.148.151.32).
+
+If you want to receive error and exception events in sentry
+you can set `sentry_dsn` in build.gradle file
 
 ### Running the app
 

claimManagement/build.gradle

@@ -27,7 +27,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 32
         versionCode 4
-        versionName "2.0.5"
+        versionName "2.0.6"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
@@ -62,6 +62,7 @@ android {
         buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"'
         buildConfigField "String", "API_VERSION", '"3"'
         resValue "string", "release_tag", "release/25.04"
+        resValue "string", "sentry_dsn", ""
     }
 
     productFlavors {
@@ -180,6 +181,13 @@ android {
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            returnDefaultValues = true
+        }
+    }
 }
 
 apollo {
@@ -193,6 +201,13 @@ apollo {
     ]
 }
 
+tasks.withType(Test).configureEach {
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat "full"
+        showStandardStreams = false
+    }
+}
 
 // Apply custom flavours
 if(file('custom-flavours.gradle').exists()){
@@ -215,10 +230,15 @@ dependencies {
     implementation ('com.apollographql.apollo:apollo-android-support:2.5.14'){
         because("Apollo 3+ only works with Kotlin coroutines")
     }
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
+    testImplementation 'org.robolectric:robolectric:4.11.1'
+    testImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test:core:1.5.0'
     implementation group: 'com.squareup.picasso', name: 'picasso', version: '2.71828'
     implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.2.7'
+    implementation 'io.sentry:sentry-android:8.25.0'
 
 }

claimManagement/.DS_Store claimManagement/fakedatabaseclaimManagement/.DS_Store renamed to claimManagement/fakedatabase

@@ -57,6 +57,10 @@
                 android:resource="@xml/paths" />
         </provider>
 
+        <meta-data
+            android:name="io.sentry.dsn"
+            android:value="@string/sentry_dsn" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

.DS_Store claimManagement/fakemapping.DS_Store renamed to claimManagement/fakemapping

@@ -1,4 +1,4 @@
-query GetHealthFacility ($offset: Int){
+query GetHealthFacilities ($offset: Int){
     healthFacilities(offset: $offset) {
         pageInfo {
           hasNextPage