bitPickups/bitPicksAktivpause
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 3ea899b3fe into f4be4c1bd0

Browse source
This commit is contained in:
machiav3lli 2020-12-05 11:41:47 +01:00 • committed by GitHub
commit f7fa7fedac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
185 changed files with 628 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
*.iml
.gradle
.idea
/local.properties
/.idea/workspace.xml
/.idea/libraries

18
app/build.gradle
View file

@ -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'

4
app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java
View file

@ -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;

20
app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java
View file

@ -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));
}
}

22
app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java
View file

@ -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<ExerciseSet> {
public class EditExerciseSetActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks<ExerciseSet> {
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);
}
}

29
app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java
View file

@ -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<ExerciseSet> {
public class ExerciseActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks<ExerciseSet> {
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));
}

39
app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java
View file

@ -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<List<ExerciseSet>> {
public class ManageExerciseSetsActivity extends BaseActivity implements LoaderManager.LoaderCallbacks<List<ExerciseSet>> {
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 {

21
app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java
View file

@ -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);
}
}
}

21
app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java
View file

@ -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<List<ExerciseSet>> {
public class TimerActivity extends BaseActivity implements LoaderManager.LoaderCallbacks<List<ExerciseSet>> {
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);
}
}

13
app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java
View file

@ -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;

4
app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java
View file

@ -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;

6
app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java
View file

@ -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;

10
app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java
View file

@ -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;

44
app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java
View file

@ -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);

7
app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java
View file

@ -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/

10
app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java
View file

@ -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("&#8226;"));
dots[i].setTextSize(35);
dots[i].setTextSize(30);
dots[i].setTextColor(inactiveColor);
dotsLayout.addView(dots[i]);
}

2
app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java
View file

@ -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;

2
app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java
View file

@ -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;

6
app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java
View file

@ -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;

2
app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java
View file

@ -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;

4
app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java
View file

@ -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;

20
app/src/main/java/org/secuso/aktivpause/service/TimerService.java
View file

@ -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();

BIN
app/src/main/res/drawable-hdpi/ic_add_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 114 B

BIN
app/src/main/res/drawable-hdpi/ic_add_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 127 B

BIN
app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 155 B

BIN
app/src/main/res/drawable-hdpi/ic_list_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 116 B

BIN
app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 202 B

BIN
app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 105 B

BIN
app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 195 B

BIN
app/src/main/res/drawable-hdpi/ic_play_circle_filled_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 358 B

BIN
app/src/main/res/drawable-hdpi/ic_play_circle_outline_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1,005 B

BIN
app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 500 B

BIN
app/src/main/res/drawable-hdpi/ic_replay_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 647 B

BIN
app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 391 B

BIN
app/src/main/res/drawable-hdpi/ic_settings_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 827 B

BIN
app/src/main/res/drawable-hdpi/ic_skip_next_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 284 B

BIN
app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 187 B

BIN
app/src/main/res/drawable-hdpi/ic_skip_previous_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 295 B

BIN
app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 201 B

BIN
app/src/main/res/drawable-mdpi/ic_add_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 108 B

BIN
app/src/main/res/drawable-mdpi/ic_add_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 88 B

BIN
app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 111 B

BIN
app/src/main/res/drawable-mdpi/ic_list_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 86 B

BIN
app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 160 B

BIN
app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 83 B

BIN
app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 157 B

BIN
app/src/main/res/drawable-mdpi/ic_play_circle_filled_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 255 B

BIN
app/src/main/res/drawable-mdpi/ic_play_circle_outline_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 680 B

BIN
app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 351 B

BIN
app/src/main/res/drawable-mdpi/ic_replay_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 437 B

BIN
app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 244 B

BIN
app/src/main/res/drawable-mdpi/ic_settings_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 557 B

BIN
app/src/main/res/drawable-mdpi/ic_skip_next_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 225 B

BIN
app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 147 B

BIN
app/src/main/res/drawable-mdpi/ic_skip_previous_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 233 B

BIN
app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 152 B

9
app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z" />
</vector>

9
app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" />
</vector>

BIN
app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 119 B

BIN
app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 97 B

BIN
app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 148 B

BIN
app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 95 B

BIN
app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 222 B

BIN
app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 90 B

BIN
app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 220 B

BIN
app/src/main/res/drawable-xhdpi/ic_play_circle_filled_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 464 B

BIN
app/src/main/res/drawable-xhdpi/ic_play_circle_outline_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 699 B

