MOBAPP-1234,MOBAPP-1236,MOBAPP-1237 issue fixed

Intelehealth · Nov 26, 2024 · 832e2bb · 832e2bb
1 parent 105b030
commit 832e2bb
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 24 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -368,7 +368,7 @@
         <activity
             android:name=".activities.searchPatientActivity.SearchPatientActivity_New"
             android:exported="false"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:theme="@style/AppTheme.NoActionBar.v2"
             android:windowSoftInputMode="adjustNothing|adjustPan" />
         <activity
             android:name=".appointmentNew.ScheduleAppointmentActivity_New"

diff --git a/...in/java/org/intelehealth/app/activities/patientDetailActivity/PatientDetailActivity2.java b/...in/java/org/intelehealth/app/activities/patientDetailActivity/PatientDetailActivity2.java
@@ -1019,13 +1019,13 @@ public void onItemSelected(PastVisitData pastVisitData) {
             mCurrentVisitsRecyclerView.setAdapter(pastVisitListingAdapter);
         }
         // allow now for follow-up visit even if open visit is there
-        /*if (mCurrentVisitDataList.isEmpty()) {
+        if (mCurrentVisitDataList.isEmpty()) {
             findViewById(R.id.cv_open_visits).setVisibility(View.GONE);
-            startVisitBtn.setVisibility(View.VISIBLE);
+            //startVisitBtn.setVisibility(View.VISIBLE);
         } else {
             findViewById(R.id.cv_open_visits).setVisibility(View.VISIBLE);
-            startVisitBtn.setVisibility(View.GONE);
-        }*/
+            //startVisitBtn.setVisibility(View.GONE);
+        }
         // }
     }
 

diff --git a/...n/java/org/intelehealth/app/activities/visitSummaryActivity/VisitSummaryActivity_New.java b/...n/java/org/intelehealth/app/activities/visitSummaryActivity/VisitSummaryActivity_New.java
@@ -2937,7 +2937,7 @@ private void startBookAppointment() {
     private void navigateToPreview() {
         Intent intent = new Intent(VisitSummaryActivity_New.this, VisitSummaryActivityPreview.class);
         Intent in = getIntent();
-        in.putExtra("IsFollowUpTypeVisit",mIsFollowUpTypeVisit);
+        in.putExtra("IsFollowUpTypeVisit", mIsFollowUpTypeVisit);
         intent.putExtras(in);
         startActivity(intent);
     }
@@ -5818,7 +5818,7 @@ private void setQAData() {
                     if (!cc_tempvalues.get(i).equalsIgnoreCase("") && cc_tempvalues.get(i).contains(":"))
                         mChiefComplainList.add(cc_tempvalues.get(i).substring(0, headerchips[i].indexOf(":")));
                 }
-                for (int i = 0; i < mChiefComplainList.size() ; i++) {
+                for (int i = 0; i < mChiefComplainList.size(); i++) {
                     if (mChiefComplainList.get(i).contains("Follow up visit") || mChiefComplainList.get(i).contains("दोबारा विजिट करना (फॉलो अप विजिट)")) {
                         mIsFollowUpTypeVisit = true;
                         break;
@@ -5984,11 +5984,23 @@ private void setQAData() {
 
         uiUpdateForFollowUpVisit();
     }
-    private void uiUpdateForFollowUpVisit(){
-        findViewById(R.id.flFacilityToVisit).setVisibility(!mIsFollowUpTypeVisit ? View.VISIBLE : View.GONE);
-        findViewById(R.id.flReferralFacility).setVisibility(!mIsFollowUpTypeVisit ? View.VISIBLE : View.GONE);
-        findViewById(R.id.flSeverity).setVisibility(!mIsFollowUpTypeVisit ? View.VISIBLE : View.GONE);
-        findViewById(R.id.flCloseCaseToVisit).setVisibility(!mIsFollowUpTypeVisit ? View.VISIBLE : View.GONE);
+
+    private void uiUpdateForFollowUpVisit() {
+        View flFacilityToVisit = findViewById(R.id.flFacilityToVisit);
+        View flReferralFacility = findViewById(R.id.flReferralFacility);
+        View flSeverity = findViewById(R.id.flSeverity);
+        View flCloseCaseToVisit = findViewById(R.id.flCloseCaseToVisit);
+        if (flFacilityToVisit.getVisibility() == View.VISIBLE && mIsFollowUpTypeVisit)
+            flFacilityToVisit.setVisibility(View.GONE);
+
+        if (flReferralFacility.getVisibility() == View.VISIBLE && mIsFollowUpTypeVisit)
+            flReferralFacility.setVisibility(View.GONE);
+
+        if (flSeverity.getVisibility() == View.VISIBLE && mIsFollowUpTypeVisit)
+            flSeverity.setVisibility(View.GONE);
+
+        if (flCloseCaseToVisit.getVisibility() == View.VISIBLE && mIsFollowUpTypeVisit)
+            flCloseCaseToVisit.setVisibility(View.GONE);
     }
 
 
@@ -6088,7 +6100,7 @@ public void onSelect(VisitSummaryData data) {
                 mComplainSummaryLinearLayout.addView(view);
             }
         }
-        for (int i = 0; i < mChiefComplainList.size() ; i++) {
+        for (int i = 0; i < mChiefComplainList.size(); i++) {
             if (mChiefComplainList.get(i).contains("Follow up visit") || mChiefComplainList.get(i).contains("दोबारा विजिट करना (फॉलो अप विजिट)")) {
                 mIsFollowUpTypeVisit = true;
                 break;

diff --git a/app/src/main/res/layout/activity_search_patient_new.xml b/app/src/main/res/layout/activity_search_patient_new.xml
@@ -57,7 +57,7 @@
                     android:hint="@string/search_txt_enter"
                     android:lineSpacingExtra="3sp"
                     android:textColor="@color/white"
-                    android:textColorHint="@color/white"
+                    android:textColorHint="@color/gray_1"
                     android:textSize="@dimen/fu_name_txt_size"
                     android:inputType="text"
                     android:imeOptions="actionSearch" />

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -25,6 +25,12 @@
         <item name="colorAccent">@color/colorPrimary</item>
     </style>
 
+    <style name="AppTheme.NoActionBar.v2">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="colorAccent">@color/white</item>
+    </style>
+
     <!-- UI 2.0 -->
     <style name="AppThemeMaterialNew" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
         <item name="colorPrimary">@color/colorPrimary</item>

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/core/build.gradle b/core/build.gradle
@@ -21,11 +21,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 20 12:38:29 IST 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+#Tue Nov 12 11:46:21 IST 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists