From 2c0420f3a015330b46637d8b728615c52d3cdb7d Mon Sep 17 00:00:00 2001 From: Chris Zhao Date: Thu, 15 Dec 2016 22:48:10 +0100 Subject: [PATCH 1/6] Updated gradle, tool, sdk etc. --- app/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c6d54d0..468a1d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'realm-android' android { compileSdkVersion 24 - buildToolsVersion "24.0.1" + buildToolsVersion '25.0.0' defaultConfig { applicationId "com.codeest.geeknews" diff --git a/build.gradle b/build.gradle index 9ad36d4..2bda288 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-rc1' + classpath 'com.android.tools.build:gradle:2.3.0-alpha3' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath "io.realm:realm-gradle-plugin:1.1.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..8f0c945 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 +#Thu Dec 15 22:39:13 CET 2016 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.2-all.zip From bba3e3beb2bd89799d7ee165634621188796865f Mon Sep 17 00:00:00 2001 From: Chris Zhao Date: Thu, 15 Dec 2016 22:56:37 +0100 Subject: [PATCH 2/6] Update support libs, target, build-tool --- app/build.gradle | 18 +++++++++++------- app/src/main/res/values/colors.xml | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 468a1d4..1b86010 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'realm-android' android { compileSdkVersion 24 - buildToolsVersion '25.0.0' + buildToolsVersion '25.0.1' defaultConfig { applicationId "com.codeest.geeknews" minSdkVersion 21 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 2 versionName "1.0.1" } @@ -28,16 +28,20 @@ android { } } +ext { + appCompat = "25.0.1" +} + dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile files('libs/tbs_sdk_thirdapp_v2.2.0.1096_36549_sharewithdownload_withoutGame_obfs_20160830_211645.jar') testCompile 'junit:junit:4.12' //ui - compile 'com.android.support:appcompat-v7:24.1.1' - compile 'com.android.support:design:24.1.1' - compile 'com.android.support:recyclerview-v7:24.1.1' - compile 'com.android.support:cardview-v7:24.1.1' + compile "com.android.support:recyclerview-v7:${appCompat}" + compile "com.android.support:appcompat-v7:${appCompat}" + compile "com.android.support:cardview-v7:${appCompat}" + compile "com.android.support:design:${appCompat}" //rx compile 'io.reactivex:rxjava:1.1.0' @@ -45,7 +49,7 @@ dependencies { compile 'com.jakewharton.rxbinding:rxbinding:0.4.0' //network - compile 'com.google.code.gson:gson:2.4' + compile 'com.google.code.gson:gson:2.7' compile 'com.squareup.retrofit2:retrofit:2.0.2' compile 'com.squareup.retrofit2:converter-gson:2.0.2' compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2' diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a92c42f..668fab5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,6 +6,7 @@ #EEEEEE #FFFFFF #2C2C2C + #80303F9F #FF4081 #6e000000 From 7a4622c8b61163a6eb2ea30969c5656d761fa02a Mon Sep 17 00:00:00 2001 From: Chris Zhao Date: Fri, 16 Dec 2016 13:04:41 +0100 Subject: [PATCH 3/6] Update comileSdkVersion --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 1b86010..fc94264 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'android-apt' apply plugin: 'realm-android' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion '25.0.1' defaultConfig { From 44a88d5177066a880ad52cf81f704e45f5cf0a6b Mon Sep 17 00:00:00 2001 From: Chris Zhao Date: Fri, 16 Dec 2016 13:39:59 +0100 Subject: [PATCH 4/6] Updated opacapp(lib) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index fc94264..76e8bef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { //widget compile 'com.victor:lib:1.0.4' compile 'com.prolificinteractive:material-calendarview:1.4.0' - compile 'net.opacapp:multiline-collapsingtoolbar:1.2.2' + compile 'net.opacapp:multiline-collapsingtoolbar:1.3.1' compile 'com.github.chrisbanes:PhotoView:1.3.0' compile 'com.miguelcatalan:materialsearchview:1.4.0' From 689b2ab25f81aa42450c7dffe10a12deca7b4a84 Mon Sep 17 00:00:00 2001 From: Chris Zhao Date: Fri, 16 Dec 2016 13:55:22 +0100 Subject: [PATCH 5/6] Add ripple for cardviews --- .../res/drawable/selector_item_background.xml | 10 ++++++++++ app/src/main/res/layout/item_comment.xml | 17 +++++++++-------- app/src/main/res/layout/item_daily.xml | 1 + app/src/main/res/layout/item_girl.xml | 1 + app/src/main/res/layout/item_like_article.xml | 1 + app/src/main/res/layout/item_like_girl.xml | 1 + app/src/main/res/layout/item_section.xml | 1 + app/src/main/res/layout/item_tech.xml | 1 + app/src/main/res/layout/item_theme.xml | 1 + 9 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/selector_item_background.xml diff --git a/app/src/main/res/drawable/selector_item_background.xml b/app/src/main/res/drawable/selector_item_background.xml new file mode 100644 index 0000000..03633b5 --- /dev/null +++ b/app/src/main/res/drawable/selector_item_background.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 202b963..6e8a8d8 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -1,17 +1,18 @@ + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/selector_item_background" + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="12dp"> + android:layout_height="@dimen/comment_face_size" + android:layout_marginEnd="10dp"/> diff --git a/app/src/main/res/layout/item_tech.xml b/app/src/main/res/layout/item_tech.xml index f508a4e..36f1766 100644 --- a/app/src/main/res/layout/item_tech.xml +++ b/app/src/main/res/layout/item_tech.xml @@ -9,6 +9,7 @@ android:id="@+id/cv_tech_content" android:layout_width="match_parent" android:layout_height="wrap_content" + android:foreground="@drawable/selector_item_background" android:transitionName="shareView" app:cardBackgroundColor="@color/colorCard" app:cardElevation="2dp" diff --git a/app/src/main/res/layout/item_theme.xml b/app/src/main/res/layout/item_theme.xml index ce68c7f..9c63e83 100644 --- a/app/src/main/res/layout/item_theme.xml +++ b/app/src/main/res/layout/item_theme.xml @@ -7,6 +7,7 @@ Date: Fri, 16 Dec 2016 14:16:26 +0100 Subject: [PATCH 6/6] Update gradle-build-tool --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2bda288..be55d51 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0-alpha3' + classpath 'com.android.tools.build:gradle:2.3.0-beta1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath "io.realm:realm-gradle-plugin:1.1.1"