diff --git a/app/build.gradle b/app/build.gradle index 36c90ad..d7be48f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "org.secuso.aktivpause" minSdkVersion 21 targetSdkVersion 28 - versionCode 5 - versionName "0.5" + versionCode 6 + versionName "1.0" vectorDrawables.useSupportLibrary = true } lintOptions { diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..bbf8f01 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/tutorial_slide6.xml b/app/src/main/res/layout/tutorial_slide6.xml index 2a916a3..8029bd4 100644 --- a/app/src/main/res/layout/tutorial_slide6.xml +++ b/app/src/main/res/layout/tutorial_slide6.xml @@ -32,11 +32,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" + android:gravity="center" android:paddingLeft="@dimen/desc_padding" android:paddingRight="@dimen/desc_padding" android:text="@string/slide6_text" android:textAlignment="center" - android:gravity="center" android:textColor="@android:color/white" android:textSize="@dimen/slide_desc" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..7353dbd --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..7353dbd --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_app.png b/app/src/main/res/mipmap-hdpi/ic_app.png index 6003ef0..1bb347d 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_app.png and b/app/src/main/res/mipmap-hdpi/ic_app.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index bbd2ef8..355fc18 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..f074c8c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_notification.png b/app/src/main/res/mipmap-hdpi/ic_notification.png index a6b68f2..88beba0 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_notification.png and b/app/src/main/res/mipmap-hdpi/ic_notification.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_splash.png b/app/src/main/res/mipmap-hdpi/ic_splash.png index bb3b596..dd41559 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_splash.png and b/app/src/main/res/mipmap-hdpi/ic_splash.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_app.png b/app/src/main/res/mipmap-mdpi/ic_app.png index c5a4c91..0d25cd3 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_app.png and b/app/src/main/res/mipmap-mdpi/ic_app.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index f21a01f..5403e73 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..54fc362 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_notification.png b/app/src/main/res/mipmap-mdpi/ic_notification.png index 9012aae..e07e20a 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_notification.png and b/app/src/main/res/mipmap-mdpi/ic_notification.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_splash.png b/app/src/main/res/mipmap-mdpi/ic_splash.png index 86c5614..b3a0c96 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_splash.png and b/app/src/main/res/mipmap-mdpi/ic_splash.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_app.png b/app/src/main/res/mipmap-xhdpi/ic_app.png index f22270c..6c4b0a7 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_app.png and b/app/src/main/res/mipmap-xhdpi/ic_app.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index be43da1..2c16f6c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..fecd336 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_notification.png b/app/src/main/res/mipmap-xhdpi/ic_notification.png index dbf4920..bfea2ca 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_notification.png and b/app/src/main/res/mipmap-xhdpi/ic_notification.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_splash.png b/app/src/main/res/mipmap-xhdpi/ic_splash.png index dcd31b3..9b5e7c8 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_splash.png and b/app/src/main/res/mipmap-xhdpi/ic_splash.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_app.png b/app/src/main/res/mipmap-xxhdpi/ic_app.png index 619fd55..e5ec83a 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_app.png and b/app/src/main/res/mipmap-xxhdpi/ic_app.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index daccf78..a4e2501 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..dc87f9b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_notification.png b/app/src/main/res/mipmap-xxhdpi/ic_notification.png index 7f9a217..d48dda7 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_notification.png and b/app/src/main/res/mipmap-xxhdpi/ic_notification.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_splash.png b/app/src/main/res/mipmap-xxhdpi/ic_splash.png index 69eea8e..602abd9 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_splash.png and b/app/src/main/res/mipmap-xxhdpi/ic_splash.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_app.png b/app/src/main/res/mipmap-xxxhdpi/ic_app.png index 113f7f3..156db18 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_app.png and b/app/src/main/res/mipmap-xxxhdpi/ic_app.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index d519923..41beab6 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..5d8822f Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_notification.png b/app/src/main/res/mipmap-xxxhdpi/ic_notification.png index 1a103cb..c230dac 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_notification.png and b/app/src/main/res/mipmap-xxxhdpi/ic_notification.png differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..9872e68 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #3680BB + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aabe511..cba58f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ Welcome to Aktivpause to Go! - This app reminds you to regularly take breaks during your work. Additionally, you can choose from a set of exercises, that can help you to spend your break more active. + This app reminds you to regularly take breaks during your work. Additionally, you can choose from a set of exercises, that can help you to spend your break more active. The exercises are currently only provided in german. Create Exercise Sets