UI complete.

Author: chao

activitytaskview/src/main/java/cc/rome753/activitytask/model/ViewPool.java

@@ -6,11 +6,11 @@
 
 import java.util.LinkedList;
 
-import cc.rome753.activitytask.view.ObserverTextView;
+import cc.rome753.activitytask.view.ATextView;
 
 public class ViewPool {
 
-    LinkedList<ObserverTextView> pool = new LinkedList<>();
+    LinkedList<ATextView> pool = new LinkedList<>();
     private static ViewPool factory = new ViewPool();
     public static ViewPool get() {
         return factory;
@@ -20,19 +20,19 @@ public void recycle(ViewGroup viewGroup) {
         if(viewGroup != null) {
             for(int i = 0; i < viewGroup.getChildCount(); i++) {
                 View view = viewGroup.getChildAt(i);
-                if(view instanceof ObserverTextView) {
-                    pool.add((ObserverTextView) view);
+                if(view instanceof ATextView) {
+                    pool.add((ATextView) view);
                 } else if(view instanceof ViewGroup) {
                     recycle((ViewGroup) view);
                 }
             }
         }
     }
 
-    public ObserverTextView getOne(Context context) {
-        ObserverTextView view;
+    public ATextView getOne(Context context) {
+        ATextView view;
         if(pool.isEmpty()) {
-            view = new ObserverTextView(context);
+            view = new ATextView(context);
         } else {
             view = pool.remove();
             removeParent(view);

…/activitytask/view/ObserverTextView.java …rome753/activitytask/view/ATextView.javaactivitytaskview/src/main/java/cc/rome753/activitytask/view/ObserverTextView.java renamed to activitytaskview/src/main/java/cc/rome753/activitytask/view/ATextView.java activitytaskview/src/main/java/cc/rome753/activitytask/view/ObserverTextView.java renamed to activitytaskview/src/main/java/cc/rome753/activitytask/view/ATextView.java

@@ -4,35 +4,29 @@
 import android.graphics.Color;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.TextUtils;
 import android.text.style.AbsoluteSizeSpan;
 import android.util.AttributeSet;
 
 import androidx.appcompat.widget.AppCompatTextView;
 
-import java.util.Observable;
-import java.util.Observer;
-
-import cc.rome753.activitytask.model.LifecycleInfo;
-
 /**
  * change text color when update
  * Created by [email protected] on 2017/4/3.
  */
 
-public class ObserverTextView extends AppCompatTextView implements Observer{
+public class ATextView extends AppCompatTextView{
 
     private static AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(8, true);
 
-    public ObserverTextView(Context context) {
+    public ATextView(Context context) {
         this(context, null);
     }
 
-    public ObserverTextView(Context context, AttributeSet attrs) {
+    public ATextView(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
-    public ObserverTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+    public ATextView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         setMaxLines(1);
         setTextSize(10);
@@ -58,20 +52,4 @@ public void setInfoText(String s, String lifecycle) {
         setText(span);
     }
 
-
-    @Override
-    public void update(Observable o, Object arg){
-        LifecycleInfo info = (LifecycleInfo) arg;
-        String name;
-        if(info.fragments != null) {
-            name = info.fragments.get(0);
-        } else {
-            name = info.activity;
-        }
-        if(TextUtils.equals(name, String.valueOf(getTag()))) {
-            String[] ss = getText().toString().split(" ");
-            setText(ss[0] + " " + info.lifecycle);
-        }
-    }
-
 }

activitytaskview/src/main/java/cc/rome753/activitytask/view/ActivityTaskView.java

@@ -120,6 +120,7 @@ private void moveToBorder() {
 
     public void add(LifecycleInfo info) {
         FragmentTaskView view = new FragmentTaskView(getContext());
+        view.setTitle(info.activity);
         view.setTag(info.activity);
         mContainer.addView(view, 0);
 
@@ -149,7 +150,7 @@ private void notifyData() {
             TaskLayout layout = new TaskLayout(getContext());
             layout.setTitle(entry.getKey());
             for (String value : entry.getValue()) {
-                ObserverTextView textView = ViewPool.get().getOne(getContext());
+                ATextView textView = ViewPool.get().getOne(getContext());
                 textView.setInfoText(value, aTree.getLifecycle(value));
                 layout.addFirst(textView);
             }

activitytaskview/src/main/java/cc/rome753/activitytask/view/FragmentTaskView.java

@@ -1,9 +1,7 @@
 package cc.rome753.activitytask.view;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.util.AttributeSet;
-import android.widget.LinearLayout;
 
 import java.util.List;
 
@@ -16,7 +14,7 @@
  * Created by rome753 on 2017/3/31.
  */
 
-public class FragmentTaskView extends LinearLayout {
+public class FragmentTaskView extends TaskLayout {
 
     FTree mTree = new FTree();
 
@@ -26,8 +24,13 @@ public FragmentTaskView(Context context) {
 
     public FragmentTaskView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setOrientation(VERTICAL);
-        setBackgroundColor(Color.parseColor("#333333"));
+        setVisibility(GONE);
+    }
+
+    @Override
+    public void setTitle(String title) {
+        String[] ss = title.split("@");
+        tv.setText(ss[0]);
     }
 
     public void add(LifecycleInfo info) {
@@ -47,17 +50,18 @@ public void update(LifecycleInfo info) {
 
     private void notifyData(){
         ViewPool.get().recycle(this);
-        removeAllViews();
+        ll.removeAllViews();
         if(mTree != null){
             List<String> strings = mTree.convertToList();
             for(String s : strings){
-                ObserverTextView textView = ViewPool.get().getOne(getContext());
+                ATextView textView = ViewPool.get().getOne(getContext());
                 String[] arr = s.split(String.valueOf('\u2500')); // -
                 String name = arr[arr.length - 1];
                 textView.setInfoText(s, mTree.getLifecycle(name));
-                addView(textView);
+                ll.addView(textView);
             }
         }
+        setVisibility(ll.getChildCount() == 0 ? GONE : VISIBLE);
     }
 
 }