BIN
app/src/main/res/drawable-xhdpi/ic_replay_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 866 B

BIN
app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 457 B

BIN
app/src/main/res/drawable-xhdpi/ic_settings_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_skip_next_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 340 B

BIN
app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 222 B

BIN
app/src/main/res/drawable-xhdpi/ic_skip_previous_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 354 B

BIN
app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 242 B

BIN
app/src/main/res/drawable-xxhdpi/ic_add_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 130 B

BIN
app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 97 B

BIN
app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 191 B

BIN
app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 94 B

BIN
app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 269 B

BIN
app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 92 B

BIN
app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 283 B

BIN
app/src/main/res/drawable-xxhdpi/ic_play_circle_filled_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 666 B

BIN
app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1,023 B

BIN
app/src/main/res/drawable-xxhdpi/ic_replay_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 675 B

BIN
app/src/main/res/drawable-xxhdpi/ic_settings_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_skip_next_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 437 B

BIN
app/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 292 B

BIN
app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 441 B

BIN
app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 309 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_add_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 133 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 102 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 237 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 100 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 319 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 94 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 343 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_play_circle_filled_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 883 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_replay_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 908 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_settings_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 563 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 357 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_48dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 564 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 372 B

2
app/src/main/res/drawable/bg_splash_screen.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@color/colorAccent"/>
android:drawable="?colorAccent"/>
<item>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

2
app/src/main/res/drawable/button_normal.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/colorAccent" />
<solid android:color="?colorAccent" />
<corners android:radius="6dp" />
</shape>
</item>

8
app/src/main/res/drawable/button_section.xml
View file

@ -2,9 +2,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/white">
<shape>
<solid android:color="@color/colorAccent" />
<solid android:color="?colorAccent" />
<corners android:radius="12dp" />
<stroke android:width="1dp" android:color="@color/colorPrimary"/>
<stroke android:width="1dp" android:color="?colorPrimary"/>
<padding
android:bottom="10dp"
android:left="10dp"
@ -12,11 +12,11 @@
android:top="10dp"/>
</shape>
</item>
<item android:state_checked="false" android:color="@color/colorPrimary">
<item android:state_checked="false" android:color="?colorPrimary">
<shape>
<solid android:color="@color/white" />
<corners android:radius="12dp" />
<stroke android:width="1dp" android:color="@color/colorAccent"/>
<stroke android:width="1dp" android:color="?colorAccent"/>
<padding
android:bottom="-20dp"
android:left="-20dp"

4
app/src/main/res/drawable/button_section_textcolor.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/white"/>
<item android:state_checked="false" android:color="@color/colorPrimary"/>
<item android:color="@color/colorPrimary" />
<item android:state_checked="false" android:color="?colorPrimary"/>
<item android:color="?colorPrimary" />
</selector>

3
app/src/main/res/drawable/ic_about.xml
View file

@ -2,9 +2,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@color/white"
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
</vector>

10
app/src/main/res/drawable/ic_add_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>

13
app/src/main/res/drawable/ic_alarm_black.xml → app/src/main/res/drawable/ic_alarm_24.xml
View file

@ -1,9 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
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"
android:fillColor="#000000"/>
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" />
</vector>

9
app/src/main/res/drawable/ic_alarm_white.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
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"
android:fillColor="#FFFFFF"/>
</vector>

10
app/src/main/res/drawable/ic_close_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@android:color/white"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
</vector>

9
app/src/main/res/drawable/ic_close_white.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

4
app/src/main/res/drawable/ic_create_black.xml
View file

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>

10
app/src/main/res/drawable/ic_delete_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@android:color/white"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
</vector>

9
app/src/main/res/drawable/ic_delete_white.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"
android:fillColor="#FFFFFF"/>
</vector>

10
app/src/main/res/drawable/ic_edit_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>

9
app/src/main/res/drawable/ic_edit_white_24dp.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>

3
app/src/main/res/drawable/ic_help.xml
View file

@ -2,9 +2,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@android:color/white"
android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
</vector>

12
app/src/main/res/drawable/ic_home_black.xml
View file

@ -1,4 +1,10 @@
<vector android:height="24dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@android:color/white"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
</vector>

3
app/src/main/res/drawable/ic_info_black.xml → app/src/main/res/drawable/ic_info_24.xml
View file

@ -1,9 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" />
</vector>

