Skip to content

Commit

Permalink
1.upgradle bravh 2.9.46
Browse files Browse the repository at this point in the history
2.upgradle kotlin to 1.3.11
  • Loading branch information
AllenCoder committed Jan 13, 2019
1 parent 73bd2d2 commit 7025d74
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 125 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea
/.idea/libraries
.DS_Store
/build
Expand Down
10 changes: 0 additions & 10 deletions .idea/checkstyle-idea.xml

This file was deleted.

38 changes: 9 additions & 29 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 5 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
Expand Down Expand Up @@ -32,22 +31,20 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.45'
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.46'
implementation project(':material-spinner-1.0.5')
implementation 'com.github.bumptech.glide:glide:3.7.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.kyleduo.switchbutton:library:2.0.0'
implementation 'com.orhanobut:logger:2.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// Data Binding
kapt 'com.android.databinding:compiler:3.1.4'
annotationProcessor 'com.android.databinding:compiler:3.1.4'
implementation 'jp.wasabeef:takt:1.0.5'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.anko:anko-commons:$anko_version"
implementation "org.jetbrains.anko:anko:$anko_version"
implementation "org.jetbrains.anko:anko-coroutines:$anko_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.0'
implementation "org.jetbrains.anko:anko-appcompat-v7:$anko_version"
}
kapt {
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/java/com/allen/kotlinapp/HomeActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ import android.view.ViewGroup
import com.allen.kotlinapp.adapter.HomeAdapter
import com.allen.kotlinapp.entity.HomeItem
import com.chad.library.adapter.base.BaseQuickAdapter
import com.orhanobut.logger.Logger
import kotlinx.coroutines.experimental.Deferred
import kotlinx.coroutines.experimental.android.UI
import kotlinx.coroutines.experimental.async
import org.jetbrains.anko.coroutines.experimental.bg
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.toast
import java.util.*

/**
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/com/allen/kotlinapp/UpFetchUseActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import android.support.v7.widget.RecyclerView
import com.allen.kotlinapp.adapter.UpFetchAdapter
import com.allen.kotlinapp.base.BaseActivity
import com.allen.kotlinapp.entity.Movie
import com.chad.library.adapter.base.BaseQuickAdapter
import kotlinx.coroutines.experimental.android.UI
import kotlinx.coroutines.experimental.async
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import java.util.*

/**
Expand Down Expand Up @@ -59,7 +58,7 @@ class UpFetchUseActivity() : BaseActivity(), Parcelable {
/**
* get data from internet.
*/
async(UI){
GlobalScope.launch{
mAdapter.addData(0, genData())
/**
* set fetching off when network request ends.
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/res/layout/loading_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:layout_marginLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading"
android:text="@string/brvah_loading"
android:textColor="@color/txt_color"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
10 changes: 5 additions & 5 deletions app/src/main/res/layout/view_load_more.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleSmall"
android:layout_marginRight="@dimen/dp_4"
android:indeterminateDrawable="@drawable/sample_footer_loading_progress"/>
android:indeterminateDrawable="@drawable/brvah_sample_footer_loading"/>

<TextView
android:id="@+id/loading_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:text="@string/loading"
android:text="@string/brvah_loading"
android:textColor="#0dddb8"
android:textSize="@dimen/sp_14"/>
</LinearLayout>
Expand All @@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="#0dddb8"
android:text="@string/load_failed"/>
android:text="@string/brvah_load_failed"/>

</FrameLayout>

Expand All @@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/load_end"
android:text="@string/brvah_load_end"
android:textColor="@android:color/darker_gray"/>
</FrameLayout>
</FrameLayout>
</FrameLayout>
15 changes: 6 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
buildscript {
ext.kotlin_version = '1.2.60'
ext.anko_version = '0.10.3'
ext.kotlin_version = '1.3.11'
ext.anko_version = '0.10.8'
repositories {
jcenter()
maven { url 'https://maven.google.com' }
google()
mavenLocal()
mavenCentral()
jcenter()
maven { url "https://jitpack.io" }

}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
}
}

allprojects {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
google()
jcenter()
maven { url "https://jitpack.io" }
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 comments on commit 7025d74

Please sign in to comment.