From 8da8afed49f10958f458abd114af5f3fff1b911e Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Sun, 16 Apr 2023 10:59:30 +0200 Subject: [PATCH] Fixes app due to dependency upgrades --- app/src/main/AndroidManifest.xml | 4 ++++ .../aktivpause/service/TimerService.java | 18 +++++++-------- .../res/drawable-v21/ic_sync_black_24dp.xml | 2 +- .../main/res/drawable/ic_sync_black_24dp.xml | 2 +- app/src/main/res/layout/activity_exercise.xml | 22 +++++++++---------- app/src/main/res/layout/activity_timer.xml | 8 +++---- .../res/layout/layout_exercise_grid_item.xml | 2 +- .../main/res/layout/layout_exercise_set.xml | 4 ++-- 8 files changed, 33 insertions(+), 29 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 04ecff3..897603e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,10 @@ + + + + diff --git a/app/src/main/java/org/secuso/aktivpause/service/TimerService.java b/app/src/main/java/org/secuso/aktivpause/service/TimerService.java index f502325..f42aa08 100644 --- a/app/src/main/java/org/secuso/aktivpause/service/TimerService.java +++ b/app/src/main/java/org/secuso/aktivpause/service/TimerService.java @@ -105,8 +105,8 @@ public class TimerService extends Service { Intent exerciseIntent = new Intent(this, ExerciseActivity.class); exerciseIntent.putExtra("SCHEDULED", scheduled); - PendingIntent startExercises = PendingIntent.getActivity(this, 0, exerciseIntent, FLAG_CANCEL_CURRENT); - PendingIntent snoozeExercise = PendingIntent.getService(this, 0, snoozeIntent, FLAG_UPDATE_CURRENT); + PendingIntent startExercises = PendingIntent.getActivity(this, 0, exerciseIntent, FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); + PendingIntent snoozeExercise = PendingIntent.getService(this, 0, snoozeIntent, FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); NotificationCompat.Builder builder = new NotificationCompat.Builder(this, "timer_done"); builder.setContentTitle(getString(R.string.app_name)) @@ -122,11 +122,11 @@ public class TimerService extends Service { .setVibrate(new long[] { 0, 1000, 1000, 1000, 1000, 1000, 1000 }) .setSound(Settings.System.DEFAULT_NOTIFICATION_URI) .setOnlyAlertOnce(false) - .setDeleteIntent(PendingIntent.getBroadcast(getApplicationContext(), 0, new Intent(ACTION_NOTIFICATION_DELETED), FLAG_UPDATE_CURRENT)); + .setDeleteIntent(PendingIntent.getBroadcast(getApplicationContext(), 0, new Intent(ACTION_NOTIFICATION_DELETED), FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this); if(pref.getBoolean(PREF_EXERCISE_CONTINUOUS, false)) { - builder.addAction(0, getString(R.string.dismiss_and_dont_repeat), PendingIntent.getBroadcast(getApplicationContext(), 0, new Intent(ACTION_NOTIFICATION_CANCELED), FLAG_UPDATE_CURRENT)); + builder.addAction(0, getString(R.string.dismiss_and_dont_repeat), PendingIntent.getBroadcast(getApplicationContext(), 0, new Intent(ACTION_NOTIFICATION_CANCELED), FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); } builder.addAction(R.drawable.ic_replay_black_48dp, getString(R.string.snooze), snoozeExercise); @@ -327,7 +327,7 @@ public class TimerService extends Service { Intent exerciseIntent = new Intent(this, ExerciseActivity.class); exerciseIntent.putExtra("SCHEDULED", scheduled); - PendingIntent startExercises = PendingIntent.getActivity(this, 0, exerciseIntent, FLAG_CANCEL_CURRENT); + PendingIntent startExercises = PendingIntent.getActivity(this, 0, exerciseIntent, FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); builder.setContentText(time); builder.setColor(ContextCompat.getColor(this, R.color.colorAccent)); @@ -341,21 +341,21 @@ public class TimerService extends Service { Intent intent = new Intent(this, TimerActivity.class); intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP); - builder.setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_UPDATE_CURRENT)); + builder.setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); builder.addAction(R.drawable.ic_play_arrow_black, getString(R.string.start_break), startExercises); Intent stopIntent = new Intent(this, TimerService.class); stopIntent.setAction(ACTION_STOP_TIMER); - builder.addAction(R.drawable.ic_replay_black_48dp, getString(R.string.stop), PendingIntent.getService(this, 0, stopIntent, FLAG_UPDATE_CURRENT)); + builder.addAction(R.drawable.ic_replay_black_48dp, getString(R.string.stop), PendingIntent.getService(this, 0, stopIntent, FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); Intent pauseIntent = new Intent(this, TimerService.class); if(!isPaused()) { pauseIntent.setAction(ACTION_PAUSE_TIMER); - builder.addAction(R.drawable.ic_pause_black_48dp, getString(R.string.pause), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT)); + builder.addAction(R.drawable.ic_pause_black_48dp, getString(R.string.pause), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); } else { pauseIntent.setAction(ACTION_RESUME_TIMER); - builder.addAction(R.drawable.ic_play_arrow_black, getString(R.string.resume), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT)); + builder.addAction(R.drawable.ic_play_arrow_black, getString(R.string.resume), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); } return builder.build(); diff --git a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml b/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml index 5a283aa..2aef437 100644 --- a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml +++ b/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml @@ -5,5 +5,5 @@ android:viewportWidth="24.0"> + android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-0.25 1.97,-0.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml index 5a283aa..2aef437 100644 --- a/app/src/main/res/drawable/ic_sync_black_24dp.xml +++ b/app/src/main/res/drawable/ic_sync_black_24dp.xml @@ -5,5 +5,5 @@ android:viewportWidth="24.0"> + android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-0.25 1.97,-0.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_exercise.xml b/app/src/main/res/layout/activity_exercise.xml index 56344ed..c9a3337 100644 --- a/app/src/main/res/layout/activity_exercise.xml +++ b/app/src/main/res/layout/activity_exercise.xml @@ -20,11 +20,11 @@ android:hapticFeedbackEnabled="true" android:onClick="onClick" android:scaleType="fitXY" - android:tint="@color/colorPrimary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:srcCompat="@drawable/ic_play_arrow_black" /> + app:srcCompat="@drawable/ic_play_arrow_black" + app:tint="@color/colorPrimary" /> + app:layout_constraintHorizontal_bias="0.6666" + app:tint="@color/colorPrimary" /> + app:layout_constraintHorizontal_bias="0.3333" + app:tint="@color/colorPrimary" /> + app:srcCompat="@drawable/ic_repeat_black_48dp" + app:tint="@color/middlegrey" /> + app:srcCompat="@drawable/ic_update_black_40dp" + app:tint="@color/middlegrey" /> + app:tint="@color/black" /> diff --git a/app/src/main/res/layout/activity_timer.xml b/app/src/main/res/layout/activity_timer.xml index c0aa811..88259b4 100644 --- a/app/src/main/res/layout/activity_timer.xml +++ b/app/src/main/res/layout/activity_timer.xml @@ -288,11 +288,11 @@ android:background="?android:selectableItemBackgroundBorderless" android:hapticFeedbackEnabled="true" android:onClick="onClick" - android:tint="@color/darkblue" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.5" - app:srcCompat="@drawable/ic_replay_black_48dp" /> + app:srcCompat="@drawable/ic_replay_black_48dp" + app:tint="@color/darkblue" /> + app:srcCompat="@drawable/ic_play_arrow_black" + app:tint="@color/darkblue" /> diff --git a/app/src/main/res/layout/layout_exercise_grid_item.xml b/app/src/main/res/layout/layout_exercise_grid_item.xml index 9629a18..d2e118f 100644 --- a/app/src/main/res/layout/layout_exercise_grid_item.xml +++ b/app/src/main/res/layout/layout_exercise_grid_item.xml @@ -35,7 +35,7 @@ app:layout_constraintRight_toRightOf="@+id/exercise_image" app:layout_constraintTop_toTopOf="@+id/exercise_image" app:srcCompat="@drawable/ic_about" - android:tint="@color/black"/> + app:tint="@color/black" /> + app:srcCompat="@drawable/ic_mode_edit_black_24dp" + app:tint="@color/colorAccent" />