9
app/src/main/res/drawable/ic_info_black_24dp.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" />
</vector>

10
app/src/main/res/drawable/ic_list_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
</vector>

5
app/src/main/res/drawable/ic_list_black_24px.xml
View file

@ -1,5 +0,0 @@
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
</vector>

9
app/src/main/res/drawable/ic_list_white_24px.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"
android:fillColor="#FFFFFF"/>
</vector>

3
app/src/main/res/drawable/ic_menu_tutorial.xml
View file

@ -2,9 +2,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@android:color/white"
android:pathData="M5,13.18v4L12,21l7,-3.82v-4L12,17l-7,-3.82zM12,3L1,9l11,6 9,-4.91V17h2V9L12,3z"/>
</vector>

9
app/src/main/res/drawable/ic_notifications_black_24dp.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z" />
</vector>

5
app/src/main/res/drawable/ic_pause_48.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:height="48dp" android:tint="?attr/colorControlNormal"
android:viewportHeight="24" android:viewportWidth="24"
android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
</vector>

4
app/src/main/res/drawable/ic_pause_black_48dp.xml
View file

@ -1,4 +0,0 @@
<vector android:height="48dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
</vector>

5
app/src/main/res/drawable/ic_play_arrow_48.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:height="48dp" android:tint="?attr/colorControlNormal"
android:viewportHeight="24" android:viewportWidth="24"
android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M8,5v14l11,-7z"/>
</vector>

5
app/src/main/res/drawable/ic_play_arrow_black.xml
View file

@ -1,5 +0,0 @@
<vector android:autoMirrored="true" android:height="48dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
</vector>

11
app/src/main/res/drawable/ic_repeat_48.xml Normal file
View file

@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="40dp"
android:tint="?attr/colorControlNormal"
android:autoMirrored="true"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
</vector>

5
app/src/main/res/drawable/ic_repeat_black_48dp.xml
View file

@ -1,5 +0,0 @@
<vector android:autoMirrored="true" android:height="40dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
</vector>

10
app/src/main/res/drawable/ic_replay_48.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
</vector>

13
app/src/main/res/drawable/ic_settings_black_24dp.xml → app/src/main/res/drawable/ic_settings_24.xml
View file

@ -1,9 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
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"/>
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" />
</vector>

10
app/src/main/res/drawable/ic_skip_next_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
</vector>

10
app/src/main/res/drawable/ic_skip_next_48.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
</vector>

10
app/src/main/res/drawable/ic_skip_previous_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
</vector>

10
app/src/main/res/drawable/ic_skip_previous_48.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
</vector>

10
app/src/main/res/drawable/ic_sync_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
</vector>

9
app/src/main/res/drawable/ic_sync_black_24dp.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" />
</vector>

10
app/src/main/res/drawable/ic_theme_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
</vector>

11
app/src/main/res/drawable/ic_update_40.xml Normal file
View file

@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="40dp"
android:autoMirrored="true"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1 -2.73,2.71 -2.73,7.08 0,9.79 2.73,2.71 7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29 -3.51,3.48 -9.21,3.48 -12.72,0 -3.5,-3.47 -3.53,-9.11 -0.02,-12.58 3.51,-3.47 9.14,-3.47 12.65,0L21,3v7.12zM12.5,8v4.25l3.5,2.08 -0.72,1.21L11,13V8h1.5z" />
</vector>

5
app/src/main/res/drawable/ic_update_black_40dp.xml
View file

@ -1,5 +0,0 @@
<vector android:autoMirrored="true" android:height="40dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1 -2.73,2.71 -2.73,7.08 0,9.79 2.73,2.71 7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29 -3.51,3.48 -9.21,3.48 -12.72,0 -3.5,-3.47 -3.53,-9.11 -0.02,-12.58 3.51,-3.47 9.14,-3.47 12.65,0L21,3v7.12zM12.5,8v4.25l3.5,2.08 -0.72,1.21L11,13V8h1.5z"/>
</vector>

10
app/src/main/res/drawable/ic_view_list_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
</vector>

5
app/src/main/res/drawable/ic_view_list_black_24px.xml
View file

@ -1,5 +0,0 @@
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
</vector>

2
app/src/main/res/drawable/progress_circular.xml
View file

@ -15,7 +15,7 @@
android:useLevel="true"
android:shape="ring"
android:thicknessRatio="12">
<solid android:color="@color/colorAccent"/>
<solid android:color="?colorAccent"/>
</shape>
</item>
</layer-list>

