From d558fa7587cbff2aa79ba477f6892596977409a3 Mon Sep 17 00:00:00 2001 From: Christopher Beckmann Date: Tue, 7 Aug 2018 12:06:33 +0200 Subject: [PATCH] Updated Buildscript and set default work timer to 2 hours. --- app/build.gradle | 6 +++--- .../activities/tutorial/FirstLaunchManager.java | 2 +- app/src/main/res/values/styles.xml | 4 ++-- build.gradle | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index eabea17..4fb06aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 'android-P' + compileSdkVersion 28 buildToolsVersion '27.0.3' defaultConfig { @@ -40,11 +40,11 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:28.0.0-alpha1' implementation 'com.android.support:design:28.0.0-alpha1' - implementation 'com.github.bumptech.glide:glide:4.0.0' + implementation 'com.github.bumptech.glide:glide:4.6.1' implementation 'com.android.support:support-v4:28.0.0-alpha1' implementation 'com.android.support:support-annotations:27.1.1' implementation 'com.android.support:cardview-v7:28.0.0-alpha1' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.nex3z:flow-layout:1.0.0' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' testImplementation 'junit:junit:4.12' diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java index 0cee8e7..6b9a2d3 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java +++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java @@ -80,7 +80,7 @@ public class FirstLaunchManager { .putInt(PREF_BREAK_PICKER_MINUTES, 5) .putInt(PREF_PICKER_SECONDS, 0) .putInt(PREF_PICKER_MINUTES, 0) - .putInt(PREF_PICKER_HOURS, 1) + .putInt(PREF_PICKER_HOURS, 2) .putLong(WORK_TIME, 1000L * 60L * 60L) // 1 hour .putString(EXERCISE_DURATION, "30") .putBoolean(PREF_SCHEDULE_EXERCISE_DAYS_ENABLED, false) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 697a695..cc2fcea 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -35,9 +35,9 @@ bold -