Aditya.Gaikwad/SimpliTend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

,

Browse Source
This commit is contained in:
14Sandee
2023-12-12 18:54:29 +05:30
parent ef1e9be46f
commit 5ee465f7a2
12 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/deploymentTargetDropDown.xml generated
View File

@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="$USER_HOME$/.android/avd/Pixel_7_Pro_API_33.avd" />
<type value="SERIAL_NUMBER" />
<value value="RZCW41EJRPN" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-12-11T15:12:23.637532Z" />
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-12-12T13:12:40.814090Z" />
<targetsSelectedWithDialog>
<Target>
<type value="QUICK_BOOT_TARGET" />

6
app/src/main/java/com/app/simplitend/appblocking/TopAppDetectionService.java
View File

@@ -25,7 +25,11 @@ public class TopAppDetectionService extends AccessibilityService {
@Override
public void onAccessibilityEvent(AccessibilityEvent event) {
sharedPref = new MySharedPref(getApplication());
appsList.addAll(sharedPref.getArrayList("APP_LIST"));
try {
appsList.addAll(sharedPref.getArrayList("APP_LIST"));
} catch (Exception e) {
// do nothing
}
Log.i("TAG--->", "onAccessibilityEvent: ==>" + sharedPref.getArrayList("APP_LIST"));

2
app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java
View File

@@ -149,7 +149,7 @@ public class BottomNotificationActivity extends AppCompatActivity {
}
setupBottomSheet(binding,
R.drawable.img_medication_time,
R.drawable.img_out_of_geo,
title, "Current location",
senior_distance, "Call senior",
v -> {

15
app/src/main/java/com/app/simplitend/articles/ArticlesAdapter.java
View File

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.ListAdapter;
import androidx.recyclerview.widget.RecyclerView;
import com.app.simplitend.R;
import com.app.simplitend.apputils.RetrofitHelper;
import com.app.simplitend.databinding.ArticleViewHolderBinding;
import com.bumptech.glide.Glide;
@@ -90,6 +91,20 @@ public class ArticlesAdapter extends ListAdapter<ArticleResult, ArticlesAdapter.
articleResult.article_author = "No author";
}
if (articleResult.article_author_img != null){
Glide.with(binding.authorImg)
.load(RetrofitHelper.IMAGE_BASE_URL + articleResult.article_author_img)
.centerCrop()
.placeholder(android.R.color.darker_gray)
.error(R.drawable.static_3)
.into(binding.authorImg);
}else{
Glide.with(binding.authorImg)
.load(R.drawable.static_3)
.centerCrop()
.into(binding.authorImg);
}
binding.authorName.setText(articleResult.article_author);
try {

3
app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java
View File

@@ -25,6 +25,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProvider;
import com.app.simplitend.BuildConfig;
import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.CaregiverDataCache;
@@ -656,7 +657,7 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
// initializing places
// Initialize the SDK
Places.initialize(this, getString(R.string.GOOGLE_MAPS_API_KEY));
Places.initialize(this, BuildConfig.MAPS_API_KEY);
startAutocompleteMapSearch = registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),

1
app/src/main/java/com/app/simplitend/locationupdates/LocationService.java
View File

@@ -48,7 +48,6 @@ public class LocationService extends Service implements LocationClient.DefaultLo
switch (intent.getAction()){
case ACTION_START_LOCATION_UPDATES:
int minInterval = intent.getIntExtra(LOCATION_UPDATE_MIN_INTERVAL, 0);
Log.d("location_update", "onStartCommand: " + minInterval);
if (minInterval != 0){
removeLocationUpdates();
startLocationUpdates(minInterval);

3
app/src/main/java/com/app/simplitend/patient_dashboard/DirectionToHomeActivity.java
View File

@@ -24,6 +24,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
import androidx.lifecycle.ViewModelProvider;
import com.app.simplitend.BuildConfig;
import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.PatientDataCache;
@@ -339,7 +340,7 @@ public class DirectionToHomeActivity extends AppCompatActivity
try {
DirectionsResult directionsResult = DirectionsApi.newRequest(
new GeoApiContext.Builder()
.apiKey(getString(R.string.GOOGLE_MAPS_API_KEY))
.apiKey(BuildConfig.MAPS_API_KEY)
.build())
.origin(new com.google.maps.model.LatLng(location.getLatitude(), location.getLongitude()))
.destination(new com.google.maps.model.LatLng(pat_lat, pat_lng))

3
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java
View File

@@ -35,6 +35,7 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.Navigation;
import com.app.simplitend.BuildConfig;
import com.app.simplitend.apputils.EditTextErrorRemover;
import com.app.simplitend.apputils.TextUtils;
import com.google.android.gms.location.FusedLocationProviderClient;
@@ -266,7 +267,7 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
// initializing places
// Initialize the SDK
Places.initialize(requireContext(), getString(R.string.GOOGLE_MAPS_API_KEY));
Places.initialize(requireContext(), BuildConfig.MAPS_API_KEY);
startAutocompleteMapSearch = registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),

4
app/src/main/res/drawable/img_sos_requested.xml
View File

@@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="314dp"
android:height="226dp"
android:width="220dp"
android:height="180dp"
android:viewportWidth="314"
android:viewportHeight="226">
<path

10
app/src/main/res/layout/activity_pat_profile_info.xml
View File

@@ -19,16 +19,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<ImageView
android:id="@+id/back_btn"
android:layout_width="35sp"
android:layout_height="35sp"
android:layout_margin="15dp"
android:layout_marginStart="15dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingStart="-10dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
android:src="@drawable/ic_home_nav_up" />
<ImageView
android:id="@+id/settings"

4
app/src/main/res/layout/bottom_sheet_alert.xml
View File

@@ -22,8 +22,8 @@
<ImageView
android:id="@+id/image"
android:layout_width="@dimen/_120sdp"
android:layout_height="@dimen/_120sdp"
android:layout_width="@dimen/_160sdp"
android:layout_height="@dimen/_150sdp"
android:contentDescription="@string/illustration"
android:layout_marginVertical="25dp"
android:scaleType="fitXY"

1
app/src/main/res/values/strings.xml
View File

@@ -229,7 +229,6 @@
<string name="SETTINGS">Settings</string>
<string name="NOT_NOW">Not now</string>
<string name="GOOGLE_MAPS_API_KEY">AIzaSyBSaqTnkexE3TPb3WOdfgB9iX155pXY_ew</string>
<string name="search_places">Search places</string>
<string name="i_accept">I accept</string>
<string name="terms_n_conditions"><u>terms and conditions</u></string>