2
app/src/main/res/drawable/progress_circular_small.xml
View file

@ -15,7 +15,7 @@
android:shape="ring"
android:useLevel="true"
android:thicknessRatio="6">
<solid android:color="@color/colorAccent"/>
<solid android:color="?colorAccent"/>
</shape>
</item>
</layer-list>

9
app/src/main/res/drawable/side_nav_bar.xml
View file

@ -1,9 +0,0 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="90"
android:centerColor="@color/middlegrey"
android:endColor="@color/middlegrey"
android:startColor="@color/middlegrey"
android:type="linear" />
</shape>

10
app/src/main/res/layout/activity_choose_exercise.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -18,7 +18,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<android.support.design.chip.ChipGroup
<com.google.android.material.chip.ChipGroup
android:id="@+id/layout_filter_buttons"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@ -35,7 +35,7 @@
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:drawableStart="@drawable/ic_alarm_black"
android:drawableStart="@drawable/ic_alarm_24"
android:gravity="center"
android:text="@string/exercise_time"
android:textColor="@color/black"
@ -46,7 +46,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/h_scroll_filter_buttons" />
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/exercise_list"
android:layout_width="0dp"
android:layout_height="0dp"
@ -61,4 +61,4 @@
app:layout_constraintVertical_bias="0.0"
tools:listitem="@layout/layout_exercise_grid_item" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

35
app/src/main/res/layout/activity_edit_exercise_set.xml
View file

@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.ActionBar">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"/>
android:background="?colorPrimary"/>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -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" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout2"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/exercise_list"
android:layout_width="0dp"
android:layout_height="0dp"
@ -85,7 +85,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">
</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>
<ProgressBar
android:id="@+id/loading_spinner"
@ -98,10 +98,11 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_button"
style="@style/AppTheme.FAB"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
@ -111,8 +112,8 @@
android:onClick="onClick"
app:fabSize="normal"
android:layout_gravity="bottom|end"
app:srcCompat="@drawable/ic_edit_white_24dp" />
app:srcCompat="@drawable/ic_edit_24" />
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

49
app/src/main/res/layout/activity_exercise.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_content"
@ -20,11 +20,11 @@
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:scaleType="fitXY"
android:tint="@color/colorPrimary"
android:tint="?colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:srcCompat="@drawable/ic_play_arrow_black" />
app:srcCompat="@drawable/ic_play_arrow_48" />
<ImageButton
android:id="@+id/button_next"
@ -39,11 +39,11 @@
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:scaleType="fitXY"
android:tint="@color/colorPrimary"
android:tint="?colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:srcCompat="@drawable/ic_skip_next_black_48dp"
app:srcCompat="@drawable/ic_skip_next_48"
app:layout_constraintHorizontal_bias="0.6666" />
<ImageButton
@ -59,11 +59,11 @@
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:scaleType="fitXY"
android:tint="@color/colorPrimary"
android:tint="?colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:srcCompat="@drawable/ic_skip_previous_black_48dp"
app:srcCompat="@drawable/ic_skip_previous_48"
app:layout_constraintHorizontal_bias="0.3333" />
<ImageButton
@ -80,12 +80,12 @@
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:scaleType="fitXY"
android:tint="@color/middlegrey"
android:tint="?colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.8333"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:srcCompat="@drawable/ic_repeat_black_48dp" />
app:srcCompat="@drawable/ic_repeat_48" />
<ImageButton
android:id="@+id/button_continuous"
@ -101,14 +101,14 @@
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:scaleType="fitXY"
android:tint="@color/middlegrey"
android:tint="?colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.1666"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:srcCompat="@drawable/ic_update_black_40dp" />
app:srcCompat="@drawable/ic_update_40" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/exercise_layout"
android:layout_width="0dp"
android:layout_height="0dp"
@ -150,14 +150,14 @@
android:gravity="center"
android:text="00:00"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@color/colorPrimaryDark"
android:textColor="?colorAccent"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/exercise_image_container"
android:layout_width="0dp"
android:layout_height="0dp"
@ -191,17 +191,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:padding="4dp"
android:background="?android:selectableItemBackgroundBorderless"
android:hapticFeedbackEnabled="true"
android:tint="?colorControlNormal"
app:layout_constraintRight_toRightOf="@+id/exercise_image"
app:layout_constraintTop_toTopOf="@+id/exercise_image"
app:srcCompat="@drawable/ic_about"
android:tint="@color/black"/>
app:srcCompat="@drawable/ic_about"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/execution_title"
@ -241,7 +240,7 @@
app:layout_constraintLeft_toLeftOf="@+id/description_title"
app:layout_constraintTop_toBottomOf="@+id/description_title" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/section_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -264,7 +263,7 @@
android:gravity="center"
android:text="Neck, Arms"
android:textColor="@color/white" />
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/exercise_name"
@ -284,9 +283,9 @@
app:layout_constraintTop_toBottomOf="@+id/section_card" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bigProgressBarLayout"
android:layout_width="0dp"
android:layout_height="0dp"
@ -331,7 +330,7 @@
android:text="00:00"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@color/colorPrimaryDark"
android:textColor="?colorPrimary"
android:textSize="36sp"
android:textStyle="bold"
android:visibility="visible"
@ -339,6 +338,6 @@
app:layout_constraintLeft_toLeftOf="@+id/progressBarBig"
app:layout_constraintRight_toRightOf="@+id/progressBarBig"
app:layout_constraintTop_toTopOf="@+id/progressBarBig" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

