From c96c735ca4a3d2c17125cfe4ad853cf9a1c8f614 Mon Sep 17 00:00:00 2001 From: Ruben Date: Wed, 20 Sep 2017 08:38:15 +0200 Subject: [PATCH] Add 'previous' menu to Credits menu --- .idea/misc.xml | 2 +- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 6 ++- .../emotionhero/CreditsActivity.java | 20 +++++----- .../emotionhero/ProgressActivity.java | 2 +- app/src/main/res/layout/activity_credits.xml | 38 +++++++++++++++++-- app/src/main/res/values/dimens.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 9 files changed, 56 insertions(+), 24 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index bd04605..1b77328 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 6652315..2c5aee3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ android { signingConfigs { } compileSdkVersion 24 - buildToolsVersion '23.0.3' + buildToolsVersion '25.0.0' defaultConfig { applicationId 'com.rubenvandeven.emotion_hero' minSdkVersion 16 targetSdkVersion 24 - versionCode 10 + versionCode 11 versionName '1.2' testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9c02eab..9c33313 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -53,7 +53,11 @@ android:name=".CreditsActivity" android:screenOrientation="portrait" android:configChanges="orientation" - android:theme="@style/FullscreenTheme" /> + android:theme="@style/FullscreenTheme"> + + + + + + + + + + + + android:layout_marginBottom="@dimen/fab_margin" + + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + /> 14sp 17sp 17sp + 11sp 20sp 20sp 17sp - diff --git a/build.gradle b/build.gradle index 86851b2..35215a6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..05c69b2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Sep 13 13:41:16 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip