Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ apply plugin: 'android-apt'
apply plugin: 'realm-android'

android {
compileSdkVersion 24
buildToolsVersion "24.0.1"
compileSdkVersion 25
buildToolsVersion '25.0.1'

defaultConfig {
applicationId "com.codeest.geeknews"
minSdkVersion 21
targetSdkVersion 24
targetSdkVersion 25
versionCode 2
versionName "1.0.1"
}
Expand All @@ -28,24 +28,28 @@ 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'
compile 'io.reactivex:rxandroid:1.1.0'
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'
Expand All @@ -69,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'

Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/selector_item_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/colorPrimaryDarkTransparent"
android:constantSize="false"
android:enterFadeDuration="@android:integer/config_shortAnimTime"
android:exitFadeDuration="@android:integer/config_shortAnimTime">
<item android:id="@android:id/mask">
<color android:color="@android:color/white"/>
</item>
</ripple>
17 changes: 9 additions & 8 deletions app/src/main/res/layout/item_comment.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
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">

<com.codeest.geeknews.widget.CircleImageView
android:id="@+id/civ_comment_face"
android:layout_marginEnd="10dp"
android:layout_width="@dimen/comment_face_size"
android:layout_height="@dimen/comment_face_size"/>
android:layout_height="@dimen/comment_face_size"
android:layout_marginEnd="10dp"/>
<LinearLayout
android:orientation="vertical"
android:layout_width="0dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_daily.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:foreground="@drawable/selector_item_background"
app:cardBackgroundColor="@color/colorCard"
app:cardElevation="2dp"
app:cardCornerRadius="2dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_girl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:transitionName="shareView"
android:foreground="@drawable/selector_item_background"
app:cardElevation="3dp"
app:cardCornerRadius="2dp">
<ImageView
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_like_article.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="2dp"
android:foreground="@drawable/selector_item_background"
app:cardBackgroundColor="@color/colorCard"
app:contentPadding="6dp"
app:cardElevation="2dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_like_girl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:layout_marginTop="6dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:foreground="@drawable/selector_item_background"
android:layout_marginBottom="2dp"
app:cardBackgroundColor="@color/colorCard"
app:cardElevation="2dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_section.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/colorCard"
android:foreground="@drawable/selector_item_background"
app:cardCornerRadius="6dp"
app:elevation="3dp"
android:layout_margin="3dp">
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_tech.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_theme.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:foreground="@drawable/selector_item_background"
app:cardBackgroundColor="@color/colorCard"
app:cardCornerRadius="6dp"
app:elevation="3dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<color name="colorBackground">#EEEEEE</color>
<color name="colorCard">#FFFFFF</color>
<color name="colorText">#2C2C2C</color>
<color name="colorPrimaryDarkTransparent">#80303F9F</color>

<color name="fab_bg">#FF4081</color>
<color name="bottom_shadow">#6e000000</color>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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-beta1'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath "io.realm:realm-gradle-plugin:1.1.1"

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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