10
app/src/main/res/layout/activity_help.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -9,7 +9,7 @@
android:layout_height="match_parent"
tools:openDrawer="start">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
@ -37,9 +37,9 @@
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<android.support.design.widget.NavigationView
<com.google.android.material.navigation.NavigationView
android:id="@+id/nav_view"
tools:visibility="gone"
android:layout_width="wrap_content"
@ -49,4 +49,4 @@
app:headerLayout="@layout/nav_header"
app:menu="@menu/nav_drawer" />
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

22
app/src/main/res/layout/activity_manage_exercise_set.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
@ -8,7 +8,7 @@
android:fitsSystemWindows="true"
tools:openDrawer="start">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -16,7 +16,7 @@
<include layout="@layout/layout_toolbar"/>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:id="@+id/main_content"
@ -46,7 +46,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/exercise_set_list"
android:layout_width="0dp"
android:layout_height="0dp"
@ -59,11 +59,11 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">
</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -74,11 +74,11 @@
android:clickable="true"
android:onClick="onClick"
app:fabSize="normal"
app:srcCompat="@drawable/ic_add_white_24dp" />
app:srcCompat="@drawable/ic_add_24" />
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<android.support.design.widget.NavigationView
<com.google.android.material.navigation.NavigationView
android:id="@+id/nav_view"
tools:visibility="gone"
android:layout_width="wrap_content"
@ -88,4 +88,4 @@
app:headerLayout="@layout/nav_header"
app:menu="@menu/nav_drawer" />
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

14
app/src/main/res/layout/activity_settings.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
@ -8,14 +8,14 @@
android:fitsSystemWindows="true"
tools:openDrawer="start">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.secuso.aktivpause.activities.EditExerciseSetActivity">
<include layout="@layout/layout_toolbar"/>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:id="@+id/main_content"
@ -64,11 +64,11 @@
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<android.support.design.widget.NavigationView
<com.google.android.material.navigation.NavigationView
android:id="@+id/nav_view"
tools:visibility="gone"
android:layout_width="wrap_content"
@ -78,4 +78,4 @@
app:headerLayout="@layout/nav_header"
app:menu="@menu/nav_drawer" />
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

42
app/src/main/res/layout/activity_timer.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
@ -8,7 +8,7 @@
android:fitsSystemWindows="true"
tools:openDrawer="start">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
@ -16,7 +16,7 @@
<include layout="@layout/layout_toolbar"/>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -25,7 +25,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="org.secuso.aktivpause.activities.TimerActivity">
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_choose_exercise_set"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -82,7 +82,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:divider="@color/colorAccent"
android:divider="?colorAccent"
android:dividerPadding="4dp"
android:gravity="center"
android:orientation="horizontal"
@ -113,7 +113,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" />
@ -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 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:divider="@color/colorAccent"
android:divider="?colorAccent"
android:dividerPadding="4dp"
android:gravity="center"
android:orientation="horizontal"
@ -208,7 +208,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" />
@ -237,8 +237,8 @@
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="260dp"
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="0dp"
android:layout_marginEnd="0dp"
@ -269,8 +269,8 @@
android:gravity="center"
android:text="00:00:00"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@color/colorPrimaryDark"
android:textSize="36sp"
android:textColor="?colorPrimary"
android:textSize="32sp"
android:textStyle="bold"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/progressBar"
@ -288,11 +288,11 @@
android:background="?android:selectableItemBackgroundBorderless"
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:tint="@color/darkblue"
android:tint="?colorAccent"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:srcCompat="@drawable/ic_replay_black_48dp" />
app:srcCompat="@drawable/ic_replay_48" />
<ImageButton
android:id="@+id/button_playPause"
@ -305,18 +305,18 @@
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:scaleType="fitXY"
android:tint="@color/darkblue"
android:tint="?colorAccent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:srcCompat="@drawable/ic_play_arrow_black" />
app:srcCompat="@drawable/ic_play_arrow_48" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<android.support.design.widget.NavigationView
<com.google.android.material.navigation.NavigationView
android:id="@+id/nav_view"
tools:visibility="gone"
android:layout_width="wrap_content"
@ -326,4 +326,4 @@
app:headerLayout="@layout/nav_header"
app:menu="@menu/nav_drawer" />
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

