优化代码

Author: DrownCoder

app/build.gradle

@@ -30,5 +30,4 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     compile project(':shapebuilder')
-    compile project(':easywidget')
 }

app/src/main/java/com/study/xuan/suppershape/MainActivity.java

@@ -3,19 +3,17 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
-import com.study.xuan.easywidget.EasyTextView;
 import com.study.xuan.shapebuilder.annotation.Shape;
 import com.study.xuan.shapebuilder.shape.LayerBuilder;
 import com.study.xuan.shapebuilder.shape.ShapeBuilder;
 import com.study.xuan.shapebuilder.shape.ShapeListBuilder;
 
+import static android.graphics.drawable.GradientDrawable.OVAL;
 import static android.graphics.drawable.GradientDrawable.RECTANGLE;
+import static android.graphics.drawable.GradientDrawable.RING;
 
 public class MainActivity extends AppCompatActivity{
     @Shape(RECTANGLE)
@@ -24,40 +22,38 @@ public class MainActivity extends AppCompatActivity{
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ShapeBuilder builder1 = ShapeBuilder.create()
+
+        ShapeBuilder.create()
                 .Type(RECTANGLE)
-                .Soild(Color.RED);
+                .Radius(35)
+                .Stroke(15,Color.BLACK)
+                .Solid(Color.RED)
+                .build(findViewById(R.id.tv1));
+
+        ShapeBuilder builder1 = ShapeBuilder.create()
+                .Type(OVAL)
+                .Solid(Color.RED);
         ShapeBuilder builder2 = ShapeBuilder.create()
                 .Type(RECTANGLE)
-                .Soild(Color.RED);
+                .Solid(Color.RED);
         ShapeListBuilder.create(builder1.build())
-                .addShape(builder2.Soild(Color.BLUE).build(), android.R.attr.state_selected)
-                .build(findViewById(R.id.tv1));
-        findViewById(R.id.tv1).setOnClickListener(new View.OnClickListener() {
+                .addShape(builder2.Solid(Color.BLUE).build(), android.R.attr.state_selected)
+                .build(findViewById(R.id.tv2));
+        findViewById(R.id.tv2).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                findViewById(R.id.tv1).setSelected(!findViewById(R.id.tv1).isSelected());
-            }
-        });
-
-        LayerBuilder.create(builder1.build(), builder2.build()).Bottom(1, 15).build(findViewById(R
-                .id.tv3));
-        /*TextView ic = (TextView) findViewById(R.id.easyText);
-        Log.i("TAG", "---" + ic.getText().toString() + "----");
-        ic.append("300");
-
-        ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(Color.parseColor
-                ("#11FFFC"));
-        SpannableString spannableString = new SpannableString("+++"+ic.getText());
-        spannableString.setSpan(foregroundColorSpan, 0, 1, 1);
-        ic.setText(spannableString);*/
-        final EasyTextView ic = (EasyTextView) findViewById(R.id.easyText);
-        ic.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ic.setIconColor(Color.parseColor("#2E7D19"));
+                findViewById(R.id.tv2).setSelected(!findViewById(R.id.tv2).isSelected());
             }
         });
 
+        LayerBuilder.create(
+                ShapeBuilder.create()
+                .Type(RECTANGLE)
+                .Solid(Color.BLACK).build(),
+                ShapeBuilder.create()
+                .Type(RECTANGLE)
+                .Solid(Color.RED).build())
+                .Bottom(1, 15)
+                .build(findViewById(R.id.tv3));
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -22,7 +22,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="38sp"
-        android:text="TEXT2"
+        android:text="T"
+        android:padding="10dp"
         android:textColor="#000000"
         />
     <TextView
@@ -31,23 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="38sp"
-        android:text="TEXT2"
+        android:text="TEXT3"
         android:textColor="#000000"
         />
-    <com.study.xuan.easywidget.EasyTextView
-        android:id="@+id/easyText"
-        android:layout_marginTop="30dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/icon_font_home"
-        android:textSize="38dp"
-        android:textColor="#000000"
-        app:totalRadius="5dp"
-        app:textRight="300"
-        app:textPadding="30dp"
-        android:padding="10dp"
-        app:strokeColor="@color/colorAccent"
-        app:strokeWidth="2dp"
-        app:iconColor="@color/colorPrimary"
-        />
 </LinearLayout>