From 40a83f7cacf96adebd9c4e8da76b260a56e19868 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 22 Mar 2025 18:02:51 +0800
Subject: [PATCH] Optimize and improve

---
 .../com/v2ray/ang/ui/LogcatRecyclerAdapter.kt | 20 +++++++++++--------
 .../com/v2ray/ang/ui/MainRecyclerAdapter.kt   |  6 +++++-
 .../main/res/layout/item_recycler_main.xml    | 19 +++++++-----------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt
index c7f92412..7f16634d 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt
@@ -11,14 +11,18 @@ class LogcatRecyclerAdapter(val activity: LogcatActivity) : RecyclerView.Adapter
     override fun getItemCount() = mActivity.logsets.size
 
     override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
-        val log = mActivity.logsets[position]
-        if (log.isEmpty()) {
-            holder.itemSubSettingBinding.logTag.text = ""
-            holder.itemSubSettingBinding.logContent.text = ""
-        } else {
-            val content = log.split("):", limit = 2)
-            holder.itemSubSettingBinding.logTag.text = content.first().trim()
-            holder.itemSubSettingBinding.logContent.text = if (content.count() > 1) content.last().trim() else ""
+        try {
+            val log = mActivity.logsets[position]
+            if (log.isEmpty()) {
+                holder.itemSubSettingBinding.logTag.text = ""
+                holder.itemSubSettingBinding.logContent.text = ""
+            } else {
+                val content = log.split("):", limit = 2)
+                holder.itemSubSettingBinding.logTag.text = content.first().split("(", limit = 2).first().trim()
+                holder.itemSubSettingBinding.logContent.text = if (content.count() > 1) content.last().trim() else ""
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
         }
     }
 
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
index 05036b2d..aa810759 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
@@ -69,7 +69,11 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             } else {
                 holder.itemMainBinding.layoutIndicator.setBackgroundResource(0)
             }
-            holder.itemMainBinding.tvSubscription.text = MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks ?: ""
+            holder.itemMainBinding.tvSubscription.text =
+                if (mActivity.mainViewModel.subscriptionId.isEmpty())
+                    MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks.orEmpty()
+                else
+                    ""
 
             var shareOptions = share_method.asList()
             when (profile.configType) {
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
index 026b8bd6..bc7c454d 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
@@ -47,18 +47,13 @@
                     android:minLines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
                 <TextView
                     android:id="@+id/tv_statistics"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:lines="1"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textSize="12sp" />
+                    android:paddingTop="@dimen/margin_spacing_dp8"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
             </LinearLayout>
 
@@ -74,7 +69,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingTop="4dp"
+                android:paddingTop="2dp"
                 android:paddingEnd="@dimen/padding_spacing_dp16">
 
                 <TextView
@@ -85,7 +80,7 @@
                     android:lines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textColor="@color/color_secondary"
-                    android:textSize="10sp"
+                    android:textSize="11sp"
                     tools:text="Sub" />
 
                 <TextView
@@ -95,7 +90,7 @@
                     android:lines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textColor="@color/colorPing"
-                    android:textSize="10sp"
+                    android:textSize="11sp"
                     tools:text="214ms" />
             </LinearLayout>
 
@@ -167,7 +162,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:orientation="vertical"
-                android:paddingBottom="4dp"
+                android:paddingBottom="2dp"
                 android:paddingEnd="@dimen/padding_spacing_dp16">
 
                 <TextView
@@ -177,7 +172,7 @@
                     android:lines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textColor="@color/colorConfigType"
-                    android:textSize="10sp" />
+                    android:textSize="11sp" />
             </LinearLayout>
 
         </LinearLayout>