2
app/src/main/res/layout/activity_tutorial.xml
View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
tools:showIn="@layout/activity_tutorial">
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />

10
app/src/main/res/layout/dialog_add_exercise_set.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
@ -19,12 +19,12 @@
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="8dp">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/dialog_add_exercise_set_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/dialog_add_exercise_set_name"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/dialog_exercise.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -84,7 +84,7 @@
app:layout_constraintTop_toBottomOf="@+id/description_title"
app:layout_constraintVertical_bias="0.0" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/section_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -109,6 +109,6 @@
android:gravity="center"
android:text="Neck, Arms"
android:textColor="@color/white" />
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/layout_exercise_grid_item.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/exercise_layout"
android:layout_width="match_parent"
@ -48,4 +48,4 @@
app:layout_constraintBottom_toBottomOf="@+id/exercise_image"
app:layout_constraintRight_toRightOf="@+id/exercise_image" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

21
app/src/main/res/layout/layout_exercise_set.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -7,7 +7,7 @@
android:layout_margin="0dp"
android:padding="0dp">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/exercise_set_card"
android:longClickable="true"
android:clickable="true"
@ -20,12 +20,13 @@
android:visibility="visible"
app:cardCornerRadius="2dp"
app:cardElevation="4dp"
android:backgroundTint="?backgroundColor"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -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" />
<TextView
android:id="@+id/exercise_set_time_short"
@ -63,9 +64,8 @@
android:layout_gravity="center"
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp"
android:drawableStart="@drawable/ic_alarm_black"
android:drawableStart="@drawable/ic_alarm_24"
android:gravity="center"
android:textColor="@color/black"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -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 @@
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/layout_section_filter_button.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.chip.Chip
<com.google.android.material.chip.Chip
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/button"

8
app/src/main/res/layout/layout_toolbar.xml
View file

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@style/AppTheme.ActionBar">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary" />
android:background="?colorPrimary" />
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>

9
app/src/main/res/layout/nav_header.xml
View file

@ -2,17 +2,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
android:background="@color/colorAccent"
android:background="?colorAccent"
android:gravity="bottom"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
android:paddingTop="@dimen/activity_vertical_margin">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ffffff"
android:background="?backgroundColor"
android:paddingTop="7dp"
android:paddingBottom="7dp"
android:orientation="horizontal">
@ -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"

2
app/src/main/res/layout/tutorial_slide1.xml
View file

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorAccent">
android:background="@color/colorDarkAccent">
<LinearLayout
android:layout_width="wrap_content"

2
app/src/main/res/layout/tutorial_slide2.xml
View file

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorAccent">
android:background="@color/colorDarkAccent">
<LinearLayout
android:layout_width="wrap_content"

2
app/src/main/res/layout/tutorial_slide3.xml
View file

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorAccent">
android:background="@color/colorDarkAccent">
<LinearLayout
android:layout_width="wrap_content"

2
app/src/main/res/layout/tutorial_slide4.xml
View file

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorAccent">
android:background="@color/colorDarkAccent">
<LinearLayout
android:layout_width="wrap_content"

2
app/src/main/res/layout/tutorial_slide5.xml
View file

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorAccent">
android:background="@color/colorDarkAccent">
<LinearLayout
android:layout_width="wrap_content"

2
app/src/main/res/layout/tutorial_slide6.xml
View file

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorAccent">
android:background="@color/colorDarkAccent">
<LinearLayout
android:layout_width="wrap_content"

