2.0 demo updated

woxingxiao · Oct 25, 2017 · e11101b · e11101b
1 parent 5ef9370
commit e11101b
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.2"
     defaultConfig {
         applicationId "com.xw.sample.vectorcompattextview"
         minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 26
+        versionCode 2
+        versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
@@ -24,7 +25,7 @@ dependencies {
     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.0'
+    compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
     testCompile 'junit:junit:4.12'
     compile project(':vectorcompattextview')
 }
diff --git a/app/src/main/java/com/xw/sample/vectorcompattextview/MainActivity.java b/app/src/main/java/com/xw/sample/vectorcompattextview/MainActivity.java
@@ -1,13 +1,25 @@
 package com.xw.sample.vectorcompattextview;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.xw.repo.VectorCompatTextView;
 
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        final VectorCompatTextView textView = (VectorCompatTextView) findViewById(R.id.checkable_text_view);
+        textView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                textView.toggle();
+                textView.setText(textView.isChecked() ? "SELECTED TAB" : "UNSELECTED TAB");
+            }
+        });
     }
 }
diff --git a/app/src/main/res/drawable/selector_drawable_tab.xml b/app/src/main/res/drawable/selector_drawable_tab.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/shape_rect_solid_gray"
+        android:state_checked="false"/>
+    <item
+        android:drawable="@drawable/shape_rect_solid_red"
+        android:state_checked="true"/>
+</selector>
diff --git a/app/src/main/res/drawable/selector_text_color_tab.xml b/app/src/main/res/drawable/selector_text_color_tab.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="@color/color_gray"
+        android:state_checked="false"/>
+    <item
+        android:color="@color/color_red"
+        android:state_checked="true"/>
+</selector>
diff --git a/app/src/main/res/drawable/shape_rect_solid_gray.xml b/app/src/main/res/drawable/shape_rect_solid_gray.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@color/color_gray"/>
+</shape>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -37,6 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:text="微博"
@@ -47,6 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:text="微信"
@@ -57,6 +59,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:text="twitter"
@@ -185,6 +188,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:text="GitHub"
@@ -196,6 +200,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:text="你好"
@@ -231,6 +236,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:text="GitHub"
@@ -242,6 +248,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:text="Android"
@@ -254,6 +261,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
             android:layout_marginTop="8dp"
             android:orientation="horizontal">
 
@@ -268,14 +276,26 @@
                 app:drawableWidth="4dp"/>
 
             <com.xw.repo.VectorCompatTextView
-                android:layout_width="wrap_content"
+                android:id="@+id/checkable_text_view"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
+                android:checked="true"
                 android:drawablePadding="4dp"
+                android:gravity="center"
                 android:text="SELECTED TAB"
+                android:textColor="@drawable/selector_text_color_tab"
                 app:drawableAdjustTextWidth="true"
-                app:drawableBottomCompat="@drawable/shape_rect_solid_red"
+                app:drawableBottomCompat="@drawable/selector_drawable_tab"
                 app:drawableHeight="2dp"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
+                android:text="← click it"/>
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/screenshot/demo3.png b/screenshot/demo3.png
diff --git a/screenshot/demo4.jpg b/screenshot/demo4.jpg