From e281b27ee3777abbc953497e17005f3e78b02636 Mon Sep 17 00:00:00 2001 From: chaychan <844738237@qq.com> Date: Mon, 10 Apr 2017 10:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86expandableT?= =?UTF-8?q?extView=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AliagnTextView/.gitignore | 1 - AliagnTextView/build.gradle | 50 ----- AliagnTextView/lint.xml | 6 - AliagnTextView/src/main/AndroidManifest.xml | 4 - ExpandableTextView/.gitignore | 1 - ExpandableTextView/build.gradle | 35 ---- ExpandableTextView/proguard-rules.pro | 17 -- .../expandabletextview/ApplicationTest.java | 13 -- .../src/main/AndroidManifest.xml | 11 - .../com/expandabletextview/UIUtil.java | 197 ------------------ .../src/main/res/values/attrs.xml | 24 --- .../src/main/res/values/strings.xml | 8 - .../expandabletextview/ExampleUnitTest.java | 15 -- .../powerfulviewlibrary/MainActivity.java | 4 +- app/src/main/res/layout/activity_main.xml | 7 +- settings.gradle | 2 +- viewlib/build.gradle | 2 +- .../expandabletextview}/AlignTextView.java | 4 +- .../expandabletextview}/CBAlignTextView.java | 6 +- .../CBAlignTextViewUtil.java | 2 +- .../ExpandableTextView.java | 15 +- .../main/res/layout/item_expand_collapse.xml | 7 +- .../mipmap-xxxhdpi}/icon_green_arrow_down.png | Bin .../mipmap-xxxhdpi}/icon_green_arrow_up.png | Bin .../main/res/values/aligntextview-styles.xml | 0 .../main/res/values/aligntextview_attr.xml | 0 viewlib/src/main/res/values/attr.xml | 22 ++ .../src/main/res/values/colors.xml | 0 viewlib/src/main/res/values/strings.xml | 5 + 29 files changed, 55 insertions(+), 403 deletions(-) delete mode 100644 AliagnTextView/.gitignore delete mode 100644 AliagnTextView/build.gradle delete mode 100644 AliagnTextView/lint.xml delete mode 100644 AliagnTextView/src/main/AndroidManifest.xml delete mode 100644 ExpandableTextView/.gitignore delete mode 100644 ExpandableTextView/build.gradle delete mode 100644 ExpandableTextView/proguard-rules.pro delete mode 100644 ExpandableTextView/src/androidTest/java/jaydenxiao/com/expandabletextview/ApplicationTest.java delete mode 100644 ExpandableTextView/src/main/AndroidManifest.xml delete mode 100644 ExpandableTextView/src/main/java/jaydenxiao/com/expandabletextview/UIUtil.java delete mode 100644 ExpandableTextView/src/main/res/values/attrs.xml delete mode 100644 ExpandableTextView/src/main/res/values/strings.xml delete mode 100644 ExpandableTextView/src/test/java/jaydenxiao/com/expandabletextview/ExampleUnitTest.java rename {AliagnTextView/src/main/java/me/codeboy/android/aligntextview => viewlib/src/main/java/com/chaychan/viewlib/expandabletextview}/AlignTextView.java (99%) rename {AliagnTextView/src/main/java/me/codeboy/android/aligntextview => viewlib/src/main/java/com/chaychan/viewlib/expandabletextview}/CBAlignTextView.java (99%) rename {AliagnTextView/src/main/java/me/codeboy/android/aligntextview/util => viewlib/src/main/java/com/chaychan/viewlib/expandabletextview}/CBAlignTextViewUtil.java (91%) rename {ExpandableTextView/src/main/java/jaydenxiao/com => viewlib/src/main/java/com/chaychan/viewlib}/expandabletextview/ExpandableTextView.java (97%) rename {ExpandableTextView => viewlib}/src/main/res/layout/item_expand_collapse.xml (88%) rename {ExpandableTextView/src/main/res/drawable-xxhdpi => viewlib/src/main/res/mipmap-xxxhdpi}/icon_green_arrow_down.png (100%) rename {ExpandableTextView/src/main/res/drawable-xxhdpi => viewlib/src/main/res/mipmap-xxxhdpi}/icon_green_arrow_up.png (100%) rename {AliagnTextView => viewlib}/src/main/res/values/aligntextview-styles.xml (100%) rename {AliagnTextView => viewlib}/src/main/res/values/aligntextview_attr.xml (100%) rename {ExpandableTextView => viewlib}/src/main/res/values/colors.xml (100%) diff --git a/AliagnTextView/.gitignore b/AliagnTextView/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/AliagnTextView/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/AliagnTextView/build.gradle b/AliagnTextView/build.gradle deleted file mode 100644 index 49d3fab..0000000 --- a/AliagnTextView/build.gradle +++ /dev/null @@ -1,50 +0,0 @@ -apply plugin: 'com.android.library' -android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" - - defaultConfig { - minSdkVersion 14 - targetSdkVersion 23 - versionCode 3 - versionName "2.3.0" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } -} - - -version = "2.3.0" -def siteUrl = 'https://github.com/androiddevelop/AlignTextView' -def gitUrl = 'https://github.com/androiddevelop/AlignTextView.git' -group = "me.codeboy.android" -archivesBaseName = "align-text-view" - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} - - - -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) \ No newline at end of file diff --git a/AliagnTextView/lint.xml b/AliagnTextView/lint.xml deleted file mode 100644 index 91c9d42..0000000 --- a/AliagnTextView/lint.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/AliagnTextView/src/main/AndroidManifest.xml b/AliagnTextView/src/main/AndroidManifest.xml deleted file mode 100644 index 961af96..0000000 --- a/AliagnTextView/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ExpandableTextView/.gitignore b/ExpandableTextView/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/ExpandableTextView/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/ExpandableTextView/build.gradle b/ExpandableTextView/build.gradle deleted file mode 100644 index 85990d7..0000000 --- a/ExpandableTextView/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ -apply plugin: 'com.android.library' -ext{ - PUBLISH_GROUP_ID = 'com.jaydenxiao' - PUBLISH_ARTIFACT_ID = 'ExpandableTextView' - PUBLISH_VERSION = '1.0.0' -} -android { - compileSdkVersion 24 - buildToolsVersion "24.0.3" - - defaultConfig { - minSdkVersion 15 - targetSdkVersion 23 - versionCode 1 - versionName "1.0.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - //打包不检查 - lintOptions { - checkReleaseBuilds false - abortOnError false - } -} - -dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.4.0' - compile project(':AliagnTextView') -} diff --git a/ExpandableTextView/proguard-rules.pro b/ExpandableTextView/proguard-rules.pro deleted file mode 100644 index 9e605df..0000000 --- a/ExpandableTextView/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in H:\android-22\sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# 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 *; -#} diff --git a/ExpandableTextView/src/androidTest/java/jaydenxiao/com/expandabletextview/ApplicationTest.java b/ExpandableTextView/src/androidTest/java/jaydenxiao/com/expandabletextview/ApplicationTest.java deleted file mode 100644 index 99d00b2..0000000 --- a/ExpandableTextView/src/androidTest/java/jaydenxiao/com/expandabletextview/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package jaydenxiao.com.expandabletextview; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/ExpandableTextView/src/main/AndroidManifest.xml b/ExpandableTextView/src/main/AndroidManifest.xml deleted file mode 100644 index f27ff0c..0000000 --- a/ExpandableTextView/src/main/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ExpandableTextView/src/main/java/jaydenxiao/com/expandabletextview/UIUtil.java b/ExpandableTextView/src/main/java/jaydenxiao/com/expandabletextview/UIUtil.java deleted file mode 100644 index 020d3a3..0000000 --- a/ExpandableTextView/src/main/java/jaydenxiao/com/expandabletextview/UIUtil.java +++ /dev/null @@ -1,197 +0,0 @@ -package jaydenxiao.com.expandabletextview; - -import android.content.Context; -import android.util.DisplayMetrics; -import android.view.View; -import android.view.ViewTreeObserver; -import android.view.ViewTreeObserver.OnGlobalLayoutListener; -import android.view.WindowManager; -import android.widget.LinearLayout; - -/** - * des:屏幕相关辅助类 - * Created by xsf - * on 2016.08.24 - */ -public class UIUtil { - private UIUtil() { - /* cannot be instantiated */ - throw new UnsupportedOperationException("cannot be instantiated"); - } - - /** - * 将px值转换为dip或dp值，保证尺寸大小不变 - * - * @param pxValue - * （DisplayMetrics类中属性density） - * @return - */ - public static int px2dip(Context context,float pxValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (pxValue / scale + 0.5f); - } - - /** - * 将dip或dp值转换为px值，保证尺寸大小不变 - * - * @param dipValue - * @return - */ - public static int dip2px( Context context ,float dipValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dipValue * scale + 0.5f); - } - - /** - * 将px值转换为sp值，保证文字大小不变 - * - * @param pxValue - * @return - */ - public static int px2sp(Context context,float pxValue) { - final float fontScale = context.getResources().getDisplayMetrics().scaledDensity; - return (int) (pxValue / fontScale + 0.5f); - } - - /** - * 将sp值转换为px值，保证文字大小不变 - * - * @param spValue - * @return - */ - public static int sp2px(Context context,float spValue) { - final float fontScale = context.getResources().getDisplayMetrics().scaledDensity; - return (int) (spValue * fontScale + 0.5f); - } - - /** - * 直接获取控件的宽、高 - * @param view - * @return int[] - */ - public static int[] getWidgetWH(final View view){ - ViewTreeObserver vto2 = view.getViewTreeObserver(); - vto2.addOnGlobalLayoutListener(new OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - view.getViewTreeObserver().removeGlobalOnLayoutListener(this); - } - }); - return new int[]{view.getWidth(),view.getHeight()}; - } - - /** - * 直接获取控件的宽、高 - * @param view - * @return int[] - */ - public static int getViewHeight(final View view){ - ViewTreeObserver vto2 = view.getViewTreeObserver(); - vto2.addOnGlobalLayoutListener(new OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - view.getViewTreeObserver().removeGlobalOnLayoutListener(this); - } - }); - return view.getHeight(); - } - - /** - * 直接获取控件的宽、高 - * @param view - * @return int[] - */ - public static int getViewWidth(final View view){ - ViewTreeObserver vto2 = view.getViewTreeObserver(); - vto2.addOnGlobalLayoutListener(new OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - view.getViewTreeObserver().removeGlobalOnLayoutListener(this); - } - }); - return view.getWidth(); - } - - /** - * 获得屏幕宽度 - * - * @param context - * @return - */ - public static int getScreenWidth(Context context) { - WindowManager wm = (WindowManager) context - .getSystemService(Context.WINDOW_SERVICE); - DisplayMetrics outMetrics = new DisplayMetrics(); - wm.getDefaultDisplay().getMetrics(outMetrics); - return outMetrics.widthPixels; - } - - /** - * 获得屏幕高度 - * - * @param context - * @return - */ - public static int getScreenHeight(Context context) { - WindowManager wm = (WindowManager) context - .getSystemService(Context.WINDOW_SERVICE); - DisplayMetrics outMetrics = new DisplayMetrics(); - wm.getDefaultDisplay().getMetrics(outMetrics); - return outMetrics.heightPixels; - } - - /** - * 获取控件的宽 - * @param view - * @return - */ - public static int getWidgetWidth(View view){ - int w = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); - int h = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); - view.measure(w, h);//先度量 - int width = view.getMeasuredWidth(); - return width; - } - /** - * 获取控件的高 - * @param view - * @return - */ - public static int getWidgetHeight(View view){ - int w = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); - int h = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); - view.measure(w, h);//先度量 - int height = view.getMeasuredHeight(); - return height; - } - /** - * 设置控件宽 - * @param view - * @param width - */ - public static void setWidgetWidth(View view, int width){ - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) view.getLayoutParams(); - params.width = width; - view.setLayoutParams(params); - } - /** - * 设置控件高 - * @param view - * @param height - */ - public static void setWidgetHeight(View view, int height){ - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) view.getLayoutParams(); - params.height = height; - view.setLayoutParams(params); - } - //获得状态栏的高度 - public static int getStatusBarHeight(Context context) { - int result = 0; - int resId = context.getResources().getIdentifier("status_bar_height", "dimen", "android"); - if (resId > 0) { - result = context.getResources().getDimensionPixelOffset(resId); - } - return result; - } - -} diff --git a/ExpandableTextView/src/main/res/values/attrs.xml b/ExpandableTextView/src/main/res/values/attrs.xml deleted file mode 100644 index b26b8e6..0000000 --- a/ExpandableTextView/src/main/res/values/attrs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ExpandableTextView/src/main/res/values/strings.xml b/ExpandableTextView/src/main/res/values/strings.xml deleted file mode 100644 index a494b6a..0000000 --- a/ExpandableTextView/src/main/res/values/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - ExpandableTextView - 展开 - 收起 - The story of a Chinese couple at Oxford University who first met each other as deskmate in middle school and recently married each other has gone viral, southcn.com reported. - Zhou Si, the groom, and Chen Mengge, the bride, married each other on Aug 18 and will together go to Oxford University to pursue their doctoral degrees later this year. - They were deskmate in middle school and then both were admitted by same high school but not in same class. - diff --git a/ExpandableTextView/src/test/java/jaydenxiao/com/expandabletextview/ExampleUnitTest.java b/ExpandableTextView/src/test/java/jaydenxiao/com/expandabletextview/ExampleUnitTest.java deleted file mode 100644 index 985cd88..0000000 --- a/ExpandableTextView/src/test/java/jaydenxiao/com/expandabletextview/ExampleUnitTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package jaydenxiao.com.expandabletextview; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * To work on unit tests, switch the Test Artifact in the Build Variants view. - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chaychan/powerfulviewlibrary/MainActivity.java b/app/src/main/java/com/chaychan/powerfulviewlibrary/MainActivity.java index f306280..b5ccb3d 100644 --- a/app/src/main/java/com/chaychan/powerfulviewlibrary/MainActivity.java +++ b/app/src/main/java/com/chaychan/powerfulviewlibrary/MainActivity.java @@ -9,8 +9,8 @@ import android.widget.Toast; import com.chaychan.viewlib.ExpandableLinearLayout; import com.chaychan.viewlib.PowerfulEditText; +import com.chaychan.viewlib.expandabletextview.ExpandableTextView; -import jaydenxiao.com.expandabletextview.ExpandableTextView; public class MainActivity extends AppCompatActivity { @@ -31,7 +31,7 @@ public class MainActivity extends AppCompatActivity { }); ExpandableTextView etv = (ExpandableTextView) findViewById(R.id.tv_intro); - etv.setText("啊哈可接受的看哈市的哈数据库和的看就好撒看就好将卡上的空间哈看就好啊数据库和的空间哈市科空间哈市科技很多借口撒谎的健康哈数据库空间哈市科技很多借口撒谎的健康哈数据库空间哈市科技很多借口撒谎的健康哈数据库空间哈市科技很多借口撒谎的健康哈数据库技很多借口撒谎的健康哈数据库将撒谎的健康哈啊市科技哈看就好啊数据库的哈看将撒谎空间的哈市科技哈看将"); + etv.setText("啊哈可接受的看哈市的哈数据库和的看就好撒看就,好将卡上的空间哈看就,好啊数据库和的空间哈市科空间哈市科技很多借口撒谎的健康哈数据库空间哈市科技很多借口撒谎的健康哈数据库空间哈市科技很多借口撒谎的健康哈数据库空间哈市科技很多借口撒谎的健康哈数据库技很多借口撒谎的健康哈数据库将撒谎的健康哈啊市科技哈看就好啊数据库的哈看将撒谎空间的哈市科技哈看将"); View view1 = View.inflate(this, R.layout.item_expandable_linear_layout, null); View view2 = View.inflate(this, R.layout.item_expandable_linear_layout, null); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index fe41ded..57f7b0d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -28,7 +28,7 @@ app:hideText="查看更多" /> - - diff --git a/settings.gradle b/settings.gradle index 0360dbe..0ba95aa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':viewlib', ':ExpandableTextView', ':AliagnTextView' +include ':app', ':viewlib' diff --git a/viewlib/build.gradle b/viewlib/build.gradle index 4ad2dbe..24c7d6b 100644 --- a/viewlib/build.gradle +++ b/viewlib/build.gradle @@ -23,5 +23,5 @@ dependencies { testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.nineoldandroids:library:2.4.0' - compile project(':ExpandableTextView') + compile 'com.android.support:support-v4:24.2.0' } diff --git a/AliagnTextView/src/main/java/me/codeboy/android/aligntextview/AlignTextView.java b/viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/AlignTextView.java similarity index 99% rename from AliagnTextView/src/main/java/me/codeboy/android/aligntextview/AlignTextView.java rename to viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/AlignTextView.java index 5844a82..f09408f 100644 --- a/AliagnTextView/src/main/java/me/codeboy/android/aligntextview/AlignTextView.java +++ b/viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/AlignTextView.java @@ -1,4 +1,4 @@ -package me.codeboy.android.aligntextview; +package com.chaychan.viewlib.expandabletextview; import android.content.Context; import android.content.res.TypedArray; @@ -9,6 +9,8 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.widget.TextView; +import com.chaychan.viewlib.R; + import java.util.ArrayList; import java.util.List; diff --git a/AliagnTextView/src/main/java/me/codeboy/android/aligntextview/CBAlignTextView.java b/viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/CBAlignTextView.java similarity index 99% rename from AliagnTextView/src/main/java/me/codeboy/android/aligntextview/CBAlignTextView.java rename to viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/CBAlignTextView.java index eb752ff..15ad828 100644 --- a/AliagnTextView/src/main/java/me/codeboy/android/aligntextview/CBAlignTextView.java +++ b/viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/CBAlignTextView.java @@ -1,4 +1,4 @@ -package me.codeboy.android.aligntextview; +package com.chaychan.viewlib.expandabletextview; import android.content.ClipboardManager; import android.content.Context; @@ -10,12 +10,12 @@ import android.util.AttributeSet; import android.view.ViewTreeObserver; import android.widget.TextView; +import com.chaychan.viewlib.R; + import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import me.codeboy.android.aligntextview.util.CBAlignTextViewUtil; - /** * 对齐的TextView *