2
app/src/main/res/menu/menu_manage_exercise_sets.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="delete" android:id="@+id/action_delete" android:icon="@drawable/ic_delete_white" android:visible="true" app:showAsAction="always"/>
<item android:title="delete" android:id="@+id/action_delete" android:icon="@drawable/ic_delete_24" android:visible="true" app:showAsAction="always"/>
</menu>

10
app/src/main/res/menu/nav_drawer.xml
View file

@ -4,11 +4,11 @@
<group android:id="@+id/group_main" android:checkableBehavior="all">
<item
android:id="@+id/nav_timer"
android:icon="@drawable/ic_alarm_black"
android:icon="@drawable/ic_alarm_24"
android:title="@string/app_name_short" />
<item
android:id="@+id/nav_manage_exercise_sets"
android:icon="@drawable/ic_list_black_24px"
android:icon="@drawable/ic_list_24"
android:title="@string/activity_title_manage_exercise_sets" />
</group>
@ -20,8 +20,12 @@
android:title="@string/title_activity_tutorial" />
<item
android:id="@+id/nav_settings"
android:icon="@drawable/ic_settings_black_24dp"
android:icon="@drawable/ic_settings_24"
android:title="@string/title_activity_settings" />
<item
android:id="@+id/nav_theme"
android:icon="@drawable/ic_theme_24"
android:title="@string/title_theme" />
<item
android:id="@+id/nav_help"
android:icon="@drawable/ic_help"

4
app/src/main/res/values-de/strings.xml
View file

@ -176,5 +176,9 @@
<string name="dialog_evaluation_title">Online-Befragung</string>
<string name="dialog_evaluation_yes">Ja</string>
<string name="menu_display_evaluation_dialog">Online-Befragung</string>
<string name="title_theme">Theme</string>
<string name="follow_system">Standard</string>
<string name="dark">Dunkel</string>
<string name="light">Hell</string>
</resources>

75
app/src/main/res/values-night/styles.xml Normal file
View file

@ -0,0 +1,75 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorAccent</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowBackground">@color/black</item>
<item name="backgroundColor">@color/secondaryBackgroundDark</item>
<item name="colorControlNormal">@color/white</item>
<item name="android:timePickerStyle">@style/TimePickerDialogStyle</item>
</style>
<style name="AppTheme.MaterialComponentTheme" parent="Theme.MaterialComponents.DayNight">
<item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorAccent</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:timePickerStyle">@style/TimePickerDialogStyle</item>
</style>
<style name="AppTheme.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorAccent</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme.Button" parent="Widget.AppCompat.Button.Borderless.Colored">
</style>
<style name="AppTheme.NoActionBar" parent="AppTheme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
</style>
<style name="AppTheme.NumberPicker" parent="AppTheme">
<item name="android:textColorPrimary">@color/colorAccent</item>
<item name="android:textColorSecondary">@color/colorAccent</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="SplashTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
<item name="android:windowBackground">@drawable/bg_splash_screen</item>
<item name="android:windowNoTitle">true</item>
</style>
<style name="TimePickerDialogStyle" parent="@android:style/Widget.Material.TimePicker">
<item name="colorAccent">@color/colorAccent</item>
<item name="android:timePickerMode">clock</item>
<item name="android:headerBackground">@color/black</item>
<item name="android:headerTimeTextAppearance">@style/TextAppearance.TimePickerDialogStyle.TimeLabel</item>
</style>
<style name="TextAppearance.TimePickerDialogStyle.TimeLabel" parent="@android:style/TextAppearance.Material">
<item name="android:textSize">60sp</item> <!-- from -->
<item name="android:textColor">@color/colorAccent</item>
</style>
<style name="AppTheme.ActionBar" parent="AppTheme">
<item name="android:textColorPrimary">@color/black</item>
<item name="android:textColor">@color/white</item>
<item name="android:textColorSecondary">@color/black</item>
</style>
<style name="AppTheme.FAB" parent="Widget.MaterialComponents.FloatingActionButton">
<item name="backgroundTint">?colorAccent</item>
<item name="tint">?colorControlNormal</item>
<item name="borderWidth">0dp</item>
</style>
</resources>

40
app/src/main/res/values/styles.xml → app/src/main/res/values-notnight/styles.xml
View file

