2.1.128 version

.gitlab-ci.yml

@@ -1,31 +1,63 @@
+# This file is a template, and might need editing before it works on your project.
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Android.gitlab-ci.yml
+
+# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny
+# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template.
+
 image: eclipse-temurin:17-jdk-jammy
 
 variables:
-  ANDROID_COMPILE_SDK: "34"
-  ANDROID_BUILD_TOOLS: "33.0.2"
-  ANDROID_SDK_TOOLS: "9477386"
-  
-  # Keystore credentials stored as GitLab CI/CD variables
-  KEYSTORE_PASSWORD: $KS_PASSWORD
-  KEY_ALIAS: $KS_ALIAS
-  KEY_PASSWORD: $KS_KEY_PASSWORD
 
+  # ANDROID_COMPILE_SDK is the version of Android you're compiling with.
+  # It should match compileSdkVersion.
+  ANDROID_COMPILE_SDK: "34"
+
+  # ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
+  # It should match buildToolsVersion.
+  ANDROID_BUILD_TOOLS: "33.0.2"
+
+  # It's what version of the command line tools we're going to download from the official site.
+  # Official Site-> https://developer.android.com/studio/index.html
+  # There, look down below at the cli tools only, sdk tools package is of format:
+  #        commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
+  # when the script was last modified for latest compileSdkVersion, it was which is written down below
+  ANDROID_SDK_TOOLS: "9477386"
+
+# Packages installation before running script
 before_script:
   - apt-get --quiet update --yes
   - apt-get --quiet install --yes wget unzip
+
+  # Setup path as android_home for moving/exporting the downloaded sdk into it
   - export ANDROID_HOME="${PWD}/android-sdk-root"
+  # Create a new directory at specified location
   - install -d $ANDROID_HOME
+  # Here we are installing androidSDK tools from official source,
+  # (the key thing here is the url from where you are downloading these sdk tool for command line, so please do note this url pattern there and here as well)
+  # after that unzipping those tools and
+  # then running a series of SDK manager commands to install necessary android SDK packages that'll allow the app to build
   - wget --no-verbose --output-document=$ANDROID_HOME/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
   - unzip -q -d "$ANDROID_HOME/cmdline-tools" "$ANDROID_HOME/cmdline-tools.zip"
   - mv -T "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/tools"
   - export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/cmdline-tools/tools/bin
+
+  # Nothing fancy here, just checking sdkManager version
   - sdkmanager --version
+
+  # use yes to accept all licenses
   - yes | sdkmanager --licenses > /dev/null || true
   - sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
   - sdkmanager "platform-tools"
   - sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
+
+  # Not necessary, but just for surity
   - chmod +x ./gradlew
 
+# Basic android and gradle stuff
+# Check linting
 lintDebug:
   interruptible: true
   stage: build
@@ -37,6 +69,7 @@ lintDebug:
     expose_as: "lint-report"
     when: always
 
+# Make Project
 assembleDebug:
   interruptible: true
   stage: build
@@ -45,68 +78,8 @@ assembleDebug:
   artifacts:
     paths:
       - app/build/outputs/
