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

Updated Buildscript and set default work timer to 2 hours.

Browse source
This commit is contained in:
Christopher Beckmann 2018-08-07 12:06:33 +02:00
commit d558fa7587
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

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

2
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java
View file

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

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

@ -35,9 +35,9 @@
<item name="android:textStyle">bold</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.AppBarOverlay" parent="Theme.AppCompat.Light.DarkActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppTheme.PopupOverlay" parent="Theme.AppCompat.Light" />
<style name="SplashTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
<item name="android:windowBackground">@drawable/bg_splash_screen</item>

2
build.gradle
View file

@ -10,7 +10,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files