@ -1,39 +1,37 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorAccent</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="backgroundColor">@color/white</item>
<item name="android:windowBackground">@color/white</item>
<item name="android:alertDialogTheme">@style/AppTheme.AlertDialog</item>
<item name="android:timePickerStyle">@style/TimePickerDialogStyle</item>
</style>
<style name="AppTheme.MaterialComponentTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<style name="AppTheme.MaterialComponentTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorAccent</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowBackground">@color/white</item>
<item name="backgroundColor">@color/secondaryBackgroundLight</item>
<item name="android:alertDialogTheme">@style/AppTheme.AlertDialog</item>
<item name="colorControlNormal">@color/black</item>
<item name="android:timePickerStyle">@style/TimePickerDialogStyle</item>
</style>
<style name="AppTheme.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimary</item>
<style name="AppTheme.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorAccent</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme.Button" parent="Widget.AppCompat.Button.Borderless.Colored">
</style>
<style name="AppTheme.AlertDialog" parent="AppTheme.Dialog">
<item name="android:textColorPrimary">@color/black</item>
<item name="android:textColorSecondary">@color/black</item>
</style>
<style name="AppTheme.NoActionBar" parent="AppTheme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
@ -41,7 +39,7 @@
</style>
<style name="AppTheme.NumberPicker" parent="AppTheme">
<item name="android:textColorPrimary">@color/colorPrimary</item>
<item name="android:textColorPrimary">@color/colorAccent</item>
<item name="android:textColorSecondary">@color/colorAccent</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
@ -61,7 +59,7 @@
<style name="TextAppearance.TimePickerDialogStyle.TimeLabel" parent="@android:style/TextAppearance.Material">
<item name="android:textSize">60sp</item> <!-- from -->
<item name="android:textColor">@color/colorPrimary</item>
<item name="android:textColor">@color/colorAccent</item>
</style>
<style name="AppTheme.ActionBar" parent="AppTheme">
@ -70,4 +68,10 @@
<item name="android:textColorSecondary">@color/white</item>
</style>
<style name="AppTheme.FAB" parent="Widget.MaterialComponents.FloatingActionButton">
<item name="backgroundTint">?colorAccent</item>
<item name="tint">?colorControlNormal</item>
<item name="borderWidth">0dp</item>
</style>
</resources>

6
app/src/main/res/values/colors.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#024265</color>
<color name="colorPrimaryDark">#024265</color>
<color name="colorAccent">#0274B2</color>
<color name="colorDarkAccent">#024265</color>
<color name="colorLightAccent">#8aa5ce</color>
<color name="transparent">#00000000</color>
<color name="white">#ffffff</color>
<color name="secondaryBackgroundLight">#d9dddf</color>
<color name="black">#000000</color>
<color name="secondaryBackgroundDark">#333639</color>
<color name="lightblue">#0274B2</color>
<color name="middleblue">#8aa5ce</color>
<color name="darkblue">#024265</color>
<color name="middlegrey">#A8A8A8</color>
<color name="yellow">#f6d126</color>
<color name="red">#B71C1C</color>

4
app/src/main/res/values/strings.xml
View file

@ -59,6 +59,10 @@
<string name="set_contains_no_exercises">This set contains no exercises.</string>
<string name="take_a_break_now">Take a break now! Click here to do your chosen exercises.</string>
<string name="title_activity_settings">Settings</string>
<string name="title_theme">Theme</string>
<string name="follow_system">Standard</string>
<string name="dark">Dark Theme</string>
<string name="light">Light Theme</string>
<string name="no_exercise_sets">No exercise sets available. Please create a new one.</string>
<string name="activity_title_manage_exercise_sets">Exercise Sets</string>
<string name="activity_title_edit_exercise_set">Edit Exercise Set</string>

4
app/src/main/res/xml/pref_headers.xml
View file

@ -4,12 +4,12 @@
<header
android:fragment="org.secuso.aktivpause.activities.SettingsActivity$ExercisePreferenceFragment"
android:icon="@drawable/ic_info_black"
android:icon="@drawable/ic_info_24"
android:title="@string/pref_header_exercises" />
<header
android:fragment="org.secuso.aktivpause.activities.SettingsActivity$TimerSchedulePreferenceFragment"
android:icon="@drawable/ic_alarm_black"
android:icon="@drawable/ic_alarm_24"
android:title="@string/pref_header_schedule" />
</preference-headers>

4
gradle.properties
View file

@ -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
# org.gradle.parallel=true
android.enableJetifier=true
android.useAndroidX=true