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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ key.jks
/local.properties
/.idea/workspace.xml
/.idea/libraries
/.idea
.DS_Store
/build
/captures
Expand Down
22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/gradle.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

33 changes: 0 additions & 33 deletions .idea/misc.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

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

android {
compileSdkVersion rootProject.ext.android.compileSdkVersion
Expand Down Expand Up @@ -41,4 +44,5 @@ dependencies {
//内存泄漏测试
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.2'
kapt 'com.android.databinding:compiler:3.0.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,12 @@ public void onError(Throwable e) {
progressDialog.dismiss();
}
});

}

@Override
public boolean supportSlideBack() {
return false;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,9 @@ public void onPropertyChanged(Observable observable, int i) {
}
});
}

@Override
public boolean supportSlideBack() {
return false;
}
}
1 change: 1 addition & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<!--colorAccent 对应EditText编辑时、RadioButton选中、CheckBox等选中时的颜色。-->
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowBackground">@color/white</item>
<item name="android:windowIsTranslucent">true</item>
</style>

<style name="ViewLineStyle">
Expand Down
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ buildscript {
google()
jcenter()
}
ext.kotlin_version = '1.2.61'
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
// classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
// classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
Expand Down
2 changes: 2 additions & 0 deletions config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ext {
versions = [
"support-version": "27.0.2",
"junit-version" : "4.12",
"kt-version":"1.2.61",
]
//support配置
support = [
Expand All @@ -25,6 +26,7 @@ ext {
'design' : "com.android.support:design:${versions["support-version"]}",
'animated-vector-drawable': "com.android.support:animated-vector-drawable:${versions["support-version"]}",
'junit' : "junit:junit:${versions["junit-version"]}",
'kotlinjdk' : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions["kt-version"]}",
]
//依赖第三方配置
dependencies = [
Expand Down
Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

72 changes: 42 additions & 30 deletions gradlew

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

Loading