diff --git a/.gitignore b/.gitignore index c6cbe56..a80a5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.iml .gradle +.idea /local.properties /.idea/workspace.xml /.idea/libraries diff --git a/app/build.gradle b/app/build.gradle index 24fad99..2ebd9ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } @@ -37,13 +37,13 @@ repositories { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.github.bumptech.glide:glide:4.9.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:support-annotations:28.0.0' - implementation 'com.android.support:cardview-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + implementation 'com.github.bumptech.glide:glide:4.11.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.nex3z:flow-layout:1.0.0' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' testImplementation 'junit:junit:4.12' 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..49757a2 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; @@ -281,7 +282,7 @@ public class ManageExerciseSetsActivity extends BaseActivity implements android. } fabButton.setBackgroundTintList(ColorStateList.valueOf(ActivityCompat.getColor(this, R.color.red))); - fabButton.setImageResource(R.drawable.ic_delete_white); + fabButton.setImageResource(R.drawable.ic_delete_24); } public void disableDeleteMode() { @@ -295,13 +296,13 @@ public class ManageExerciseSetsActivity extends BaseActivity implements android. toolbarDeleteIcon.setVisible(true); } if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) { - getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.colorPrimary)); + getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.colorAccent)); } - getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ActivityCompat.getColor(this, R.color.colorPrimary))); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ActivityCompat.getColor(this, R.color.colorAccent))); getSupportActionBar().setTitle(R.string.activity_title_manage_exercise_sets); fabButton.setBackgroundTintList(fabDefaultBackgroundTint); - fabButton.setImageResource(R.drawable.ic_add_white_24dp); + fabButton.setImageResource(R.drawable.ic_add_24); } public static class AddExerciseSetDialogFragment extends DialogFragment { 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..98b7f20 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 @@ -17,6 +22,7 @@ public class SplashActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + setDayNightTheme(PreferenceManager.getDefaultSharedPreferences(this).getInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)); super.onCreate(savedInstanceState); Intent mainIntent = null; @@ -35,4 +41,17 @@ public class SplashActivity extends AppCompatActivity { SplashActivity.this.finish(); } + private void setDayNightTheme(int theme) { + switch (theme) { + case AppCompatDelegate.MODE_NIGHT_NO: + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + break; + case AppCompatDelegate.MODE_NIGHT_YES: + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + break; + default: + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); + } + } + } 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 88c8718..babcc5f 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..237d877 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; @@ -24,7 +27,9 @@ import org.secuso.aktivpause.activities.SettingsActivity; import org.secuso.aktivpause.activities.TimerActivity; import org.secuso.aktivpause.activities.tutorial.TutorialActivity; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; +import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode; /** * @@ -165,6 +170,29 @@ public abstract class BaseActivity extends AppCompatActivity implements OnNaviga //intent.putExtra( PreferenceActivity.EXTRA_NO_HEADERS, true ); createBackStack(intent); break; + case R.id.nav_theme: + new AlertDialog.Builder(this) + .setTitle(R.string.title_theme) + .setPositiveButton(R.string.follow_system, (dialog, which) -> { + mSharedPreferences.edit().putInt("theme",AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM).apply(); + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); + Intent thisIntent = new Intent(this, getClass()); + createBackStack(thisIntent); + }) + .setNegativeButton(R.string.dark, (dialog, which) -> { + mSharedPreferences.edit().putInt("theme",AppCompatDelegate.MODE_NIGHT_YES).apply(); + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + Intent thisIntent = new Intent(this, getClass()); + createBackStack(thisIntent); + }) + .setNeutralButton(R.string.light, (dialog, which) -> { + mSharedPreferences.edit().putInt("theme",AppCompatDelegate.MODE_NIGHT_NO).apply(); + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + Intent thisIntent = new Intent(this, getClass()); + createBackStack(thisIntent); + }) + .show(); + break; default: } overridePendingTransition(0,0); 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..c4fbdc7 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; @@ -114,7 +114,7 @@ public class TutorialActivity extends AppCompatActivity { for (int i = 0; i < dots.length; i++) { dots[i] = new TextView(this); dots[i].setText(Html.fromHtml("•")); - dots[i].setTextSize(35); + dots[i].setTextSize(30); dots[i].setTextColor(inactiveColor); dotsLayout.addView(dots[i]); } 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/drawable-hdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_add_black_48dp.png deleted file mode 100644 index a84106b..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png deleted file mode 100644 index 694179b..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png deleted file mode 100644 index dbbb602..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_list_white_24dp.png deleted file mode 100644 index f8f7e7d..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_list_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index e531d72..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png deleted file mode 100644 index 4d2ea05..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png deleted file mode 100644 index 57c9fa5..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index f8c7bc9..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_play_circle_filled_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_circle_outline_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_play_circle_outline_black_48dp.png deleted file mode 100644 index c5e3f91..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_play_circle_outline_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index 1c01ac6..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_replay_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_replay_black_48dp.png deleted file mode 100644 index c17a501..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_replay_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png deleted file mode 100644 index 5ef425a..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_settings_black_48dp.png deleted file mode 100644 index 3023ff8..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_settings_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index 16e8a40..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_skip_next_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index 044b6b0..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_black_48dp.png deleted file mode 100644 index 0aee25b..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_skip_previous_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png deleted file mode 100644 index 23faeeb..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_add_black_48dp.png deleted file mode 100644 index 3191d52..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png deleted file mode 100644 index 3856041..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png deleted file mode 100644 index 999aa4c..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png deleted file mode 100644 index 15d8fc2..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index 9efbaae..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png deleted file mode 100644 index 2272d47..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png deleted file mode 100644 index c61e948..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index 9681bf5..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_play_circle_filled_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_outline_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_outline_black_48dp.png deleted file mode 100644 index a9e0143..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_play_circle_outline_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index d84427b..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_replay_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_replay_black_48dp.png deleted file mode 100644 index c8ba8ec..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_replay_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png deleted file mode 100644 index 5a79970..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_settings_black_48dp.png deleted file mode 100644 index e84e188..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_settings_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index 97a05c3..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_skip_next_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index f9c60b7..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_black_48dp.png deleted file mode 100644 index b1bc9e3..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_skip_previous_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png deleted file mode 100644 index dac3640..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml b/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml deleted file mode 100644 index e3400cf..0000000 --- a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 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 deleted file mode 100644 index 5a283aa..0000000 --- a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png deleted file mode 100644 index 3cb1092..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png deleted file mode 100644 index 67bb598..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png deleted file mode 100644 index 796ccd2..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png deleted file mode 100644 index 2b72539..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index 87f8de1..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png deleted file mode 100644 index f49aed7..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png deleted file mode 100644 index a3c80e7..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index 5dcdf0d..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_play_circle_filled_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_black_48dp.png deleted file mode 100644 index ad7ebd2..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index 615b80d..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_replay_black_48dp.png deleted file mode 100644 index 16567dc..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_replay_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png deleted file mode 100644 index 3b41913..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_black_48dp.png deleted file mode 100644 index 476d5c9..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index ce88b61..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_next_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index e722d10..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_black_48dp.png deleted file mode 100644 index 1ad0666..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_previous_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png deleted file mode 100644 index 01dd12b..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_black_48dp.png deleted file mode 100644 index 60cbd9c..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png deleted file mode 100644 index 0fdced8..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png deleted file mode 100644 index 6d7cb81..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png deleted file mode 100644 index 4d2807e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index 4af4ae6..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png deleted file mode 100644 index 7192ad4..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png deleted file mode 100644 index 547ef30..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index 30330cf..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_circle_filled_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_black_48dp.png deleted file mode 100644 index 8b4b318..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index 6e1b578..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_replay_black_48dp.png deleted file mode 100644 index 13fc607..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_replay_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png deleted file mode 100644 index fcddcf0..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_black_48dp.png deleted file mode 100644 index 8f2a8bc..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index 809b93b..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_next_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index 3ee6d75..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_48dp.png deleted file mode 100644 index 92bf52f..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png deleted file mode 100644 index 1181ec9..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_black_48dp.png deleted file mode 100644 index 1e1e4d6..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png deleted file mode 100644 index d64c22e..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png deleted file mode 100644 index f2b75c3..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png deleted file mode 100644 index 2a6d3b0..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index d6761ba..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png deleted file mode 100644 index 660ac65..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png deleted file mode 100644 index be5c062..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index 9dc0825..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_filled_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_black_48dp.png deleted file mode 100644 index 86a407d..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index 516f643..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_black_48dp.png deleted file mode 100644 index 97d1d29..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_replay_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png deleted file mode 100644 index 1573fb1..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_black_48dp.png deleted file mode 100644 index e4d24ea..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_settings_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index 85dbce7..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index 19c4929..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_48dp.png deleted file mode 100644 index 036ddde..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_24dp.png deleted file mode 100644 index f9186c0..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/bg_splash_screen.xml b/app/src/main/res/drawable/bg_splash_screen.xml index 831014f..5501d2d 100644 --- a/app/src/main/res/drawable/bg_splash_screen.xml +++ b/app/src/main/res/drawable/bg_splash_screen.xml @@ -1,7 +1,7 @@ + android:drawable="?colorAccent"/> - + diff --git a/app/src/main/res/drawable/button_section.xml b/app/src/main/res/drawable/button_section.xml index 8ace8f7..2d900b8 100644 --- a/app/src/main/res/drawable/button_section.xml +++ b/app/src/main/res/drawable/button_section.xml @@ -2,9 +2,9 @@ - + - + - + - + - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index 9e5d312..471546a 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -2,9 +2,10 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_24.xml b/app/src/main/res/drawable/ic_add_24.xml new file mode 100644 index 0000000..eb23254 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_alarm_black.xml b/app/src/main/res/drawable/ic_alarm_24.xml similarity index 56% rename from app/src/main/res/drawable/ic_alarm_black.xml rename to app/src/main/res/drawable/ic_alarm_24.xml index 87e80a6..f7c9624 100644 --- a/app/src/main/res/drawable/ic_alarm_black.xml +++ b/app/src/main/res/drawable/ic_alarm_24.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/white" + android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" /> diff --git a/app/src/main/res/drawable/ic_alarm_white.xml b/app/src/main/res/drawable/ic_alarm_white.xml deleted file mode 100644 index bd50ddd..0000000 --- a/app/src/main/res/drawable/ic_alarm_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_close_24.xml b/app/src/main/res/drawable/ic_close_24.xml new file mode 100644 index 0000000..da6ccc8 --- /dev/null +++ b/app/src/main/res/drawable/ic_close_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_close_white.xml b/app/src/main/res/drawable/ic_close_white.xml deleted file mode 100644 index d11cc5c..0000000 --- a/app/src/main/res/drawable/ic_close_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_create_black.xml b/app/src/main/res/drawable/ic_create_black.xml deleted file mode 100644 index 7575f1a..0000000 --- a/app/src/main/res/drawable/ic_create_black.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete_24.xml b/app/src/main/res/drawable/ic_delete_24.xml new file mode 100644 index 0000000..2be8d8c --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_white.xml b/app/src/main/res/drawable/ic_delete_white.xml deleted file mode 100644 index 2b8ab5b..0000000 --- a/app/src/main/res/drawable/ic_delete_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_edit_24.xml b/app/src/main/res/drawable/ic_edit_24.xml new file mode 100644 index 0000000..2844baf --- /dev/null +++ b/app/src/main/res/drawable/ic_edit_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_white_24dp.xml deleted file mode 100644 index 35a774a..0000000 --- a/app/src/main/res/drawable/ic_edit_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index ffc9118..bfa2049 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -2,9 +2,10 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_black.xml b/app/src/main/res/drawable/ic_home_black.xml index 31e1a7a..e53fd58 100644 --- a/app/src/main/res/drawable/ic_home_black.xml +++ b/app/src/main/res/drawable/ic_home_black.xml @@ -1,4 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable/ic_info_black.xml b/app/src/main/res/drawable/ic_info_24.xml similarity index 78% rename from app/src/main/res/drawable/ic_info_black.xml rename to app/src/main/res/drawable/ic_info_24.xml index 34b8202..9f3e294 100644 --- a/app/src/main/res/drawable/ic_info_black.xml +++ b/app/src/main/res/drawable/ic_info_24.xml @@ -1,9 +1,10 @@ diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml deleted file mode 100644 index 34b8202..0000000 --- a/app/src/main/res/drawable/ic_info_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_list_24.xml b/app/src/main/res/drawable/ic_list_24.xml new file mode 100644 index 0000000..b0e68e0 --- /dev/null +++ b/app/src/main/res/drawable/ic_list_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_list_black_24px.xml b/app/src/main/res/drawable/ic_list_black_24px.xml deleted file mode 100644 index 5ab5d87..0000000 --- a/app/src/main/res/drawable/ic_list_black_24px.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_list_white_24px.xml b/app/src/main/res/drawable/ic_list_white_24px.xml deleted file mode 100644 index f5ea0e9..0000000 --- a/app/src/main/res/drawable/ic_list_white_24px.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_menu_tutorial.xml b/app/src/main/res/drawable/ic_menu_tutorial.xml index f8d18b2..ea4731d 100644 --- a/app/src/main/res/drawable/ic_menu_tutorial.xml +++ b/app/src/main/res/drawable/ic_menu_tutorial.xml @@ -2,9 +2,10 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml deleted file mode 100644 index e3400cf..0000000 --- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_pause_48.xml b/app/src/main/res/drawable/ic_pause_48.xml new file mode 100644 index 0000000..8d5e417 --- /dev/null +++ b/app/src/main/res/drawable/ic_pause_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_pause_black_48dp.xml b/app/src/main/res/drawable/ic_pause_black_48dp.xml deleted file mode 100644 index 0887d64..0000000 --- a/app/src/main/res/drawable/ic_pause_black_48dp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_play_arrow_48.xml b/app/src/main/res/drawable/ic_play_arrow_48.xml new file mode 100644 index 0000000..c775d2c --- /dev/null +++ b/app/src/main/res/drawable/ic_play_arrow_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_play_arrow_black.xml b/app/src/main/res/drawable/ic_play_arrow_black.xml deleted file mode 100644 index 54a30db..0000000 --- a/app/src/main/res/drawable/ic_play_arrow_black.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_repeat_48.xml b/app/src/main/res/drawable/ic_repeat_48.xml new file mode 100644 index 0000000..79e6e54 --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_48.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_repeat_black_48dp.xml b/app/src/main/res/drawable/ic_repeat_black_48dp.xml deleted file mode 100644 index 9092e30..0000000 --- a/app/src/main/res/drawable/ic_repeat_black_48dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_replay_48.xml b/app/src/main/res/drawable/ic_replay_48.xml new file mode 100644 index 0000000..bccd425 --- /dev/null +++ b/app/src/main/res/drawable/ic_replay_48.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_24.xml similarity index 81% rename from app/src/main/res/drawable/ic_settings_black_24dp.xml rename to app/src/main/res/drawable/ic_settings_24.xml index ace746c..d3a36a0 100644 --- a/app/src/main/res/drawable/ic_settings_black_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_24.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@android:color/white" + android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" /> diff --git a/app/src/main/res/drawable/ic_skip_next_24.xml b/app/src/main/res/drawable/ic_skip_next_24.xml new file mode 100644 index 0000000..4fff247 --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_next_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_skip_next_48.xml b/app/src/main/res/drawable/ic_skip_next_48.xml new file mode 100644 index 0000000..94aebd9 --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_next_48.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_skip_previous_24.xml b/app/src/main/res/drawable/ic_skip_previous_24.xml new file mode 100644 index 0000000..1805b7d --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_previous_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_skip_previous_48.xml b/app/src/main/res/drawable/ic_skip_previous_48.xml new file mode 100644 index 0000000..fb87381 --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_previous_48.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_sync_24.xml b/app/src/main/res/drawable/ic_sync_24.xml new file mode 100644 index 0000000..c2f773a --- /dev/null +++ b/app/src/main/res/drawable/ic_sync_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml deleted file mode 100644 index 5a283aa..0000000 --- a/app/src/main/res/drawable/ic_sync_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_theme_24.xml b/app/src/main/res/drawable/ic_theme_24.xml new file mode 100644 index 0000000..a3e222a --- /dev/null +++ b/app/src/main/res/drawable/ic_theme_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_update_40.xml b/app/src/main/res/drawable/ic_update_40.xml new file mode 100644 index 0000000..4310621 --- /dev/null +++ b/app/src/main/res/drawable/ic_update_40.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_update_black_40dp.xml b/app/src/main/res/drawable/ic_update_black_40dp.xml deleted file mode 100644 index 52577d1..0000000 --- a/app/src/main/res/drawable/ic_update_black_40dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_view_list_24.xml b/app/src/main/res/drawable/ic_view_list_24.xml new file mode 100644 index 0000000..9884aeb --- /dev/null +++ b/app/src/main/res/drawable/ic_view_list_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_view_list_black_24px.xml b/app/src/main/res/drawable/ic_view_list_black_24px.xml deleted file mode 100644 index 0873a39..0000000 --- a/app/src/main/res/drawable/ic_view_list_black_24px.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/progress_circular.xml b/app/src/main/res/drawable/progress_circular.xml index 298f701..11b1e1a 100644 --- a/app/src/main/res/drawable/progress_circular.xml +++ b/app/src/main/res/drawable/progress_circular.xml @@ -15,7 +15,7 @@ android:useLevel="true" android:shape="ring" android:thicknessRatio="12"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_circular_small.xml b/app/src/main/res/drawable/progress_circular_small.xml index 464a170..6365414 100644 --- a/app/src/main/res/drawable/progress_circular_small.xml +++ b/app/src/main/res/drawable/progress_circular_small.xml @@ -15,7 +15,7 @@ android:shape="ring" android:useLevel="true" android:thicknessRatio="6"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml deleted file mode 100644 index 3dc0e1a..0000000 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_choose_exercise.xml b/app/src/main/res/layout/activity_choose_exercise.xml index 466943d..46c9169 100644 --- a/app/src/main/res/layout/activity_choose_exercise.xml +++ b/app/src/main/res/layout/activity_choose_exercise.xml @@ -1,5 +1,5 @@ - - - - + diff --git a/app/src/main/res/layout/activity_edit_exercise_set.xml b/app/src/main/res/layout/activity_edit_exercise_set.xml index 4ab2d4a..d7e7128 100644 --- a/app/src/main/res/layout/activity_edit_exercise_set.xml +++ b/app/src/main/res/layout/activity_edit_exercise_set.xml @@ -1,28 +1,28 @@ - - - - + android:background="?colorPrimary"/> - @@ -53,7 +53,7 @@ android:layout_marginBottom="8dp" android:layout_marginEnd="8dp" android:layout_marginTop="8dp" - android:drawableStart="@drawable/ic_alarm_white" + android:drawableStart="@drawable/ic_alarm_24" android:gravity="center" android:text="@string/exercise_time" android:textColor="@color/white" @@ -63,17 +63,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - + - - - + - + - + app:srcCompat="@drawable/ic_edit_24" /> - + - \ No newline at end of file + \ 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 157adf9..d4173a0 100644 --- a/app/src/main/res/layout/activity_exercise.xml +++ b/app/src/main/res/layout/activity_exercise.xml @@ -1,5 +1,5 @@ - + app:srcCompat="@drawable/ic_play_arrow_48" /> + app:srcCompat="@drawable/ic_repeat_48" /> + app:srcCompat="@drawable/ic_update_40" /> - - + app:srcCompat="@drawable/ic_about"/> - + - - + - + - - + - + diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml index 985f85a..55aa23d 100644 --- a/app/src/main/res/layout/activity_help.xml +++ b/app/src/main/res/layout/activity_help.xml @@ -1,5 +1,5 @@ - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_manage_exercise_set.xml b/app/src/main/res/layout/activity_manage_exercise_set.xml index c8d4530..1431cbc 100644 --- a/app/src/main/res/layout/activity_manage_exercise_set.xml +++ b/app/src/main/res/layout/activity_manage_exercise_set.xml @@ -1,5 +1,5 @@ - - - - - + - + - + app:srcCompat="@drawable/ic_add_24" /> - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 006b4d0..41235bd 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,5 +1,5 @@ - - - - + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_timer.xml b/app/src/main/res/layout/activity_timer.xml index d2ba8e8..d09d360 100644 --- a/app/src/main/res/layout/activity_timer.xml +++ b/app/src/main/res/layout/activity_timer.xml @@ -1,5 +1,5 @@ - - - - @@ -141,7 +141,7 @@ android:layout_marginEnd="-2dp" android:layout_marginStart="-3dp" android:text=":" - android:textColor="@color/colorAccent" + android:textColor="?colorAccent" android:textSize="@dimen/picker_selected_text_size" android:textStyle="bold" android:theme="@style/AppTheme.NumberPicker" /> @@ -177,7 +177,7 @@ @@ -237,8 +237,8 @@ + app:srcCompat="@drawable/ic_replay_48" /> + app:srcCompat="@drawable/ic_play_arrow_48" /> - + - + - - + diff --git a/app/src/main/res/layout/activity_tutorial.xml b/app/src/main/res/layout/activity_tutorial.xml index 6a58d17..a5b4c85 100644 --- a/app/src/main/res/layout/activity_tutorial.xml +++ b/app/src/main/res/layout/activity_tutorial.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:showIn="@layout/activity_tutorial"> - diff --git a/app/src/main/res/layout/dialog_add_exercise_set.xml b/app/src/main/res/layout/dialog_add_exercise_set.xml index 2b2366e..9c12f22 100644 --- a/app/src/main/res/layout/dialog_add_exercise_set.xml +++ b/app/src/main/res/layout/dialog_add_exercise_set.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_exercise.xml b/app/src/main/res/layout/dialog_exercise.xml index 747b5dd..761df08 100644 --- a/app/src/main/res/layout/dialog_exercise.xml +++ b/app/src/main/res/layout/dialog_exercise.xml @@ -1,5 +1,5 @@ - - - + - \ No newline at end of file + \ No newline at end of file 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 d03b7be..9629a18 100644 --- a/app/src/main/res/layout/layout_exercise_grid_item.xml +++ b/app/src/main/res/layout/layout_exercise_grid_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_exercise_set.xml b/app/src/main/res/layout/layout_exercise_set.xml index a92bac8..382523f 100644 --- a/app/src/main/res/layout/layout_exercise_set.xml +++ b/app/src/main/res/layout/layout_exercise_set.xml @@ -1,5 +1,5 @@ - - - @@ -50,11 +51,11 @@ android:layout_marginTop="8dp" android:background="?android:selectableItemBackgroundBorderless" android:hapticFeedbackEnabled="true" - android:tint="@color/colorAccent" + android:tint="?colorAccent" android:visibility="gone" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_mode_edit_black_24dp" /> + app:srcCompat="@drawable/ic_edit_24" /> @@ -91,7 +91,6 @@ android:layout_marginRight="8dp" android:layout_marginTop="8dp" android:text="@string/set_contains_no_exercises" - android:textColor="@color/black" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" @@ -117,7 +116,7 @@ - - + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_section_filter_button.xml b/app/src/main/res/layout/layout_section_filter_button.xml index 9d29f88..96b849f 100644 --- a/app/src/main/res/layout/layout_section_filter_button.xml +++ b/app/src/main/res/layout/layout_section_filter_button.xml @@ -1,5 +1,5 @@ - - - + android:background="?colorPrimary" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml index b6b2296..d85d6e1 100644 --- a/app/src/main/res/layout/nav_header.xml +++ b/app/src/main/res/layout/nav_header.xml @@ -2,17 +2,16 @@ + android:paddingTop="@dimen/activity_vertical_margin"> @@ -29,7 +28,7 @@ android:layout_height="wrap_content" android:paddingLeft="@dimen/activity_horizontal_margin" android:text="@string/app_name_short" - android:textColor="@color/colorPrimary" + android:textColor="?colorPrimary" android:textSize="18sp" android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:layout_centerVertical="true" diff --git a/app/src/main/res/layout/tutorial_slide1.xml b/app/src/main/res/layout/tutorial_slide1.xml index 6b79a07..aebf28b 100644 --- a/app/src/main/res/layout/tutorial_slide1.xml +++ b/app/src/main/res/layout/tutorial_slide1.xml @@ -2,7 +2,7 @@ + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> - + \ 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..3d92a94 100644 --- a/app/src/main/res/menu/nav_drawer.xml +++ b/app/src/main/res/menu/nav_drawer.xml @@ -4,11 +4,11 @@ @@ -20,8 +20,12 @@ android:title="@string/title_activity_tutorial" /> + Online-Befragung Ja Online-Befragung + Theme + Standard + Dunkel + Hell \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..3c95bf8 --- /dev/null +++ b/app/src/main/res/values-night/styles.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values-notnight/styles.xml similarity index 63% rename from app/src/main/res/values/styles.xml rename to app/src/main/res/values-notnight/styles.xml index 483ff70..6d6904e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values-notnight/styles.xml @@ -1,39 +1,37 @@ - - - - - + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e05cce4..9112045 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,15 +1,15 @@ - #024265 - #024265 #0274B2 + #024265 #8aa5ce #00000000 #ffffff + #d9dddf #000000 + #333639 #0274B2 #8aa5ce - #024265 #A8A8A8 #f6d126 #B71C1C diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d8f2d44..e8acc2a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,6 +59,10 @@ This set contains no exercises. Take a break now! Click here to do your chosen exercises. Settings + Theme + Standard + Dark Theme + Light Theme No exercise sets available. Please create a new one. Exercise Sets Edit Exercise Set diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml index 26400db..0c2dec3 100644 --- a/app/src/main/res/xml/pref_headers.xml +++ b/app/src/main/res/xml/pref_headers.xml @@ -4,12 +4,12 @@
diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file