From f3806c27e356fa887b70e09972f64df031370d58 Mon Sep 17 00:00:00 2001 From: Kai-Sebastian Birkenstock Date: Tue, 27 Mar 2018 18:20:28 +0200 Subject: [PATCH 1/8] change recommended routine.json --- ...odyweight_fitness_recommended_routine.json | 7 ++++++ build.gradle | 23 ++++++++++++------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/raw/bodyweight_fitness_recommended_routine.json b/app/src/main/res/raw/bodyweight_fitness_recommended_routine.json index c47badce..43ddd417 100644 --- a/app/src/main/res/raw/bodyweight_fitness_recommended_routine.json +++ b/app/src/main/res/raw/bodyweight_fitness_recommended_routine.json @@ -263,6 +263,13 @@ "videoId": "bodyweight_fitness_rings_turned_out_support_hold", "defaultSet": "timed" }, + { + "sectionId": "section51", + "title": "Skin the cat Practise", + "description": "2-3 min", + "type": "section", + "mode": "levels" + }, { "categoryId": "category2", "title": "Strength Work", diff --git a/build.gradle b/build.gradle index 31f6f15e..e8570177 100644 --- a/build.gradle +++ b/build.gradle @@ -2,24 +2,32 @@ buildscript { ext.kotlin_version = '1.1.51' ext.support_version = '26.0.2' repositories { - google() + apply plugin: 'java' + apply plugin: 'application' + maven { + url 'https://maven.google.com/' + name 'Google' + } jcenter() mavenCentral() maven { url "https://jitpack.io" } maven { url "https://clojars.org/repo/" } maven { url "https://maven.fabric.io/public" } + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'io.realm:realm-gradle-plugin:2.3.0' classpath 'io.fabric.tools:gradle:1.+' } } - allprojects { repositories { - google() + maven { + url 'https://maven.google.com/' + name 'Google' + } jcenter() mavenCentral() maven { url "https://jitpack.io" } @@ -29,7 +37,6 @@ allprojects { maven { url "http://dl.bintray.com/jetbrains/spek" } } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file +//task clean(type: Delete) { +// delete rootProject.buildDir +//} \ No newline at end of file From 6c4bbd5090db6c512ff58101503956bda730fff0 Mon Sep 17 00:00:00 2001 From: Kai-Sebastian Birkenstock Date: Wed, 28 Mar 2018 09:55:36 +0200 Subject: [PATCH 2/8] add skin_the_cat video and section --- .../res/layout/view_dashboard_section.xml | 27 +++++++++--------- app/src/main/res/layout/view_home.xml | 14 ++++----- ...odyweight_fitness_recommended_routine.json | 12 +++++++- .../raw/bodyweight_fitness_skin_the_cat.mp4 | Bin 0 -> 3201690 bytes 4 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 app/src/main/res/raw/bodyweight_fitness_skin_the_cat.mp4 diff --git a/app/src/main/res/layout/view_dashboard_section.xml b/app/src/main/res/layout/view_dashboard_section.xml index e8d87209..935ab0aa 100644 --- a/app/src/main/res/layout/view_dashboard_section.xml +++ b/app/src/main/res/layout/view_dashboard_section.xml @@ -1,7 +1,6 @@ @@ -9,40 +8,40 @@ + android:gravity="center" + android:orientation="horizontal"> + android:paddingRight="20dp"> + android:textSize="18dp" + app:robotoTypeface="roboto_regular" /> + android:textSize="14dp" + app:robotoTypeface="roboto_light" /> \ No newline at end of file diff --git a/app/src/main/res/layout/view_home.xml b/app/src/main/res/layout/view_home.xml index 21b58cf8..ce795d83 100644 --- a/app/src/main/res/layout/view_home.xml +++ b/app/src/main/res/layout/view_home.xml @@ -66,29 +66,29 @@ + android:paddingBottom="8dp" + android:paddingTop="8dp">