katekate/v2rayNG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize and improve

Browse Source
This commit is contained in:
2dust
2025-03-22 18:02:51 +08:00
parent fd9f912c18
commit 40a83f7cac
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt
View File

@@ -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()
}
}

6
V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
View File

@@ -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) {

19
V2rayNG/app/src/main/res/layout/item_recycler_main.xml
View File

@@ -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>