upgrade to v3.6.0

Author: rome753

README.md

@@ -32,7 +32,7 @@ monitors all activities' lifecycle.
 
 ## Usage
 1) add dependence in module's build.gradle
-> compile 'cc.rome753:activitytaskview:3.5.0'
+> compile 'cc.rome753:activitytaskview:3.6.0'
 
 2) add system alert permission in AndroidManifest.xml
 ```
@@ -47,6 +47,7 @@ public void onCreate() {
     ActivityTask.init(this, BuildConfig.DEBUG);
     // ActivityTask.setAutoHide(false); // optional
     // ActivityTask.setInterval(500);   // optional
+    // ActivityTask.setTextSize(10);    // optional
 }
 ```
 

activitytaskview/build.gradle

@@ -15,8 +15,8 @@ publish {
     userOrg = 'rome713bc'
     groupId = 'cc.rome753'
     artifactId = 'activitytaskview'
-    publishVersion = '3.5.0'
-    desc = 'Fragment tree complete!'
+    publishVersion = '3.6.0'
+    desc = 'Long name optimize'
     website = 'https://github.com/rome753/activitytaskview'
 }
 
@@ -26,8 +26,8 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionCode 7
-        versionName "3.5.0"
+        versionCode 8
+        versionName "3.6.0"
 
     }
 

activitytaskview/src/main/java/cc/rome753/activitytask/AUtils.java

@@ -23,6 +23,10 @@ public static int dp2px(float dpValue) {
         return (int) (0.5f + dpValue * Resources.getSystem().getDisplayMetrics().density);
     }
 
+    public static int getScreenWidth(Context context){
+        return context.getResources().getDisplayMetrics().widthPixels;
+    }
+
     public static String getSimpleName(Object obj){
         return obj.getClass().getSimpleName() + "@" + Integer.toHexString(obj.hashCode());
     }

activitytaskview/src/main/java/cc/rome753/activitytask/ActivityTask.java

@@ -41,6 +41,7 @@ public class ActivityTask {
     private static ActivityTaskView activityTaskView;
     private static boolean autoHide = true;
     private static long interval = 100;
+    private static int textSize = 12;
 
     /**
      * Is current app front. If not, hide the activityTaskView.
@@ -65,6 +66,14 @@ public static void setInterval(long interval) {
         ActivityTask.interval = interval;
     }
 
+    public static int getTextSize() {
+        return textSize;
+    }
+
+    public static void setTextSize(int textSize) {
+        ActivityTask.textSize = textSize;
+    }
+
     /**
      * Init in your application's onCreate()
      *

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

@@ -11,6 +11,7 @@
 import android.widget.LinearLayout;
 
 import cc.rome753.activitytask.AUtils;
+import cc.rome753.activitytask.ActivityTask;
 import cc.rome753.activitytask.R;
 import cc.rome753.activitytask.model.FragmentInfo;
 import cc.rome753.activitytask.model.TaskInfo;
@@ -46,6 +47,7 @@ private void add(TaskInfo taskInfo) {
         String name = taskInfo.getName();
         String parent = taskInfo.getParent();
         ObserverTextView textView = new ObserverTextView(getContext());
+        textView.setTextSize(ActivityTask.getTextSize());
         textView.setShortText(name);
         textView.setTag(name);
         LinearLayout layout = (LinearLayout) findChildByTag(mLinearLayout, parent);

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

@@ -9,6 +9,7 @@
 import java.util.List;
 
 import cc.rome753.activitytask.AUtils;
+import cc.rome753.activitytask.ActivityTask;
 import cc.rome753.activitytask.R;
 import cc.rome753.activitytask.model.FragmentInfo;
 import cc.rome753.activitytask.model.STree;
@@ -51,7 +52,8 @@ private void notifyData(){
 
     private void addTextView(String text){
         ObserverTextView textView = new ObserverTextView(getContext());
-        String[] arr = text.split("─");
+        textView.setTextSize(ActivityTask.getTextSize());
+        String[] arr = text.split(getResources().getString(R.string.tab0));
         String name = arr[arr.length - 1];
         int life = mFLMap.containsKey(name) ? mFLMap.get(name) : 0;
         textView.setTag(name);

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

@@ -18,7 +18,6 @@
 
 public class ObserverTextView extends AppCompatTextView implements Observer{
 
-    private static final int TEXT_SIZE = 12;
 
     public ObserverTextView(Context context) {
         this(context, null);
@@ -30,17 +29,19 @@ public ObserverTextView(Context context, AttributeSet attrs) {
 
     public ObserverTextView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        setTextSize(TEXT_SIZE);
+        setMaxWidth(AUtils.getScreenWidth(context) / 2);
+        setSingleLine();
+        setEllipsize(TextUtils.TruncateAt.END);
         setTextColor(AUtils.COLORS[0]);
     }
 
     public void setShortText(String s){
         int index = s.indexOf("@");
         if(index > 0){
-            setText(s.substring(0, index));
-        } else {
-            setText(s);
+            s = s.substring(0, index);
         }
+        setText(s);
+
     }
 
     @Override

activitytaskview/src/main/res/drawable/bg_rect_inner.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
     <size android:width="10dp" android:height="10dp" />
+    <solid android:color="@android:color/transparent" />
     <stroke android:color="@android:color/holo_blue_dark" android:width="1dp" />
 </shape>

activitytaskview/src/main/res/values/strings.xml

@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">activityTaskView</string>
+    <string name="tab0">─</string>
     <string name="tab1">│</string>
     <string name="tab2">└─</string>
     <string name="tab3">├─</string>

app/build.gradle

@@ -30,4 +30,5 @@ dependencies {
     api 'com.android.support:appcompat-v7:25.2.0'
     testApi 'junit:junit:4.12'
     api project(':activitytaskview')
+//    api 'cc.rome753:activitytaskview:3.5.0'
 }