From ab165742615ce20fc24cab11ea0584ba4ca04df8 Mon Sep 17 00:00:00 2001 From: 14Sandee Date: Fri, 3 Nov 2023 20:13:46 +0530 Subject: [PATCH] . --- .idea/deploymentTargetDropDown.xml | 12 -- .../app/simplitend/appblocking/BlockApp.java | 9 ++ .../simplitend/appblocking/FUAActivity.java | 10 ++ .../com/app/simplitend/apputils/AppUtil.java | 8 +- .../articles/ArticleApiService.java | 4 + .../simplitend/articles/ArticlePresenter.java | 28 +++++ .../simplitend/articles/ArticleResult.java | 1 + .../articles/ArticleShowerActivity.java | 10 ++ .../simplitend/articles/ArticlesActivity.java | 10 ++ .../activities/CaregiverDashActivity.java | 9 ++ .../activities/CaregiverProfileActivity.java | 10 ++ .../activities/CaregiverSettingsActivity.java | 10 ++ .../activities/CgChangePwdActivity.java | 10 ++ .../activities/CgProfileProgressActivity.java | 10 ++ .../activities/ChangePinActivity.java | 10 ++ .../activities/ContactAdminActivity.java | 10 ++ .../activities/EditProfileInfoActivity.java | 9 ++ .../PatientProfileShowerActivity.java | 10 ++ .../DeActivateAccountActivity.java | 10 ++ .../fragments/CgDashBoardFragment.java | 30 ++++- .../mvvm/CaregiverMainViewModel.java | 13 ++- .../mvvm/CgHomeRepository.java | 4 +- .../cg_geofencing/CgGeoFencingActivity.java | 24 +++- .../CgSubscriptionActivity.java | 10 ++ .../com/app/simplitend/faqs/FAQAdapter.java | 24 ++++ .../com/app/simplitend/faqs/FAQ_Activity.java | 10 ++ .../patient_dashboard/DashBoardActivity.java | 10 ++ .../DirectionToHomeActivity.java | 10 ++ .../NotificationsActivity.java | 28 +++++ .../PatSettingsActivity.java | 10 ++ .../fragments/CallsActivity.java | 10 ++ .../PatientLocationUpdatesReceiver.java | 2 +- .../welcome/activities/WelcomeActivity.java | 10 +- .../welcomecg/fragments/CgAuthActivity.java | 10 ++ .../res/layout/notification_viewholder.xml | 108 ++++++++++++------ app/src/main/res/values/strings.xml | 2 +- 36 files changed, 436 insertions(+), 69 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 63159b7..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/BlockApp.java b/app/src/main/java/com/app/simplitend/appblocking/BlockApp.java index c8c3ff8..9059dcb 100644 --- a/app/src/main/java/com/app/simplitend/appblocking/BlockApp.java +++ b/app/src/main/java/com/app/simplitend/appblocking/BlockApp.java @@ -6,6 +6,7 @@ import android.app.ActivityManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.widget.TextView; import android.widget.Toast; @@ -74,6 +75,14 @@ public class BlockApp extends AppCompatActivity { } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); 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 19954a4..3b652a2 100644 --- a/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java +++ b/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java @@ -1,11 +1,13 @@ package com.app.simplitend.appblocking; +import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.res.Configuration; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; @@ -157,6 +159,14 @@ public class FUAActivity extends AppCompatActivity { }); } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private int getPosition(AppList appList) { for (int i = 0; i < whiteList.size(); i++) { if (whiteList.get(i).getPackages().equals(appList.getPackages())) { diff --git a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java index 72a203b..d1e9944 100644 --- a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java +++ b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java @@ -245,10 +245,11 @@ public abstract class AppUtil { public static String formatDate(@NonNull String fromFormat, @NonNull String toFormat, String fromDate){ - SimpleDateFormat fromSdf = new SimpleDateFormat(fromFormat, Locale.getDefault()); - SimpleDateFormat toSdf = new SimpleDateFormat(toFormat, Locale.getDefault()); try { + SimpleDateFormat fromSdf = new SimpleDateFormat(fromFormat, Locale.getDefault()); + SimpleDateFormat toSdf = new SimpleDateFormat(toFormat, Locale.getDefault()); + Date date = fromSdf.parse(fromDate); return toSdf.format(date); }catch (Exception e){ @@ -323,6 +324,7 @@ public abstract class AppUtil { "Unknown", "Call patient", v -> { CaregiverDataCache.getCaregiverData(context, (careGiverData -> { + bsd.dismiss(); if (careGiverData == null || careGiverData.patientDetails == null) { Toast.makeText(context, "Couldn't load data", Toast.LENGTH_SHORT).show(); return; @@ -434,6 +436,7 @@ public abstract class AppUtil { null, "Call patient", v -> { CaregiverDataCache.getCaregiverData(context, (careGiverData -> { + bsd.dismiss(); if (careGiverData == null || careGiverData.patientDetails == null) { Toast.makeText(context, "Couldn't load data", Toast.LENGTH_SHORT).show(); return; @@ -460,6 +463,7 @@ public abstract class AppUtil { null, "Call patient", v -> { CaregiverDataCache.getCaregiverData(context, (careGiverData -> { + bsd.dismiss(); if (careGiverData == null || careGiverData.patientDetails == null) { Toast.makeText(context, "Couldn't load data", Toast.LENGTH_SHORT).show(); return; diff --git a/app/src/main/java/com/app/simplitend/articles/ArticleApiService.java b/app/src/main/java/com/app/simplitend/articles/ArticleApiService.java index e206e6d..37ee722 100644 --- a/app/src/main/java/com/app/simplitend/articles/ArticleApiService.java +++ b/app/src/main/java/com/app/simplitend/articles/ArticleApiService.java @@ -24,4 +24,8 @@ public interface ArticleApiService { @Query("per_page") int per_page, @Query("page") int page); + @GET("api/get-list-of-news-articles") + Call> getDefaultArticle(@Header("Authorization") String token, + @Header("default") int default_article); + } diff --git a/app/src/main/java/com/app/simplitend/articles/ArticlePresenter.java b/app/src/main/java/com/app/simplitend/articles/ArticlePresenter.java index c43fbc8..3c508dc 100644 --- a/app/src/main/java/com/app/simplitend/articles/ArticlePresenter.java +++ b/app/src/main/java/com/app/simplitend/articles/ArticlePresenter.java @@ -59,4 +59,32 @@ public class ArticlePresenter { }); } + public void getDefaultArticle(String token, + @NonNull ArticleContracts.GetArticleCallback getArticleCallback) { + + apiService.getDefaultArticle(token, 1) + .enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.body() != null) { + if (response.body().status != 200 || response.body().result == null) { + getArticleCallback.onArticleFetchFailed(new Exception(), response.body().message); + return; + } + + ArrayList articleResults = new ArrayList<>(); + articleResults.add(response.body().result); + getArticleCallback.onArticlesFetched(articleResults); + } else { + getArticleCallback.onArticleFetchFailed(new Exception(), "Please try again later."); + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + getArticleCallback.onArticleFetchFailed(new Exception(), "Please try again later."); + } + }); + } + } 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 24abab2..50d5981 100644 --- a/app/src/main/java/com/app/simplitend/articles/ArticleResult.java +++ b/app/src/main/java/com/app/simplitend/articles/ArticleResult.java @@ -22,5 +22,6 @@ public class ArticleResult{ public String updated_by; public String created_at; public String updated_at; + public String article_author_img; public ArticleCategory article_category; } diff --git a/app/src/main/java/com/app/simplitend/articles/ArticleShowerActivity.java b/app/src/main/java/com/app/simplitend/articles/ArticleShowerActivity.java index 721d7bc..10faa9e 100644 --- a/app/src/main/java/com/app/simplitend/articles/ArticleShowerActivity.java +++ b/app/src/main/java/com/app/simplitend/articles/ArticleShowerActivity.java @@ -1,6 +1,8 @@ package com.app.simplitend.articles; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.view.View; import android.webkit.WebView; @@ -32,6 +34,14 @@ public class ArticleShowerActivity extends AppCompatActivity { } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void initViews() { Intent intent = getIntent(); diff --git a/app/src/main/java/com/app/simplitend/articles/ArticlesActivity.java b/app/src/main/java/com/app/simplitend/articles/ArticlesActivity.java index cfcf767..45e79f2 100644 --- a/app/src/main/java/com/app/simplitend/articles/ArticlesActivity.java +++ b/app/src/main/java/com/app/simplitend/articles/ArticlesActivity.java @@ -3,7 +3,9 @@ package com.app.simplitend.articles; import static com.app.simplitend.articles.ArticleShowerActivity.ARTICLE_TITLE; import static com.app.simplitend.articles.ArticleShowerActivity.ARTICLE_URL_KEY; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; @@ -53,6 +55,14 @@ public class ArticlesActivity extends AppCompatActivity } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void getArticles(String search_query, int per_page, int page_no, boolean bottom_progress) { binding.noArticles.setVisibility(View.GONE); diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java index a1c2be6..7c9cf97 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java @@ -7,6 +7,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.res.Configuration; import android.os.Bundle; import android.view.View; @@ -120,6 +121,14 @@ public class CaregiverDashActivity extends AppCompatActivity implements registerReceiver(notification_receiver, new IntentFilter(AppUtil.NOTIFICATION_ACTION)); } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + @Override protected void onResume() { super.onResume(); diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java index 8ed2f53..2269963 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java @@ -6,7 +6,9 @@ import static com.app.simplitend.caregiverdashboard.activities.EditProfileInfoAc import androidx.appcompat.app.AppCompatActivity; import androidx.biometric.BiometricManager; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.view.View; import android.widget.CompoundButton; @@ -46,6 +48,14 @@ public class CaregiverProfileActivity extends AppCompatActivity implements Compo }), true); } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void setCareGiverDetails() { if (careGiverData == null) { Toast.makeText(this, "Couldn't load the data.", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverSettingsActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverSettingsActivity.java index 36c3a43..4bc0ede 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverSettingsActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverSettingsActivity.java @@ -1,7 +1,9 @@ package com.app.simplitend.caregiverdashboard.activities; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.widget.Toast; @@ -48,6 +50,14 @@ public class CaregiverSettingsActivity extends AppCompatActivity implements CgHo clickEvents(); } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void setupNotifications() { nSBinding.patientMedication.setChecked(AppUtil.getCgNotificationPref(this, AppUtil.MEDICATIONS_NOTIFICATIONS)); nSBinding.patientMedRefill.setChecked(AppUtil.getCgNotificationPref(this, AppUtil.MEDICATION_REFILL_NOTIFICATIONS)); diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgChangePwdActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgChangePwdActivity.java index cec83fe..c10747e 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgChangePwdActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgChangePwdActivity.java @@ -5,6 +5,8 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.ViewModelProvider; import android.app.ProgressDialog; +import android.content.Context; +import android.content.res.Configuration; import android.os.Bundle; import android.view.View; import android.widget.Toast; @@ -57,6 +59,14 @@ public class CgChangePwdActivity extends AppCompatActivity implements CgHomeCont } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void initViews() { } diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java index 0cf0494..7846876 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java @@ -8,7 +8,9 @@ import static com.app.simplitend.caregiverdashboard.activities.PatientProfileSho import static com.app.simplitend.cg_geofencing.CgGeoFencingActivity.GEOFENCE_DETAILS_KEY; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -81,6 +83,14 @@ public class CgProfileProgressActivity extends AppCompatActivity implements CgHo } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void syncPatientData() { startAnimation(); diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/ChangePinActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/ChangePinActivity.java index 3e1aba1..6074bcc 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/ChangePinActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/ChangePinActivity.java @@ -2,6 +2,8 @@ package com.app.simplitend.caregiverdashboard.activities; import androidx.appcompat.app.AppCompatActivity; +import android.content.Context; +import android.content.res.Configuration; import android.os.Bundle; import com.app.simplitend.R; @@ -20,6 +22,14 @@ public class ChangePinActivity extends AppCompatActivity { clickEvents(); } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void clickEvents() { binding.backBtn.setOnClickListener(view -> onBackPressed()); } diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/ContactAdminActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/ContactAdminActivity.java index a55d7d7..c7858ad 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/ContactAdminActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/ContactAdminActivity.java @@ -2,6 +2,8 @@ package com.app.simplitend.caregiverdashboard.activities; import android.annotation.SuppressLint; import android.app.ProgressDialog; +import android.content.Context; +import android.content.res.Configuration; import android.os.Bundle; import android.view.MotionEvent; import android.widget.Toast; @@ -48,6 +50,14 @@ public class ContactAdminActivity extends AppCompatActivity implements AccountPr } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void initViews() { smoothEditTextScroll(); diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/EditProfileInfoActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/EditProfileInfoActivity.java index d7f917c..128d327 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/EditProfileInfoActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/EditProfileInfoActivity.java @@ -5,6 +5,7 @@ import android.app.DatePickerDialog; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; import android.text.Editable; @@ -145,6 +146,14 @@ public class EditProfileInfoActivity extends AppCompatActivity implements } } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void setDetails() { if (isCaregiver){ // load caregiver data diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/PatientProfileShowerActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/PatientProfileShowerActivity.java index f1628e7..b8c7549 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/PatientProfileShowerActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/PatientProfileShowerActivity.java @@ -1,5 +1,7 @@ package com.app.simplitend.caregiverdashboard.activities; +import android.content.Context; +import android.content.res.Configuration; import android.os.Bundle; import android.widget.Toast; @@ -54,6 +56,14 @@ public class PatientProfileShowerActivity extends AppCompatActivity { } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private Fragment getFragment(String which_f) { Fragment fragment = null; diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/deactivateacc/DeActivateAccountActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/deactivateacc/DeActivateAccountActivity.java index a2139d4..db448e6 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/deactivateacc/DeActivateAccountActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/deactivateacc/DeActivateAccountActivity.java @@ -2,7 +2,9 @@ package com.app.simplitend.caregiverdashboard.activities.deactivateacc; import android.annotation.SuppressLint; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; @@ -60,6 +62,14 @@ public class DeActivateAccountActivity extends AppCompatActivity implements Acco } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void initViews() { // first showing the confirmation page binding.firstView.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java index 4b6317c..1c7f83e 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java @@ -13,7 +13,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.net.Uri; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; @@ -231,7 +230,20 @@ public class CgDashBoardFragment extends Fragment implements loadReminders(); loadActivities(); + + viewModel.setDefault_article(null); // to load new articles loadArticles(); + + CaregiverDataCache.setCareGiverData(null); // to load new details + CaregiverDataCache.getCaregiverData(requireActivity(), (careGiverData1 -> { + if (careGiverData1 != null && careGiverData1.patientDetails != null){ + this.careGiverData = careGiverData1; + + setDetails(); + }else { + CaregiverDataCache.setCareGiverData(this.careGiverData); + } + }), false); }); binding.notifications.setOnClickListener(view -> { @@ -272,6 +284,15 @@ public class CgDashBoardFragment extends Fragment implements articleResult.article_author = "No author"; } + if (articleResult.article_author_img != null){ + Glide.with(binding.authorImg) + .load(AppUtil.IMAGE_BASE_URL + articleResult.article_author_img) + .centerCrop() + .placeholder(android.R.color.darker_gray) + .error(R.drawable.static_3) + .into(binding.authorImg); + } + binding.articleAuthorName.setText(articleResult.article_author); try { @@ -307,10 +328,9 @@ public class CgDashBoardFragment extends Fragment implements public void onArticlesFetched(ArrayList articleResults) { if (articleResults == null) return; - // saving in view model - viewModel.setArticleResults(articleResults); - if (articleResults.size() > 0){ + // saving to view model + viewModel.setDefault_article(articleResults.get(0)); binding.articleView.setVisibility(View.VISIBLE); setArticleDetails(articleResults.get(0)); @@ -323,7 +343,7 @@ public class CgDashBoardFragment extends Fragment implements @Override public void onArticleFetchFailed(Throwable t, String message) { // do nothing - binding.articleView.setVisibility(View.GONE); + Log.d("fk", "onArticleFetchFailed: "); } @Override diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/mvvm/CaregiverMainViewModel.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/mvvm/CaregiverMainViewModel.java index 8be0269..d2d60e3 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/mvvm/CaregiverMainViewModel.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/mvvm/CaregiverMainViewModel.java @@ -19,6 +19,7 @@ import com.yarolegovich.slidingrootnav.SlidingRootNav; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; @@ -35,7 +36,7 @@ public class CaregiverMainViewModel extends ViewModel { private final CgHomeRepository cgHomeRepository; - private ArrayList articleResults; + private ArticleResult default_article; public String ongoingActivityText, upcomingActivityText; public String upcomingReminderText, dailyReminderText; @@ -49,14 +50,16 @@ public class CaregiverMainViewModel extends ViewModel { this.upcomingReminderText = this.dailyReminderText = "Loading..."; } - public void setArticleResults(ArrayList articleResults) { - this.articleResults = articleResults; + public void setDefault_article(ArticleResult default_article) { + this.default_article = default_article; } public void getArticles(Context context, @NonNull ArticleContracts.GetArticleCallback articleCallback){ - if (articleResults == null){ - cgHomeRepository.getArticles(context, articleCallback); + if (default_article == null){ + cgHomeRepository.getDefaultArticle(context, articleCallback); }else{ + ArrayList articleResults = new ArrayList<>(); + articleResults.add(default_article); articleCallback.onArticlesFetched(articleResults); } diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/mvvm/CgHomeRepository.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/mvvm/CgHomeRepository.java index f43d17e..67ecb27 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/mvvm/CgHomeRepository.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/mvvm/CgHomeRepository.java @@ -39,9 +39,9 @@ public class CgHomeRepository { return cgHomeRepository; } - public void getArticles(Context context, @NonNull ArticleContracts.GetArticleCallback getArticleCallback) { + public void getDefaultArticle(Context context, @NonNull ArticleContracts.GetArticleCallback getArticleCallback) { ArticlePresenter articlePresenter = ArticlePresenter.getArticlePresenter(); - articlePresenter.getArticles("Bearer " + AppUtil.getCgToken(context), "", 1,1,getArticleCallback); + articlePresenter.getDefaultArticle("Bearer " + AppUtil.getCgToken(context), getArticleCallback); } public void getGeoFenceDetails(String p_id, diff --git a/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java b/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java index 64f6227..6534a62 100644 --- a/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java +++ b/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java @@ -4,7 +4,9 @@ import static com.app.simplitend.patientgeofencing.PatientLocationUpdatesReceive import android.app.Activity; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.graphics.Color; import android.location.Address; import android.location.Geocoder; @@ -91,6 +93,8 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead private Circle radius_circle; + private boolean isTrackingSenior; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -123,6 +127,7 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead progressDialog = new ProgressDialog(this); geofence_bs_binding = GeofenceBottomSheetBinding.inflate(getLayoutInflater()); + isTrackingSenior = false; CaregiverDataCache.getCaregiverData(this, (careGiverData -> { if (careGiverData == null) return; @@ -143,6 +148,14 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + @Override protected void onDestroy() { super.onDestroy(); @@ -167,10 +180,10 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead public void onMessageReceived(Location result) { Log.d(LOCATION_REQUEST_TAG, "LOCATION RECEIVED: " + result); if (result != null){ - pat_cur_latLng = new LatLng(result.getLatitude(), result.getLongitude()); - // running on main thread new Handler(Looper.getMainLooper()).post(()-> { + pat_cur_latLng = new LatLng(result.getLatitude(), result.getLongitude()); + Toast.makeText(CgGeoFencingActivity.this, "Update", Toast.LENGTH_SHORT).show(); updateCurrentLocationPatientMarker(); updatePatientCurrentLocationDetails(); }); @@ -283,12 +296,14 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead binding.homeLocationBtn.setOnClickListener(v -> { if (mMap != null && home_loc_marker != null){ mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(home_loc_marker.getPosition(), 16)); + isTrackingSenior = false; } }); binding.cgLocationBtn.setOnClickListener(v -> { if (mMap != null && curr_loc_marker != null){ mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(curr_loc_marker.getPosition(), 16)); + isTrackingSenior = true; } }); } @@ -469,6 +484,7 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead mMap.setOnMapClickListener(latLng1 -> { this.mHomeLatLng = latLng1; + isTrackingSenior = false; binding.updateBtnsView.setVisibility(View.VISIBLE); binding.homeLocationBtn.setVisibility(View.GONE); @@ -493,6 +509,10 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead if (curr_loc_marker != null) curr_loc_marker.remove(); curr_loc_marker = mMap.addMarker(options); + + if (isTrackingSenior){ + mMap.animateCamera(CameraUpdateFactory.newLatLng(pat_cur_latLng)); + } } } diff --git a/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java b/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java index 58e7d2e..5b17894 100644 --- a/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java +++ b/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java @@ -1,7 +1,9 @@ package com.app.simplitend.cg_subscription; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; import android.text.Html; @@ -95,6 +97,14 @@ public class CgSubscriptionActivity extends AppCompatActivity binding.yearCheck.setSelected(true); } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void loadCurrentPlans() { CaregiverDataCache.getCaregiverData(this, (careGiverData1 -> { this.careGiverData = careGiverData1; diff --git a/app/src/main/java/com/app/simplitend/faqs/FAQAdapter.java b/app/src/main/java/com/app/simplitend/faqs/FAQAdapter.java index 2dbfef7..3397fdd 100644 --- a/app/src/main/java/com/app/simplitend/faqs/FAQAdapter.java +++ b/app/src/main/java/com/app/simplitend/faqs/FAQAdapter.java @@ -14,6 +14,8 @@ import com.app.simplitend.databinding.FaqViewholderBinding; public class FAQAdapter extends ListAdapter { + private int lastOpenedFaqPosition; + private static final DiffUtil.ItemCallback DIFF_UTIL = new DiffUtil.ItemCallback() { @Override public boolean areItemsTheSame(@NonNull FAQResult oldItem, @NonNull FAQResult newItem) { @@ -28,6 +30,7 @@ public class FAQAdapter extends ListAdapter public FAQAdapter(){ super(DIFF_UTIL); + this.lastOpenedFaqPosition = -1; } @NonNull @@ -42,15 +45,36 @@ public class FAQAdapter extends ListAdapter public void onBindViewHolder(@NonNull FAQViewHolder holder, int position) { holder.setDate(getItem(position)); + if (position == lastOpenedFaqPosition){ + // this is opened + holder.binding.addRemove.setImageResource(R.drawable.ic_remove_primary); + holder.binding.answer.setVisibility(View.VISIBLE); + }else{ + holder.binding.addRemove.setImageResource(R.drawable.ic_add_primary); + holder.binding.answer.setVisibility(View.GONE); + } + + final int cardPosition = position; holder.binding.addRemove.setOnClickListener(v -> { int visibility = holder.binding.answer.getVisibility(); if (visibility == View.VISIBLE){ holder.binding.addRemove.setImageResource(R.drawable.ic_add_primary); holder.binding.answer.setVisibility(View.GONE); + + this.lastOpenedFaqPosition = -1; }else{ holder.binding.addRemove.setImageResource(R.drawable.ic_remove_primary); holder.binding.answer.setVisibility(View.VISIBLE); + + // closing already opened FAQ + if (lastOpenedFaqPosition != -1 && lastOpenedFaqPosition < getItemCount()){ + int lastOpenedFaqPosition = this.lastOpenedFaqPosition; + this.lastOpenedFaqPosition = cardPosition; + notifyItemChanged(lastOpenedFaqPosition); + }else{ + this.lastOpenedFaqPosition = cardPosition; + } } }); diff --git a/app/src/main/java/com/app/simplitend/faqs/FAQ_Activity.java b/app/src/main/java/com/app/simplitend/faqs/FAQ_Activity.java index 1a3d023..87eef70 100644 --- a/app/src/main/java/com/app/simplitend/faqs/FAQ_Activity.java +++ b/app/src/main/java/com/app/simplitend/faqs/FAQ_Activity.java @@ -3,6 +3,8 @@ package com.app.simplitend.faqs; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; +import android.content.Context; +import android.content.res.Configuration; import android.os.Bundle; import android.view.View; import android.widget.Toast; @@ -36,6 +38,14 @@ public class FAQ_Activity extends AppCompatActivity implements FAQContracts.GETF } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void initViews() { binding.faqsRv.setLayoutManager(new LinearLayoutManager(this)); faqAdapter = new FAQAdapter(); diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java index d77a4d5..3ccd46a 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java @@ -4,8 +4,10 @@ import static com.app.simplitend.patientgeofencing.GeoFenceHelper.GEOFENCE_TAG; import android.Manifest; import android.app.role.RoleManager; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; import android.telecom.TelecomManager; @@ -103,6 +105,14 @@ public class DashBoardActivity extends AppCompatActivity implements CgHomeContra }).launch(Manifest.permission.READ_CONTACTS); } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void setGeofenceAndLocationUpdates() { // retrieving geofence viewModel.getGeoFenceDetails(AppUtil.getPatientUid(this) + "", diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/DirectionToHomeActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/DirectionToHomeActivity.java index bc6274c..5d454f3 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/DirectionToHomeActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/DirectionToHomeActivity.java @@ -1,8 +1,10 @@ package com.app.simplitend.patient_dashboard; import android.Manifest; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.location.Address; import android.location.Geocoder; import android.location.Location; @@ -97,6 +99,14 @@ public class DirectionToHomeActivity extends AppCompatActivity } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void clickEvents() { binding.closeBtn.setOnClickListener(v -> { if(bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED){ diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/NotificationsActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/NotificationsActivity.java index dad3c52..b798edf 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/NotificationsActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/NotificationsActivity.java @@ -2,6 +2,8 @@ package com.app.simplitend.patient_dashboard; import static com.app.simplitend.caregiverdashboard.activities.EditProfileInfoActivity.IS_CAREGIVER; +import android.content.Context; +import android.content.res.Configuration; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -15,6 +17,7 @@ import androidx.recyclerview.widget.ListAdapter; import androidx.recyclerview.widget.RecyclerView; import com.app.simplitend.R; +import com.app.simplitend.apputils.AppUtil; import com.app.simplitend.apputils.RetrofitHelper; import com.app.simplitend.databinding.ActivityNotificationsBinding; import com.app.simplitend.databinding.NotificationViewholderBinding; @@ -75,6 +78,14 @@ public class NotificationsActivity extends AppCompatActivity implements Callback } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void clickEvents() { binding.backBtn.setOnClickListener(v -> onBackPressed()); } @@ -256,6 +267,23 @@ public class NotificationsActivity extends AppCompatActivity implements Callback binding.image.setImageResource(imageRes); binding.imageCard.setCardBackgroundColor(itemView.getContext().getColor(R.color.color_accent)); } + +// created at format 2023-11-03T11:13:22.000000Z + if (notification.created_at != null){ + String time = AppUtil.formatDate( + "yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'", + "dd MMM yyyy 'at' hh:mm a", + notification.created_at + ); + + if (time == null){ + binding.timeView.setVisibility(View.GONE); + }else{ + binding.timeView.setVisibility(View.VISIBLE); + binding.time.setText(time); + } + } + } } } diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/PatSettingsActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/PatSettingsActivity.java index 3697378..ad8a6db 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/PatSettingsActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/PatSettingsActivity.java @@ -5,7 +5,9 @@ import static com.app.simplitend.caregiverdashboard.activities.deactivateacc.DeA import androidx.appcompat.app.AppCompatActivity; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.widget.Toast; @@ -38,6 +40,14 @@ public class PatSettingsActivity extends AppCompatActivity implements CgHomeCont clickEvents(); } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void initViews() { binding.notificationCheck.setChecked(OneSignal.getUser().getPushSubscription().getOptedIn()); binding.notificationCheck.setOnCheckedChangeListener((compoundButton, check) -> { diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/CallsActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/CallsActivity.java index 38a0ae5..e3ac800 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/CallsActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/CallsActivity.java @@ -2,8 +2,10 @@ package com.app.simplitend.patient_dashboard.fragments; import android.Manifest; import android.app.role.RoleManager; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.os.Bundle; import android.telecom.TelecomManager; import android.view.View; @@ -53,6 +55,14 @@ public class CallsActivity extends AppCompatActivity implements AddContactAdapte } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void clickEvents() { binding.backBtn.setOnClickListener(view -> onBackPressed()); } diff --git a/app/src/main/java/com/app/simplitend/patientgeofencing/PatientLocationUpdatesReceiver.java b/app/src/main/java/com/app/simplitend/patientgeofencing/PatientLocationUpdatesReceiver.java index c37d66b..22271b3 100644 --- a/app/src/main/java/com/app/simplitend/patientgeofencing/PatientLocationUpdatesReceiver.java +++ b/app/src/main/java/com/app/simplitend/patientgeofencing/PatientLocationUpdatesReceiver.java @@ -25,7 +25,7 @@ import retrofit2.Response; public class PatientLocationUpdatesReceiver extends BroadcastReceiver { - public static final String LOCATION_REQUEST_TAG = "LOCATION_REQUEST_TAG"; + public static final String LOCATION_REQUEST_TAG = "LOCATION_UPDATE_TAG"; public static final String LOCATION_EXTRA_KEY = "com.google.android.location.LOCATION"; public static final int LOCATION_UPDATES_REQUEST_CODE = 1010; diff --git a/app/src/main/java/com/app/simplitend/welcome/activities/WelcomeActivity.java b/app/src/main/java/com/app/simplitend/welcome/activities/WelcomeActivity.java index e3544fa..98a04a9 100644 --- a/app/src/main/java/com/app/simplitend/welcome/activities/WelcomeActivity.java +++ b/app/src/main/java/com/app/simplitend/welcome/activities/WelcomeActivity.java @@ -1,6 +1,9 @@ package com.app.simplitend.welcome.activities; +import android.content.Context; +import android.content.res.Configuration; import android.os.Bundle; +import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; @@ -20,7 +23,10 @@ public class WelcomeActivity extends AppCompatActivity { } @Override - protected void onStart() { - super.onStart(); + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.0f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); } } \ No newline at end of file diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgAuthActivity.java b/app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgAuthActivity.java index 988af74..9547de7 100644 --- a/app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgAuthActivity.java +++ b/app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgAuthActivity.java @@ -2,7 +2,9 @@ package com.app.simplitend.welcome.welcomecg.fragments; import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.provider.Settings; import android.text.Editable; @@ -61,6 +63,14 @@ public class CgAuthActivity extends AppCompatActivity { } + @Override + protected void attachBaseContext(Context newBase) { + final Configuration configuration = new Configuration(newBase.getResources().getConfiguration()); + configuration.fontScale = Math.min(configuration.fontScale, 1.1f); + applyOverrideConfiguration(configuration); + super.attachBaseContext(newBase); + } + private void clickEvents() { binding.fingerprintView.setOnClickListener(v -> { authenticateBiometrics(); diff --git a/app/src/main/res/layout/notification_viewholder.xml b/app/src/main/res/layout/notification_viewholder.xml index 61b3d92..2c59820 100644 --- a/app/src/main/res/layout/notification_viewholder.xml +++ b/app/src/main/res/layout/notification_viewholder.xml @@ -15,49 +15,83 @@ android:layout_margin="15dp" > - - - - - - - - - - tools:text="Description" - android:fontFamily="@font/nunito_medium" - android:textColor="@color/black" - android:textSize="@dimen/_14ssp" + - android:layout_gravity="center_vertical" - android:layout_marginStart="15dp" + + android:contentDescription="@string/notification" + android:src="@drawable/ic_missed_noti" + android:layout_gravity="center" + /> - + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 61b5149..5dcec29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -211,7 +211,7 @@ Enter start time Enter end time bar - Are you sure you want to delete the Medication Activity? + Are you sure you want to delete the Activity? notification close Call