Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
louisgeek committed Mar 26, 2018
1 parent 5778f3e commit 55a3f18
Show file tree
Hide file tree
Showing 12 changed files with 107 additions and 34 deletions.
72 changes: 72 additions & 0 deletions .idea/markdown-navigator.xml

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

3 changes: 3 additions & 0 deletions .idea/markdown-navigator/profiles_settings.xml

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

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

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

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

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

13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ClassicLinesEditView
多行文本输入框 带计数 限制文字数量

![image](https://raw.githubusercontent.com/louisgeek/ClassicLinesEditView/master/screenshots/pic0.png)
![image](https://raw.githubusercontent.com/louisgeek/ClassicLinesEditView/master/screenshots/pic.png)


![image](https://raw.githubusercontent.com/louisgeek/ClassicLinesEditView/master/screenshots/pic2.png)
Expand Down Expand Up @@ -32,18 +32,25 @@ Step 2. Add the dependency [![](https://jitpack.io/v/louisgeek/ClassicLinesEdit

attr

```xml

<!--
默认 app:maxCount="240"
默认 app:IgnoreCnOrEn="true"
-->


<com.classichu.lineseditview.LinesEditView
android:layout_margin="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
```

code

```java
mClassicLinesEditView.setHintText("hintText");
mClassicLinesEditView.setContentText("ContentText");

Log.i(TAG, "onCreate: getHintText"+mClassicLinesEditView.getHintText());
Log.i(TAG, "onCreate: getContentText"+mClassicLinesEditView.getContentText());
```
20 changes: 9 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
compileSdkVersion 26
defaultConfig {
applicationId "com.classichu.classiclineseditview"
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 22
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -19,12 +18,11 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
testCompile 'junit:junit:4.12'
compile project(':library')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
implementation project(':library')
}
1 change: 0 additions & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
android:layout_margin="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"

/>

</LinearLayout>
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // Add this line
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' // Add this line
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
repositories {
google()
jcenter()
}
}
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-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
18 changes: 8 additions & 10 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
group='com.github.louisgeek'
android {
compileSdkVersion 25
buildToolsVersion "25.0.3"

compileSdkVersion 26
defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 22
versionCode 1
versionName "1.0"

Expand All @@ -23,10 +21,10 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
testCompile 'junit:junit:4.12'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
}
Binary file added screenshots/pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed screenshots/pic0.png
Binary file not shown.

0 comments on commit 55a3f18

Please sign in to comment.