From 8f34d465b12ccf59541ab4b459657c5783b102f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A5=E8=97=A4?= <18883840501@163.com> Date: Mon, 25 Feb 2019 10:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7sdk=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E6=89=93=E5=8C=85jitpack=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E5=B8=831.6.0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 243 ++++++++++++++++++ .idea/MagicIndicator.iml | 9 - .idea/compiler.xml | 22 -- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 - .idea/gradle.xml | 18 +- .../animated_vector_drawable_23_4_0.xml | 13 - .idea/libraries/appcompat_v7_23_4_0.xml | 17 -- .idea/libraries/hamcrest_core_1_3.xml | 11 - .idea/libraries/junit_4_12.xml | 11 - .../libraries/support_annotations_23_4_0.xml | 11 - .idea/libraries/support_v4_23_4_0.xml | 18 -- .../support_vector_drawable_23_4_0.xml | 13 - .idea/misc.xml | 58 +++-- .idea/vcs.xml | 2 +- app/app.iml | 111 +++++--- app/build.gradle | 34 ++- build.gradle | 41 ++- gradle/wrapper/gradle-wrapper.properties | 4 +- local.properties | 19 +- magicindicator/build.gradle | 28 +- magicindicator/magicindicator.iml | 118 ++++++--- .../titles/ClipPagerTitleView.java | 2 +- 23 files changed, 504 insertions(+), 308 deletions(-) create mode 100644 .gitignore delete mode 100644 .idea/MagicIndicator.iml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/libraries/animated_vector_drawable_23_4_0.xml delete mode 100644 .idea/libraries/appcompat_v7_23_4_0.xml delete mode 100644 .idea/libraries/hamcrest_core_1_3.xml delete mode 100644 .idea/libraries/junit_4_12.xml delete mode 100644 .idea/libraries/support_annotations_23_4_0.xml delete mode 100644 .idea/libraries/support_v4_23_4_0.xml delete mode 100644 .idea/libraries/support_vector_drawable_23_4_0.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..88743f15 --- /dev/null +++ b/.gitignore @@ -0,0 +1,243 @@ + +# Created by https://www.gitignore.io/api/java,macos,android,androidstudio +# Edit at https://www.gitignore.io/?templates=java,macos,android,androidstudio + +### Android ### +# Built application files +*.apk +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/* +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +.idea/caches +# Android Studio 3 in .gitignore file. +.idea/caches/build_file_checksums.ser +.idea/modules.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ + +### Android Patch ### +gen-external-apklibs +output.json + +### AndroidStudio ### +# Covers files to be ignored for android development using Android Studio. + +# Built application files + +# Files for the ART/Dalvik VM + +# Java class files + +# Generated files + +# Gradle files +.gradle + +# Signing files +.signing/ + +# Local configuration file (sdk path, etc) + +# Proguard folder generated by Eclipse + +# Log Files + +# Android Studio +/*/build/ +/*/local.properties +/*/out +/*/*/build +/*/*/production +*.ipr +*~ +*.swp + +# Android Patch + +# External native build folder generated in Android Studio 2.2 and later + +# NDK +obj/ + +# IntelliJ IDEA +*.iws +/out/ + +# User-specific configurations +.idea/caches/ +.idea/libraries/ +.idea/shelf/ +.idea/.name +.idea/compiler.xml +.idea/copyright/profiles_settings.xml +.idea/encodings.xml +.idea/misc.xml +.idea/scopes/scope_settings.xml +.idea/vcs.xml +.idea/jsLibraryMappings.xml +.idea/datasources.xml +.idea/dataSources.ids +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# OS-specific files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Legacy Eclipse project files +.classpath +.project +.cproject +.settings/ + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.war +*.ear + +# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) +hs_err_pid* + +## Plugin-specific files: + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Mongo Explorer plugin +.idea/mongoSettings.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +### AndroidStudio Patch ### + +!/gradle/wrapper/gradle-wrapper.jar + +### Java ### +# Compiled class file + +# Log file + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) + +# Package Files # +*.jar +*.nar +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml + +### macOS ### +# General +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.TemporaryItems +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# End of https://www.gitignore.io/api/java,macos,android,androidstudio \ No newline at end of file diff --git a/.idea/MagicIndicator.iml b/.idea/MagicIndicator.iml deleted file mode 100644 index d6ebd480..00000000 --- a/.idea/MagicIndicator.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43ef..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba4..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index af5151ef..2996d531 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,22 +3,12 @@ diff --git a/.idea/libraries/animated_vector_drawable_23_4_0.xml b/.idea/libraries/animated_vector_drawable_23_4_0.xml deleted file mode 100644 index 53116a31..00000000 --- a/.idea/libraries/animated_vector_drawable_23_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_23_4_0.xml b/.idea/libraries/appcompat_v7_23_4_0.xml deleted file mode 100644 index 64ba775b..00000000 --- a/.idea/libraries/appcompat_v7_23_4_0.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml deleted file mode 100644 index 157e3f34..00000000 --- a/.idea/libraries/hamcrest_core_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml deleted file mode 100644 index 305df301..00000000 --- a/.idea/libraries/junit_4_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_4_0.xml b/.idea/libraries/support_annotations_23_4_0.xml deleted file mode 100644 index 0efc7e52..00000000 --- a/.idea/libraries/support_annotations_23_4_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_4_0.xml b/.idea/libraries/support_v4_23_4_0.xml deleted file mode 100644 index b2be9031..00000000 --- a/.idea/libraries/support_v4_23_4_0.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_23_4_0.xml b/.idea/libraries/support_vector_drawable_23_4_0.xml deleted file mode 100644 index 7cc33a34..00000000 --- a/.idea/libraries/support_vector_drawable_23_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 973695b3..52ad187c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,31 +1,37 @@ - - + + - - - + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7f..35eb1ddf 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index fb1917a6..52181e7a 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -9,7 +9,6 @@ - - - + + + - - + + - + - - + + - + + - + + + + + + + - @@ -61,7 +66,6 @@ - @@ -69,7 +73,6 @@ - @@ -77,41 +80,75 @@ - - + + + + - - - - - - - + + + + + - - + + + - - + + + + + + + + + - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3730b289..c37964dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,26 +1,24 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" - defaultConfig { - applicationId "net.lucode.hackware.magicindicatordemo" - minSdkVersion 9 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - } + defaultConfig { + applicationId "net.lucode.hackware.magicindicatordemo" + minSdkVersion 14 + targetSdkVersion 28 + } + buildTypes { + release { + minifyEnabled false } + } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile project(':magicindicator') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.4.0' -} + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(':magicindicator') + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:28.0.0' +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 574d5772..9bd4044d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,23 +1,42 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { - jcenter() + repositories { + google() + maven { + url 'http://maven.aliyun.com/nexus/content/groups/public' } - dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + maven { + url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' } + jcenter() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.3.1' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } } allprojects { - repositories { - jcenter() + repositories { + google() + maven { + url 'http://maven.aliyun.com/nexus/content/groups/public' + } + maven { + url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' } + jcenter() + mavenCentral() + maven { + url 'https://jitpack.io' + } + } } task clean(type: Delete) { - delete rootProject.buildDir -} + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 122a0dca..6c6ea182 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 +#Mon Feb 25 09:57:26 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/local.properties b/local.properties index 6a88f576..24626b1c 100644 --- a/local.properties +++ b/local.properties @@ -1,10 +1,9 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file should *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=D\:\\Android\\sdk \ No newline at end of file +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Mon Feb 25 09:53:04 CST 2019 +ndk.dir=/Users/SherlockHolmes/Library/Android/sdk/ndk-bundle +sdk.dir=/Users/SherlockHolmes/Library/Android/sdk diff --git a/magicindicator/build.gradle b/magicindicator/build.gradle index 4b2fc468..292f0319 100644 --- a/magicindicator/build.gradle +++ b/magicindicator/build.gradle @@ -1,23 +1,21 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" - defaultConfig { - minSdkVersion 9 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - } + defaultConfig { + minSdkVersion 14 + targetSdkVersion 28 + } + buildTypes { + release { + minifyEnabled false } + } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.4.0' -} + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' +} \ No newline at end of file diff --git a/magicindicator/magicindicator.iml b/magicindicator/magicindicator.iml index 81ae0e70..e0c642a6 100644 --- a/magicindicator/magicindicator.iml +++ b/magicindicator/magicindicator.iml @@ -1,5 +1,5 @@ - + @@ -9,7 +9,6 @@ - - - + + + - - + + - + - - + + - + + - + + + + + + + - @@ -62,51 +67,86 @@ - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + + - + + - + + + + + + + + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/magicindicator/src/main/java/net/lucode/hackware/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java b/magicindicator/src/main/java/net/lucode/hackware/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java index 01b71fdb..7a6e15da 100644 --- a/magicindicator/src/main/java/net/lucode/hackware/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java +++ b/magicindicator/src/main/java/net/lucode/hackware/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java @@ -90,7 +90,7 @@ protected void onDraw(Canvas canvas) { canvas.drawText(mText, x, y, mPaint); // 画clip层 - canvas.save(Canvas.CLIP_SAVE_FLAG); + canvas.save(); if (mLeftToRight) { canvas.clipRect(0, 0, getWidth() * mClipPercent, getHeight()); } else {