From b0c2209af841db8797a47b6f27649a433c440291 Mon Sep 17 00:00:00 2001 From: 14Sandee Date: Thu, 23 Nov 2023 21:02:29 +0530 Subject: [PATCH] , --- .idea/deploymentTargetDropDown.xml | 12 ----- .../simplitend/appblocking/FUAActivity.java | 2 - .../simplitend/articles/ArticleResult.java | 8 ++-- .../fragments/PatientProfileInfoFragment.java | 25 +++++++++- .../medreminder/mvvm/models/Frequency.java | 14 +++--- .../mvvm/models/MedicationType.java | 14 +++--- app/src/main/res/layout/add_medical_info.xml | 6 --- .../main/res/layout/add_routine_fragment.xml | 2 - .../res/layout/caregiver_dash_fragment.xml | 3 +- .../main/res/layout/medical_into_fragment.xml | 46 +++++++++---------- .../main/res/layout/my_patient_fragment.xml | 3 +- 11 files changed, 68 insertions(+), 67 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index dc4438c..03d9c98 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,18 +1,6 @@ - - - - - - - - - - - - diff --git a/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java b/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java index e8bf857..646ef50 100644 --- a/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java +++ b/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java @@ -43,8 +43,6 @@ import java.util.List; public class FUAActivity extends AppCompatActivity { - private static final String TAG = "aditya"; - SwitchCompat swBlock; RecyclerView rvApps, rvWhiteApps; MyAppsAdapter adapter, whiteListAdapter; diff --git a/app/src/main/java/com/app/simplitend/articles/ArticleResult.java b/app/src/main/java/com/app/simplitend/articles/ArticleResult.java index 50d5981..9b068bc 100644 --- a/app/src/main/java/com/app/simplitend/articles/ArticleResult.java +++ b/app/src/main/java/com/app/simplitend/articles/ArticleResult.java @@ -7,7 +7,7 @@ class ArticleCategory{ public class ArticleResult{ public int id; - public String article_category_xid; + public int article_category_xid; public String article_title; public String article_detail; public String article_link; @@ -16,10 +16,10 @@ public class ArticleResult{ public String small_image; public String large_image; public String tags; - public String active; + public int active; public String deleted_at; - public String created_by; - public String updated_by; + public int created_by; + public int updated_by; public String created_at; public String updated_at; public String article_author_img; diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientProfileInfoFragment.java b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientProfileInfoFragment.java index 54e951d..cd9e6ac 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientProfileInfoFragment.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientProfileInfoFragment.java @@ -1,5 +1,6 @@ package com.app.simplitend.patient_dashboard.fragments; +import static com.app.simplitend.appblocking.FUAActivity.IS_FROM_DASHBOARD; import static com.app.simplitend.caregiverdashboard.activities.EditProfileInfoActivity.IS_FROM_PATIENT; import static com.app.simplitend.caregiverdashboard.activities.PatientProfileShowerActivity.ACTIVITY_F; import static com.app.simplitend.caregiverdashboard.activities.PatientProfileShowerActivity.CONTACTS_F; @@ -8,8 +9,11 @@ import static com.app.simplitend.caregiverdashboard.activities.PatientProfileSho import static com.app.simplitend.caregiverdashboard.activities.PatientProfileShowerActivity.WHICH_FRAGMENT; import android.app.Activity; +import android.app.AlertDialog; import android.content.Intent; +import android.os.Build; import android.os.Bundle; +import android.provider.Settings; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -30,6 +34,8 @@ import com.app.simplitend.patient_dashboard.PatSettingsActivity; import com.app.simplitend.welcome.welcomepatient.mvvm.models.PatientData; import com.bumptech.glide.Glide; +import java.util.Locale; + public class PatientProfileInfoFragment extends Fragment { private ActivityPatProfileInfoBinding binding; @@ -107,8 +113,23 @@ public class PatientProfileInfoFragment extends Fragment { }); binding.freqUsedApps.setOnClickListener(v -> { - Intent intent = new Intent(requireActivity(), FUAActivity.class); - startActivity(intent); + if (!Settings.canDrawOverlays(requireContext()) && "xiaomi".equals(Build.MANUFACTURER.toLowerCase(Locale.ROOT))) { + final Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR"); + intent.setClassName("com.miui.securitycenter", + "com.miui.permcenter.permissions.PermissionsEditorActivity"); + intent.putExtra("extra_pkgname", requireActivity().getPackageName()); + + new AlertDialog.Builder(requireContext()) + .setTitle("Please Enable the additional permissions") + .setMessage("You couldn't use App whitelisting feature unless you turn the following permissions on:\n\n1. Display pop-up windows\n2. Open new windows while running in the background") + .setPositiveButton("Go to Settings", (dialog, which) -> startActivity(intent)) + .setNegativeButton("Cancel", ((dialogInterface, i) -> dialogInterface.dismiss())) + .setIcon(android.R.drawable.ic_dialog_info) + .show(); + }else{ + Intent intent = new Intent(requireActivity(), FUAActivity.class); + startActivity(intent); + } }); binding.editBtn.setOnClickListener(v -> { diff --git a/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/Frequency.java b/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/Frequency.java index a9585df..a9c305b 100644 --- a/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/Frequency.java +++ b/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/Frequency.java @@ -9,14 +9,14 @@ public class Frequency { public String title; public String value; public String sort_order; - public Object small_image_url; - public Object large_image_url; + public String small_image_url; + public String large_image_url; public String active; - public Object deleted_at; - public Object created_by; - public Object updated_by; - public Object created_at; - public Object updated_at; + public String deleted_at; + public String created_by; + public String updated_by; + public String created_at; + public String updated_at; @NonNull @Override diff --git a/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/MedicationType.java b/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/MedicationType.java index 6228901..aeb40be 100644 --- a/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/MedicationType.java +++ b/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/MedicationType.java @@ -9,14 +9,14 @@ public class MedicationType implements Serializable { public String title; public String value; public String sort_order; - public Object small_image_url; - public Object large_image_url; + public String small_image_url; + public String large_image_url; public String active; - public Object deleted_at; - public Object created_by; - public Object updated_by; - public Object created_at; - public Object updated_at; + public String deleted_at; + public String created_by; + public String updated_by; + public String created_at; + public String updated_at; @NonNull @Override diff --git a/app/src/main/res/layout/add_medical_info.xml b/app/src/main/res/layout/add_medical_info.xml index 4a0f357..a719786 100644 --- a/app/src/main/res/layout/add_medical_info.xml +++ b/app/src/main/res/layout/add_medical_info.xml @@ -1,6 +1,5 @@ @@ -447,7 +448,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/aditya_gaikwad" + tools:text="@string/aditya_gaikwad" android:fontFamily="@font/nunito_regular" android:textColor="@color/white" android:textSize="@dimen/_12ssp" diff --git a/app/src/main/res/layout/medical_into_fragment.xml b/app/src/main/res/layout/medical_into_fragment.xml index 8cd163e..ef39d13 100644 --- a/app/src/main/res/layout/medical_into_fragment.xml +++ b/app/src/main/res/layout/medical_into_fragment.xml @@ -28,7 +28,7 @@ android:layout_marginHorizontal="15dp" android:fontFamily="@font/nunito_medium" android:text="@string/medical_information" - android:textAppearance="@style/TextAppearance.Material3.TitleLarge" + android:textSize="@dimen/_16ssp" android:gravity="top" @@ -88,7 +88,7 @@ android:textAlignment="center" android:visibility="gone" - android:textAppearance="@style/TextAppearance.Material3.TitleLarge" + android:textSize="@dimen/_16ssp" android:textColor="@color/black" /> @@ -139,7 +139,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" > - + @@ -307,8 +307,8 @@