-      
-# Job for building signed release APK for tags containing "release" on any branch
-assembleRelease:
-  stage: build
-  script:
-    - |
-      if [[ "$CI_COMMIT_TAG" =~ release ]]; then
-        echo "Decoding keystore file from Base64"
-        
-        # Debug: Print the first few characters of BASE64_KEYSTORE
-        echo "First 20 characters of BASE64_KEYSTORE: ${BASE64_KEYSTORE:0:20}..."
-        
-        # Check if BASE64_KEYSTORE is a file path
-        if [[ "$BASE64_KEYSTORE" == /* ]] && [[ -f "$BASE64_KEYSTORE" ]]; then
-          echo "BASE64_KEYSTORE appears to be a file path. Reading content..."
-          BASE64_CONTENT=$(cat "$BASE64_KEYSTORE")
-        else
-          echo "BASE64_KEYSTORE is not a file path. Using as-is."
-          BASE64_CONTENT="$BASE64_KEYSTORE"
-        fi
-        
-        # Remove any potential whitespace or newline characters
-        CLEANED_KEYSTORE=$(echo "$BASE64_CONTENT" | tr -d '[:space:]')
-        
-        # Attempt to decode and save to a file
-        if echo "$CLEANED_KEYSTORE" | base64 -d > "$CI_PROJECT_DIR/app/keystore.jks" 2>/tmp/base64_error; then
-          echo "Keystore file decoded successfully"
-        else
-          echo "Error decoding keystore file:"
-          cat /tmp/base64_error
-          echo "First 20 characters of cleaned content: ${CLEANED_KEYSTORE:0:20}..."
-          exit 1
-        fi
-        
-        # Check if the keystore file was created and has content
-        if [ -s "$CI_PROJECT_DIR/app/keystore.jks" ]; then
-          echo "Keystore file created successfully"
-          # Print file size for verification
-          ls -l "$CI_PROJECT_DIR/app/keystore.jks"
-        else
-          echo "Error: Keystore file is empty or not created"
-          exit 1
-        fi
-        
-        echo "Building signed release APK"
-        ./gradlew assembleRelease \
-          -Pandroid.injected.signing.store.file="$CI_PROJECT_DIR/app/keystore.jks" \
-          -Pandroid.injected.signing.store.password="$KEYSTORE_PASSWORD" \
-          -Pandroid.injected.signing.key.alias="$KEY_ALIAS" \
-          -Pandroid.injected.signing.key.password="$KEY_PASSWORD"
-      else
-        echo "Tag '$CI_COMMIT_TAG' does not contain 'release'. Skipping release build."
-      fi
-  artifacts:
-    paths:
-      - app/build/outputs/
-    expire_in: never
-  rules:
-    - if: $CI_COMMIT_TAG =~ /release/
-      when: always
-    - when: never
 
+# Run all tests, if any fails, interrupt the pipeline(fail it)
 debugTests:
   needs: [lintDebug, assembleDebug]
   interruptible: true
@@ -125,4 +98,4 @@ publishTestResults:
   artifacts:
     when: always
     reports:
-      junit: app/build/test-results/testDebugUnitTest/*.xml
+      junit: app/build/test-results/testDebugUnitTest/*.xml

app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt

@@ -134,7 +134,7 @@ class PrefsFragment: PreferenceFragmentCompat(){
 
         // App Version Preference
         val appVersionPreference = Preference(requireContext())
-        appVersionPreference.title = "App Version SMI"
+        appVersionPreference.title = "App Version"
         appVersionPreference.summary =
             getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
 

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt

@@ -1458,39 +1458,21 @@ class HemoCubeFragment : Fragment() {
                     if (deviceRatioClass == "Negative Borderline") {
                         if (borderlineMetric < negativeBoderLine10mm1){//1.34
                             return "Sickle Cell Trait"
-                        }else if(borderlineMetric > negativeBoderLine10mm2){
+                        }else if(borderlineMetric > negativeBoderLine10mm1){
                             return "Normal"
-                        }else if(borderlineMetric > negativeBoderLine10mm1 && borderlineMetric < negativeBoderLine10mm2){
-                            return "Negative borderline. Confirm with HPLC"
+                        }else if(borderlineMetric == negativeBoderLine10mm1){
+                            return "Sickle Cell Trait"
                         }
                     }
                     if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
                         if (borderlineMetric < positiveBoderLine10mm1){//1.34
                             return "Sickle Cell Disease"
-                        }else if(borderlineMetric > positiveBoderLine10mm2){
+                        }else if(borderlineMetric > positiveBoderLine10mm1){
                             return "Sickle Cell Trait"
-                        }else if(borderlineMetric > positiveBoderLine10mm1 && borderlineMetric < positiveBoderLine10mm2){
-                            return "Positive for Sickle Cell. Confirm with HPLC"
+                        }else if(borderlineMetric == positiveBoderLine10mm1){
+                            return "Sickle Cell Disease"
                         }
                     }
-//                    if (deviceRatioClass == "Negative Borderline") {
-//                        if (borderlineMetric < negativeBoderLine10mm1){//1.34
-//                            return "Sickle Cell Trait"
-//                        }else if(borderlineMetric > negativeBoderLine10mm1){
-//                            return "Normal"
-//                        }else if(borderlineMetric == negativeBoderLine10mm1){
-//                            return "Sickle Cell Trait"
-//                        }
-//                    }
-//                    if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-//                        if (borderlineMetric < positiveBoderLine10mm1){//1.34
-//                            return "Sickle Cell Disease"
-//                        }else if(borderlineMetric > positiveBoderLine10mm1){
-//                            return "Sickle Cell Trait"
-//                        }else if(borderlineMetric == positiveBoderLine10mm1){
-//                            return "Sickle Cell Disease"
-//                        }
-//                    }
                 }else if(cuvetteSize == "2mm"){
                     if (deviceRatioClass == "Negative Borderline") {
                         if (borderlineMetric < negativeBoderLine2mm1){//1.34

app/src/test/java/com/example/hpostesting/HemoCubeFragmentTest.kt

@@ -390,7 +390,7 @@ class HemoCubeFragmentTest {
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait1() {
         val result =
             hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
-        assertEquals("Negative borderline. Confirm with HPLC", result)
+        assertEquals("Normal", result)
     }
 
     @Test
@@ -400,7 +400,7 @@ class HemoCubeFragmentTest {
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.4
         )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
@@ -410,7 +410,7 @@ class HemoCubeFragmentTest {
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.33
         )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test