diff --git a/AliagnTextView/src/main/java/me/codeboy/android/aligntextview/util/CBAlignTextViewUtil.java b/viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/CBAlignTextViewUtil.java similarity index 91% rename from AliagnTextView/src/main/java/me/codeboy/android/aligntextview/util/CBAlignTextViewUtil.java rename to viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/CBAlignTextViewUtil.java index b655c69..5a35ab5 100644 --- a/AliagnTextView/src/main/java/me/codeboy/android/aligntextview/util/CBAlignTextViewUtil.java +++ b/viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/CBAlignTextViewUtil.java @@ -1,4 +1,4 @@ -package me.codeboy.android.aligntextview.util; +package com.chaychan.viewlib.expandabletextview; /** * 文本工具 diff --git a/ExpandableTextView/src/main/java/jaydenxiao/com/expandabletextview/ExpandableTextView.java b/viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/ExpandableTextView.java similarity index 97% rename from ExpandableTextView/src/main/java/jaydenxiao/com/expandabletextview/ExpandableTextView.java rename to viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/ExpandableTextView.java index 3de4c7a..57cd123 100644 --- a/ExpandableTextView/src/main/java/jaydenxiao/com/expandabletextview/ExpandableTextView.java +++ b/viewlib/src/main/java/com/chaychan/viewlib/expandabletextview/ExpandableTextView.java @@ -1,5 +1,6 @@ -package jaydenxiao.com.expandabletextview; +package com.chaychan.viewlib.expandabletextview; + import android.animation.Animator; import android.animation.ValueAnimator; import android.annotation.TargetApi; @@ -19,7 +20,8 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import me.codeboy.android.aligntextview.AlignTextView; +import com.chaychan.viewlib.R; +import com.chaychan.viewlib.UIUtils; /** * des:可伸展textview @@ -131,10 +133,10 @@ public class ExpandableTextView extends LinearLayout implements View.OnClickList textExpand = typedArray.getString(R.styleable.ExpandableTextView_textExpand); if (mExpandDrawable == null) { - mExpandDrawable = ContextCompat.getDrawable(getContext(),R.drawable.icon_green_arrow_up); + mExpandDrawable = ContextCompat.getDrawable(getContext(),R.mipmap.icon_green_arrow_up); } if (mCollapseDrawable == null) { - mCollapseDrawable = ContextCompat.getDrawable(getContext(), R.drawable.icon_green_arrow_down); + mCollapseDrawable = ContextCompat.getDrawable(getContext(), R.mipmap.icon_green_arrow_down); } if (TextUtils.isEmpty(textCollapse)) { @@ -144,10 +146,10 @@ public class ExpandableTextView extends LinearLayout implements View.OnClickList textExpand = getContext().getString(R.string.expand); } contentTextColor = typedArray.getColor(R.styleable.ExpandableTextView_contentTextColor, ContextCompat.getColor(getContext(), R.color.gray)); - contentTextSize = typedArray.getDimension(R.styleable.ExpandableTextView_contentTextSize, UIUtil.sp2px(getContext(),14)); + contentTextSize = typedArray.getDimension(R.styleable.ExpandableTextView_contentTextSize, UIUtils.sp2px(getContext(),14)); collapseExpandTextColor = typedArray.getColor(R.styleable.ExpandableTextView_collapseExpandTextColor, ContextCompat.getColor(getContext(), R.color.main_color)); - collapseExpandTextSize = typedArray.getDimension(R.styleable.ExpandableTextView_collapseExpandTextSize, UIUtil.sp2px(getContext(),14)); + collapseExpandTextSize = typedArray.getDimension(R.styleable.ExpandableTextView_collapseExpandTextSize, UIUtils.sp2px(getContext(),14)); grarity = typedArray.getInt(R.styleable.ExpandableTextView_collapseExpandGrarity, Gravity.LEFT); drawableGrarity=typedArray.getInt(R.styleable.ExpandableTextView_drawableGrarity, Gravity.RIGHT); @@ -164,6 +166,7 @@ public class ExpandableTextView extends LinearLayout implements View.OnClickList */ @Override protected void onFinishInflate() { + super.onFinishInflate(); findViews(); } diff --git a/ExpandableTextView/src/main/res/layout/item_expand_collapse.xml b/viewlib/src/main/res/layout/item_expand_collapse.xml similarity index 88% rename from ExpandableTextView/src/main/res/layout/item_expand_collapse.xml rename to viewlib/src/main/res/layout/item_expand_collapse.xml index 39373be..09c8d06 100644 --- a/ExpandableTextView/src/main/res/layout/item_expand_collapse.xml +++ b/viewlib/src/main/res/layout/item_expand_collapse.xml @@ -4,7 +4,8 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - + + \ No newline at end of file diff --git a/ExpandableTextView/src/main/res/drawable-xxhdpi/icon_green_arrow_down.png b/viewlib/src/main/res/mipmap-xxxhdpi/icon_green_arrow_down.png similarity index 100% rename from ExpandableTextView/src/main/res/drawable-xxhdpi/icon_green_arrow_down.png rename to viewlib/src/main/res/mipmap-xxxhdpi/icon_green_arrow_down.png diff --git a/ExpandableTextView/src/main/res/drawable-xxhdpi/icon_green_arrow_up.png b/viewlib/src/main/res/mipmap-xxxhdpi/icon_green_arrow_up.png similarity index 100% rename from ExpandableTextView/src/main/res/drawable-xxhdpi/icon_green_arrow_up.png rename to viewlib/src/main/res/mipmap-xxxhdpi/icon_green_arrow_up.png diff --git a/AliagnTextView/src/main/res/values/aligntextview-styles.xml b/viewlib/src/main/res/values/aligntextview-styles.xml similarity index 100% rename from AliagnTextView/src/main/res/values/aligntextview-styles.xml rename to viewlib/src/main/res/values/aligntextview-styles.xml diff --git a/AliagnTextView/src/main/res/values/aligntextview_attr.xml b/viewlib/src/main/res/values/aligntextview_attr.xml similarity index 100% rename from AliagnTextView/src/main/res/values/aligntextview_attr.xml rename to viewlib/src/main/res/values/aligntextview_attr.xml diff --git a/viewlib/src/main/res/values/attr.xml b/viewlib/src/main/res/values/attr.xml index 4addab2..173b8c3 100644 --- a/viewlib/src/main/res/values/attr.xml +++ b/viewlib/src/main/res/values/attr.xml @@ -39,5 +39,27 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExpandableTextView/src/main/res/values/colors.xml b/viewlib/src/main/res/values/colors.xml similarity index 100% rename from ExpandableTextView/src/main/res/values/colors.xml rename to viewlib/src/main/res/values/colors.xml diff --git a/viewlib/src/main/res/values/strings.xml b/viewlib/src/main/res/values/strings.xml index 6341cbe..65b3e9f 100644 --- a/viewlib/src/main/res/values/strings.xml +++ b/viewlib/src/main/res/values/strings.xml @@ -1,3 +1,8 @@ ViewLib + 展开 + 收起 + The story of a Chinese couple at Oxford University who first met each other as deskmate in middle school and recently married each other has gone viral, southcn.com reported. + Zhou Si, the groom, and Chen Mengge, the bride, married each other on Aug 18 and will together go to Oxford University to pursue their doctoral degrees later this year. + They were deskmate in middle school and then both were admitted by same high school but not in same class. -- GitLab