Skip to content

Commit

Permalink
[feature][lib配置]：加入新的组件配置，计划把所有组件迁移到 lib
Browse files Browse the repository at this point in the history
  • Loading branch information
@uni7corn
uni7corn committed Jan 28, 2019
1 parent 7f99d5f commit c173c90
Show file tree
Hide file tree
Showing 43 changed files with 876 additions and 47 deletions.
33 changes: 23 additions & 10 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileSdkVersion 28
buildToolsVersion "28.0.3"
defaultConfig {
applicationId "com.szzh.audio.newviewpager"
minSdkVersion 16
targetSdkVersion 27
minSdkVersion 21
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
Expand All @@ -21,11 +25,20 @@ android {
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:design:27.0.2'
testImplementation 'junit:junit:4.12'
//kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
// androidx
implementation 'androidx.core:core-ktx:1.0.1'
implementation 'androidx.core:core:1.0.1'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.cardview:cardview:1.0.0'
implementation project(':uni7corn_ui')
}
4 changes: 2 additions & 2 deletions app/src/androidTest/java/com/szzh/audio/newviewpager/ExampleInstrumentedTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.szzh.audio.newviewpager;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/BubbleImageView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.NinePatchDrawable;
import android.support.annotation.DrawableRes;
import android.support.v7.widget.AppCompatImageView;
import android.util.AttributeSet;

import androidx.annotation.DrawableRes;
import androidx.appcompat.widget.AppCompatImageView;

/**
* Created by jzz
* on 2017/6/20.
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/SleepyActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.szzh.audio.newviewpager;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;

import com.szzh.audio.newviewpager.histogram.DaySleepHistogramView;
import com.szzh.audio.newviewpager.histogram.DaySleepy;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/TestActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.szzh.audio.newviewpager;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.View;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/TestBatteryActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.app.Activity;
import android.os.Bundle;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.view.View;

import com.szzh.audio.newviewpager.battery.BatteryView;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/WorkInfoView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.content.Context;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.LayoutInflater;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/battery/BatteryView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.annotation.ColorInt;
import android.support.annotation.Nullable;
import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/calender/CalendarView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.Rect;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/foldViewGroup/FoldLayout.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.szzh.audio.newviewpager.foldViewGroup;

import android.content.Context;
import android.support.annotation.LayoutRes;
import androidx.annotation.LayoutRes;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/histogram/DaySleepHistogramView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextPaint;
import android.util.AttributeSet;
import android.util.TypedValue;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/histogram/SleepHistogramView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.RectF;
import android.support.annotation.ColorInt;
import android.support.annotation.Nullable;
import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.TypedValue;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/histogram/WeekSleepHistogramView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextPaint;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/indicator/IndicatorView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.support.annotation.Nullable;
import android.support.v4.view.ViewPager;
import androidx.annotation.Nullable;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/indicator/MainActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.szzh.audio.newviewpager.indicator;

import android.os.Bundle;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AppCompatActivity;

import com.szzh.audio.newviewpager.R;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/pathMeasure/CircleProgress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.PathMeasure;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.view.animation.LinearInterpolator;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/progress/LoadingProgress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.RectF;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/progress/VoiceProgress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Path;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/schedule/Schedule.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.szzh.audio.newviewpager.schedule;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

/**
* Created by jzz
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/schedule/ScheduleView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.annotation.ColorRes;
import android.support.annotation.Nullable;
import androidx.annotation.ColorRes;
import androidx.annotation.Nullable;
import android.text.TextPaint;
import android.util.AttributeSet;
import android.util.TypedValue;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/sleepy/SleepProgress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.RectF;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/sleepy/SleepyCalenderView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextPaint;
import android.util.AttributeSet;
import android.util.Log;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/szzh/audio/newviewpager/sleepy/bean/SleepData.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.szzh.audio.newviewpager.sleepy.bean;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import java.io.Serializable;

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/szzh/audio/newviewpager/textview/FoldTextView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import android.animation.ValueAnimator;
import android.content.Context;
import android.support.annotation.Nullable;
import android.support.v7.widget.AppCompatTextView;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatTextView;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
Expand Down
6 changes: 5 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

ext.kotlin_version = '1.3.20'

repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m

# When configured, Gradle will run in incubating parallel mode.
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Dec 01 17:54:28 CST 2017
#Mon Jan 28 15:31:19 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
2 changes: 1 addition & 1 deletion settings.gradle
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app'
include ':app', ':uni7corn_ui'
1 change: 1 addition & 0 deletions uni7corn_ui/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
52 changes: 52 additions & 0 deletions uni7corn_ui/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
apply plugin: 'com.android.library'

apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 28



defaultConfig {
minSdkVersion 21
targetSdkVersion 28
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'

//kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

// androidx
implementation 'androidx.core:core-ktx:1.0.1'
implementation "androidx.core:core:1.0.1"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0'
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.cardview:cardview:1.0.0'

//glide
api 'com.github.bumptech.glide:glide:4.8.0'
kapt 'com.github.bumptech.glide:compiler:4.8.0'
}
21 changes: 21 additions & 0 deletions uni7corn_ui/proguard-rules.pro
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Loading

0 comments on commit c173c90

Please sign in to comment.