From 535e50e83874d3e878764bd58073b4f74b580bcf Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:48:26 +0200 Subject: [PATCH] Clean up: Drawables and androidx-ify related --- .../aktivpause/activities/AboutActivity.java | 4 +-- .../activities/ChooseExerciseActivity.java | 20 ++++++------ .../activities/EditExerciseSetActivity.java | 22 +++++++------ .../activities/ExerciseActivity.java | 29 ++++++++--------- .../ManageExerciseSetsActivity.java | 31 ++++++++++--------- .../aktivpause/activities/SplashActivity.java | 7 ++++- .../aktivpause/activities/TimerActivity.java | 21 +++++++------ .../activities/adapter/ExerciseAdapter.java | 13 ++++---- .../adapter/ExerciseSetListAdapter.java | 4 +-- .../adapter/ExerciseSetSpinnerAdapter.java | 6 ++-- .../helper/AppCompatPreferenceActivity.java | 10 +++--- .../activities/helper/BaseActivity.java | 19 +++++++----- .../tutorial/FirstLaunchManager.java | 7 +---- .../activities/tutorial/TutorialActivity.java | 8 ++--- .../aktivpause/database/SQLiteHelper.java | 2 +- .../aktivpause/database/data/Exercise.java | 2 +- .../aktivpause/dialog/ExerciseDialog.java | 6 ++-- .../exercises/ExerciseSections.java | 2 +- .../receivers/TimerSchedulerReceiver.java | 4 +-- .../aktivpause/service/TimerService.java | 20 ++++++------ .../res/menu/menu_manage_exercise_sets.xml | 2 +- app/src/main/res/menu/nav_drawer.xml | 6 ++-- app/src/main/res/xml/pref_headers.xml | 4 +-- 23 files changed, 128 insertions(+), 121 deletions(-) diff --git a/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java index 8bff426..cea9e8b 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java @@ -2,8 +2,8 @@ package org.secuso.aktivpause.activities; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.text.method.LinkMovementMethod; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java index b35e59a..daaf490 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java @@ -2,16 +2,16 @@ package org.secuso.aktivpause.activities; import android.content.Intent; import android.os.PersistableBundle; -import android.support.annotation.Nullable; -import android.support.design.chip.Chip; -import android.support.design.chip.ChipGroup; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import com.google.android.material.chip.Chip; +import com.google.android.material.chip.ChipGroup; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.CardView; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.MenuItem; import android.view.View; import android.widget.TextView; @@ -138,7 +138,7 @@ public class ChooseExerciseActivity extends AppCompatActivity implements IExerci buttonStates[i] = !buttonStates[i]; CardView b = (CardView) v; b.setBackgroundColor(buttonStates[i] ? - ContextCompat.getColor(this, R.color.colorAccent) : + ContextCompat.getColor(this, R.color.colorDarkAccent) : ContextCompat.getColor(this, R.color.middlegrey)); } } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java index dd3504a..6e8e0bc 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java @@ -4,15 +4,17 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.content.DialogInterface; import android.content.Intent; -import android.support.v4.content.AsyncTaskLoader; -import android.support.v4.content.Loader; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; + +import androidx.loader.app.LoaderManager; +import androidx.loader.content.AsyncTaskLoader; +import androidx.loader.content.Loader; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -44,7 +46,7 @@ import static org.secuso.aktivpause.activities.adapter.ExerciseAdapter.ID_COMPAR * @version 2.0 * @see ChooseExerciseActivity */ -public class EditExerciseSetActivity extends AppCompatActivity implements android.support.v4.app.LoaderManager.LoaderCallbacks { +public class EditExerciseSetActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks { private static final String TAG = EditExerciseSetActivity.class.getSimpleName(); @@ -143,7 +145,7 @@ public class EditExerciseSetActivity extends AppCompatActivity implements androi if(actionBar != null) { actionBar.setTitle(R.string.activity_title_edit_exercise_set); actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white); + actionBar.setHomeAsUpIndicator(R.drawable.ic_close_24); } } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java index 431f89e..7c36b1b 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java @@ -15,14 +15,15 @@ import android.os.Handler; import android.os.VibrationEffect; import android.os.Vibrator; import android.preference.PreferenceManager; -import android.support.constraint.ConstraintLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.AsyncTaskLoader; -import android.support.v4.content.Loader; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.app.ActivityCompat; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.AsyncTaskLoader; +import androidx.loader.content.Loader; +import androidx.core.view.MenuItemCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -58,7 +59,7 @@ import static org.secuso.aktivpause.service.TimerService.ACTION_STOP_TIMER; * @author Christopher Beckmann * @version 2.0 */ -public class ExerciseActivity extends AppCompatActivity implements android.support.v4.app.LoaderManager.LoaderCallbacks { +public class ExerciseActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks { private static final String TAG = ExerciseActivity.class.getSimpleName(); private static boolean confirmationDialogShown = false; @@ -154,7 +155,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo ActionBar ab = getSupportActionBar(); if (ab != null) { ab.setDisplayHomeAsUpEnabled(true); - ab.setHomeAsUpIndicator(R.drawable.ic_close_white); + ab.setHomeAsUpIndicator(R.drawable.ic_close_24); } if (keepScreenOn) { @@ -376,9 +377,9 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo private void updatePlayButton(boolean isRunning) { if (isRunning) { - playButton.setImageResource(R.drawable.ic_pause_black_48dp); + playButton.setImageResource(R.drawable.ic_pause_48); } else { - playButton.setImageResource(R.drawable.ic_play_arrow_black); + playButton.setImageResource(R.drawable.ic_play_arrow_48); } } @@ -634,7 +635,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo private void setRepeatButtonStatus(boolean repeatStatus) { repeatButton.setColorFilter( repeatStatus ? - ActivityCompat.getColor(this, R.color.colorPrimary) : + ActivityCompat.getColor(this, R.color.colorAccent) : ActivityCompat.getColor(this, R.color.middlegrey)); } @@ -652,7 +653,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo private void setContinuousButtonStatus(boolean continuousStatus) { continuousButton.setColorFilter( continuousStatus ? - ActivityCompat.getColor(this, R.color.colorPrimary) : + ActivityCompat.getColor(this, R.color.colorAccent) : ActivityCompat.getColor(this, R.color.middlegrey)); } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java index 446d93d..1ab162a 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java @@ -8,21 +8,22 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.drawable.ColorDrawable; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.TextInputEditText; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.content.AsyncTaskLoader; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.Loader; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.textfield.TextInputEditText; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.AsyncTaskLoader; +import androidx.core.content.ContextCompat; +import androidx.loader.content.Loader; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -54,7 +55,7 @@ import static android.view.View.VISIBLE; * @version 2.0 * @see EditExerciseSetActivity */ -public class ManageExerciseSetsActivity extends BaseActivity implements android.support.v4.app.LoaderManager.LoaderCallbacks> { +public class ManageExerciseSetsActivity extends BaseActivity implements LoaderManager.LoaderCallbacks> { private static final String TAG = ManageExerciseSetsActivity.class.getSimpleName(); private RecyclerView exerciseSetList; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java index 9b20d6f..e320223 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java @@ -2,11 +2,16 @@ package org.secuso.aktivpause.activities; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import android.preference.PreferenceManager; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager; import org.secuso.aktivpause.activities.tutorial.TutorialActivity; +import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode; + /** * @author yonjuni * @version 1.0 diff --git a/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java index a9a2d43..0d02a8f 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java @@ -12,14 +12,15 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.constraint.ConstraintSet; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.AsyncTaskLoader; -import android.support.v4.content.Loader; + +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.ConstraintSet; +import androidx.core.app.ActivityCompat; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.AsyncTaskLoader; +import androidx.loader.content.Loader; import android.os.Bundle; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.transition.TransitionManager; import android.view.Menu; import android.view.MenuInflater; @@ -58,7 +59,7 @@ import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PAUSE * @version 2.0 * @see TimerService */ -public class TimerActivity extends BaseActivity implements android.support.v4.app.LoaderManager.LoaderCallbacks> { +public class TimerActivity extends BaseActivity implements LoaderManager.LoaderCallbacks> { private static final String TAG = TimerActivity.class.getSimpleName(); // UI @@ -561,9 +562,9 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap private void updatePlayButton(boolean isRunning) { if(isRunning) { - playButton.setImageResource(R.drawable.ic_pause_black_48dp); + playButton.setImageResource(R.drawable.ic_pause_48); } else { - playButton.setImageResource(R.drawable.ic_play_arrow_black); + playButton.setImageResource(R.drawable.ic_play_arrow_48); } } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java index 755f5ca..44a40f5 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java @@ -2,12 +2,12 @@ package org.secuso.aktivpause.activities.adapter; import android.content.Context; import android.graphics.drawable.Drawable; -import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v7.util.SortedList; -import android.support.v7.widget.RecyclerView; + +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.app.ActivityCompat; +import androidx.recyclerview.widget.SortedList; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,7 +20,6 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import org.secuso.aktivpause.R; import org.secuso.aktivpause.activities.helper.IExerciseTimeUpdateable; -import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager; import org.secuso.aktivpause.database.data.Exercise; import org.secuso.aktivpause.dialog.ExerciseDialog; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java index 345fa95..fc496b9 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java @@ -2,8 +2,8 @@ package org.secuso.aktivpause.activities.adapter; import android.content.Intent; import android.preference.PreferenceManager; -import android.support.v7.widget.CardView; -import android.support.v7.widget.RecyclerView; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java index aca1836..ea7a14b 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java @@ -2,9 +2,9 @@ package org.secuso.aktivpause.activities.adapter; import android.content.Context; import android.preference.PreferenceManager; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.v7.widget.CardView; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.cardview.widget.CardView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java index 2e7a68c..944171f 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java @@ -3,11 +3,11 @@ package org.secuso.aktivpause.activities.helper; import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.widget.Toolbar; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.widget.Toolbar; import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java index 4177693..23e59c2 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java @@ -5,14 +5,17 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.design.widget.NavigationView; -import android.support.design.widget.NavigationView.OnNavigationItemSelectedListener; -import android.support.v4.app.TaskStackBuilder; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.navigation.NavigationView; +import com.google.android.material.navigation.NavigationView.OnNavigationItemSelectedListener; + +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.core.app.TaskStackBuilder; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java index c5e770e..17f29ea 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java @@ -5,19 +5,14 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.content.SharedPreferences; -import android.database.Cursor; import android.os.Build; import android.preference.PreferenceManager; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; -import org.secuso.aktivpause.R; import org.secuso.aktivpause.database.SQLiteHelper; -import org.secuso.aktivpause.database.columns.ExerciseSetColumns; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; -import java.util.List; /** * Class structure taken from tutorial at http://www.androidhive.info/2016/05/android-build-intro-slider-app/ diff --git a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java index c0451b5..6cad83f 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java @@ -5,10 +5,10 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java b/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java index d5e45e6..2073690 100644 --- a/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java +++ b/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java @@ -5,7 +5,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.readystatesoftware.sqliteasset.SQLiteAssetHelper; diff --git a/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java b/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java index 3c48425..236c24d 100644 --- a/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java +++ b/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java @@ -2,7 +2,7 @@ package org.secuso.aktivpause.database.data; import android.content.Context; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import org.secuso.aktivpause.exercises.ExerciseSections; diff --git a/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java b/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java index 8251a8b..0c06d75 100644 --- a/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java +++ b/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java @@ -2,9 +2,9 @@ package org.secuso.aktivpause.dialog; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentActivity; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java b/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java index 7cec142..ac1fe34 100644 --- a/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java +++ b/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java @@ -1,7 +1,7 @@ package org.secuso.aktivpause.exercises; import android.content.Context; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import org.secuso.aktivpause.R; diff --git a/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java b/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java index 4ce3279..2ec053d 100644 --- a/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java +++ b/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java @@ -10,8 +10,8 @@ import android.content.SharedPreferences; import android.os.Build; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.content.WakefulBroadcastReceiver; +import androidx.annotation.NonNull; +import androidx.legacy.content.WakefulBroadcastReceiver; import org.secuso.aktivpause.service.TimerService; 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 fff70b7..782ffe4 100644 --- a/app/src/main/java/org/secuso/aktivpause/service/TimerService.java +++ b/app/src/main/java/org/secuso/aktivpause/service/TimerService.java @@ -14,8 +14,8 @@ import android.os.CountDownTimer; import android.os.IBinder; import android.preference.PreferenceManager; import android.provider.Settings; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.content.ContextCompat; import org.secuso.aktivpause.R; import org.secuso.aktivpause.activities.ExerciseActivity; @@ -112,7 +112,7 @@ public class TimerService extends Service { builder.setContentTitle(getString(R.string.app_name)) .setContentText(getString(R.string.take_a_break_now)) .setContentIntent(startExercises) - .setColor(ContextCompat.getColor(this, R.color.colorAccent)) + .setColor(ContextCompat.getColor(this, R.color.colorDarkAccent)) .setPriority(NotificationCompat.PRIORITY_MAX) .setWhen(0) .setOngoing(false) @@ -129,8 +129,8 @@ public class TimerService extends Service { builder.addAction(0, getString(R.string.dismiss_and_dont_repeat), PendingIntent.getBroadcast(getApplicationContext(), 0, new Intent(ACTION_NOTIFICATION_CANCELED), FLAG_UPDATE_CURRENT)); } - builder.addAction(R.drawable.ic_replay_black_48dp, getString(R.string.snooze), snoozeExercise); - builder.addAction(R.drawable.ic_play_arrow_black, getString(R.string.start), startExercises); + builder.addAction(R.drawable.ic_replay_48, getString(R.string.snooze), snoozeExercise); + builder.addAction(R.drawable.ic_play_arrow_48, getString(R.string.start), startExercises); notificationManager.notify(NOTIFICATION_ID, builder.build()); } @@ -330,7 +330,7 @@ public class TimerService extends Service { PendingIntent startExercises = PendingIntent.getActivity(this, 0, exerciseIntent, FLAG_CANCEL_CURRENT); builder.setContentText(time); - builder.setColor(ContextCompat.getColor(this, R.color.colorAccent)); + builder.setColor(ContextCompat.getColor(this, R.color.colorDarkAccent)); builder.setPriority(NotificationCompat.PRIORITY_DEFAULT); builder.setOnlyAlertOnce(true); builder.setSound(null); @@ -343,19 +343,19 @@ public class TimerService extends Service { intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP); builder.setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_UPDATE_CURRENT)); - builder.addAction(R.drawable.ic_play_arrow_black, getString(R.string.start_break), startExercises); + builder.addAction(R.drawable.ic_play_arrow_48, 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_48, getString(R.string.stop), PendingIntent.getService(this, 0, stopIntent, FLAG_UPDATE_CURRENT)); 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_48, getString(R.string.pause), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT)); } 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_48, getString(R.string.resume), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT)); } return builder.build(); diff --git a/app/src/main/res/menu/menu_manage_exercise_sets.xml b/app/src/main/res/menu/menu_manage_exercise_sets.xml index 5847e7d..381a933 100644 --- a/app/src/main/res/menu/menu_manage_exercise_sets.xml +++ b/app/src/main/res/menu/menu_manage_exercise_sets.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/menu/nav_drawer.xml b/app/src/main/res/menu/nav_drawer.xml index 57ce8df..9711168 100644 --- a/app/src/main/res/menu/nav_drawer.xml +++ b/app/src/main/res/menu/nav_drawer.xml @@ -4,11 +4,11 @@ @@ -20,7 +20,7 @@ android:title="@string/title_activity_tutorial" />