fix: race cond errors

border

V2rayNG/app/src/main/java/xyz/zarazaex/olc/AppConfig.kt

@@ -74,6 +74,7 @@ object AppConfig {
     const val PREF_HEV_TUNNEL_RW_TIMEOUT = "pref_hev_tunnel_rw_timeout_v2"
     const val PREF_AUTO_SORT_AFTER_TEST = "pref_auto_sort_after_test"
     const val PREF_SHOW_COPY_BUTTON = "pref_show_copy_button"
+    const val PREF_SHOW_SERVER_IP = "pref_show_server_ip"
     const val PREF_DYNAMIC_COLORS = "pref_dynamic_colors"
     const val PREF_SUBSCRIPTIONS_BOTTOM = "pref_subscriptions_bottom"
 

V2rayNG/app/src/main/java/xyz/zarazaex/olc/handler/AngConfigManager.kt

@@ -612,18 +612,19 @@ object AngConfigManager {
             Log.i(AppConfig.TAG, url)
             val userAgent = it.subscription.userAgent
 
-            val timeout = if (url.startsWith("https://key.zarazaex.xyz/sub")) 3000 else 6000
+            val proxyTimeout = if (url.startsWith("https://key.zarazaex.xyz/sub")) 3000 else 5000
+            val directTimeout = if (url.startsWith("https://key.zarazaex.xyz/sub")) 3000 else 11000
 
             var configText = try {
                 val httpPort = SettingsManager.getHttpPort()
-                HttpUtil.getUrlContentWithUserAgent(url, userAgent, timeout, httpPort)
+                HttpUtil.getUrlContentWithUserAgent(url, userAgent, proxyTimeout, httpPort)
             } catch (e: Exception) {
                 Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error", e)
                 ""
             }
             if (configText.isEmpty()) {
                 configText = try {
-                    HttpUtil.getUrlContentWithUserAgent(url, userAgent, timeout)
+                    HttpUtil.getUrlContentWithUserAgent(url, userAgent, directTimeout)
                 } catch (e: Exception) {
                     Log.e(AppConfig.TAG, "Update subscription: Failed to get URL content with user agent", e)
                     ""

V2rayNG/app/src/main/java/xyz/zarazaex/olc/ui/BaseActivity.kt

@@ -123,6 +123,9 @@ abstract class BaseActivity : AppCompatActivity() {
             setSupportActionBar(it)
             supportActionBar?.setDisplayHomeAsUpEnabled(showHomeAsUp)
             title?.let { t -> this.title = t }
+            val typedValue = TypedValue()
+            theme.resolveAttribute(com.google.android.material.R.attr.colorOnSurface, typedValue, true)
+            it.setTitleTextColor(typedValue.data)
             syncStatusBarWithToolbar(it)
         }
         progressBar = findViewById(R.id.progress_bar)

V2rayNG/app/src/main/java/xyz/zarazaex/olc/ui/GroupServerFragment.kt

@@ -65,7 +65,7 @@ class GroupServerFragment : BaseFragment<FragmentGroupServerBinding>(),
         } else {
             binding.recyclerView.layoutManager = GridLayoutManager(requireContext(), 1)
         }
-        addCustomDividerToRecyclerView(binding.recyclerView, R.drawable.custom_divider)
+        addCustomDividerToRecyclerView(binding.recyclerView, R.drawable.server_list_divider)
         binding.recyclerView.adapter = adapter
 
         itemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter, allowSwipe = false))
@@ -333,4 +333,4 @@ class GroupServerFragment : BaseFragment<FragmentGroupServerBinding>(),
             ownerActivity.toast(R.string.toast_server_not_found_in_group)
         }
     }
-}
+}

V2rayNG/app/src/main/java/xyz/zarazaex/olc/ui/MainActivity.kt

@@ -56,6 +56,7 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
     private var isLiteTesting = false
     private var easterEggClickCount = 0
     private var isEasterEggActive = false
+    private var liteActionJob: kotlinx.coroutines.Job? = null
     /** Был ли VPN уже запущен в предыдущем колбэке — чтобы детектировать момент подключения */
     private var wasRunning = false
 
@@ -110,21 +111,33 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
         toggle.syncState()
         binding.navView.setNavigationItemSelectedListener(this)
 
+        val typedValue = android.util.TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorOnSurface, typedValue, true)
+        val onSurface = typedValue.data
+        binding.toolbar.setTitleTextColor(onSurface)
+        // MaterialToolbar с titleCentered рисует отдельный TextView — красим его явно
+        for (i in 0 until binding.toolbar.childCount) {
+            val child = binding.toolbar.getChildAt(i)
+            if (child is android.widget.TextView) {
+                child.setTextColor(onSurface)
+            }
+        }
+
         ViewCompat.setOnApplyWindowInsetsListener(binding.drawerContentLayout) { v, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             v.setPadding(0, systemBars.top, 0, systemBars.bottom)
             insets
         }
 
-        findViewById<android.widget.TextView>(R.id.drawer_settings)?.setOnClickListener {
+        findViewById<android.view.View>(R.id.drawer_settings)?.setOnClickListener {
             requestActivityLauncher.launch(Intent(this, SettingsActivity::class.java))
             binding.drawerLayout.closeDrawer(androidx.core.view.GravityCompat.START)
         }
-        findViewById<android.widget.TextView>(R.id.drawer_per_app)?.setOnClickListener {
+        findViewById<android.view.View>(R.id.drawer_per_app)?.setOnClickListener {
             requestActivityLauncher.launch(Intent(this, PerAppProxyActivity::class.java))
             binding.drawerLayout.closeDrawer(androidx.core.view.GravityCompat.START)
         }
-        findViewById<android.widget.TextView>(R.id.drawer_check_update)?.setOnClickListener {
+        findViewById<android.view.View>(R.id.drawer_check_update)?.setOnClickListener {
             startActivity(Intent(this, CheckUpdateActivity::class.java))
             binding.drawerLayout.closeDrawer(androidx.core.view.GravityCompat.START)
         }
@@ -203,12 +216,16 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
                 // Молния — стоп-кнопка, всегда активна во время теста
                 binding.btnSummaryLite.isEnabled = true
                 binding.btnSummaryLite.alpha = 1.0f
-                binding.btnSummaryLite.setImageResource(R.drawable.ic_stop_24dp)
-                binding.btnSummaryLite.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_active))
+                binding.btnSummaryLite.setIconResource(R.drawable.ic_stop_24dp)
+                binding.btnSummaryLite.backgroundTintList = ColorStateList.valueOf(
+                    com.google.android.material.color.MaterialColors.getColor(this, com.google.android.material.R.attr.colorPrimaryContainer, 0)
+                )
             } else {
                 setButtonsEnabled(true)
-                binding.btnSummaryLite.setImageResource(R.drawable.bolt_24)
-                binding.btnSummaryLite.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive))
+                binding.btnSummaryLite.setIconResource(R.drawable.bolt_24)
+                binding.btnSummaryLite.backgroundTintList = ColorStateList.valueOf(
+                    com.google.android.material.color.MaterialColors.getColor(this, com.google.android.material.R.attr.colorSecondaryContainer, 0)
+                )
             }
         }
 
@@ -302,15 +319,19 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
     }
 
     private fun handleFabAction() {
+        // Если идёт подключение (isLoading) — позволяем прервать и остановить сервис
         if (isFabOperationInProgress) {
+            Log.d(AppConfig.TAG, "FAB: cancel in-progress, stopping service")
+            isFabOperationInProgress = false
+            lifecycleScope.launch {
+                V2RayServiceManager.stopVService(this@MainActivity)
+            }
             return
         }
         isFabOperationInProgress = true
 
         val isRunning = mainViewModel.isRunning.value == true
 
-        // Блокируем все кнопки сразу
-        setButtonsEnabled(false)
         applyRunningState(isLoading = true, isRunning = false)
 
         lifecycleScope.launch {
@@ -341,11 +362,20 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
     }
 
     private fun handleLiteAction() {
-        // If testing is in progress - stop it
-        if (mainViewModel.isTesting.value == true) {
+        // Отмена на любом этапе: обновление подписок или тест
+        if (mainViewModel.isTesting.value == true || liteActionJob?.isActive == true) {
+            liteActionJob?.cancel()
+            liteActionJob = null
             mainViewModel.cancelAllTests()
-            showStatus("Тест остановлен")
             isLiteTesting = false
+            isFabOperationInProgress = false
+            showStatus("Остановлено")
+            setButtonsEnabled(true)
+            binding.btnSummaryLite.setIconResource(R.drawable.bolt_24)
+            binding.btnSummaryLite.backgroundTintList = ColorStateList.valueOf(
+                com.google.android.material.color.MaterialColors.getColor(this, com.google.android.material.R.attr.colorSecondaryContainer, 0)
+            )
+            hideLoading()
             return
         }
 
@@ -354,10 +384,7 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
         }
         isFabOperationInProgress = true
 
-        // Блокируем все кнопки сразу при нажатии
-        setButtonsEnabled(false)
-
-        lifecycleScope.launch {
+        liteActionJob = lifecycleScope.launch {
             try {
                 if (mainViewModel.isRunning.value == true) {
                     V2RayServiceManager.stopVService(this@MainActivity)
@@ -366,33 +393,36 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
 
                 showStatus("Обновление профилей...")
                 showLoading()
+                // Иконка молнии → стоп пока идёт обновление
+                binding.btnSummaryLite.setIconResource(R.drawable.ic_stop_24dp)
                 isLiteTesting = true
 
-                launch(Dispatchers.IO) {
-                    val result = mainViewModel.updateConfigViaSubAll()
-                    val removed = mainViewModel.removeDuplicateByIpAll()
-                    withContext(Dispatchers.Main) {
-                        mainViewModel.reloadServerList()
-                        if (result.configCount > 0) {
-                            val status = if (removed > 0)
-                                "Обновлено ${result.configCount} профилей, удалено $removed дубл. IP. Запуск теста..."
-                            else
-                                "Обновлено ${result.configCount} профилей. Запуск теста..."
-                            showStatus(status)
-                        } else {
-                            showStatus("Запуск теста...")
-                        }
-                        hideLoading()
+                val result = withContext(Dispatchers.IO) { mainViewModel.updateConfigViaSubAll() }
+                val removed = withContext(Dispatchers.IO) { mainViewModel.removeDuplicateByIpAll() }
 
-                        showStatus("Выполняется замер задержки. Ожидаем завершения...")
-                        mainViewModel.testAllRealPing()
-                    }
+                mainViewModel.reloadServerList()
+                if (result.configCount > 0) {
+                    val status = if (removed > 0)
+                        "Обновлено ${result.configCount} профилей, удалено $removed дубл. IP. Запуск теста..."
+                    else
+                        "Обновлено ${result.configCount} профилей. Запуск теста..."
+                    showStatus(status)
+                } else {
+                    showStatus("Запуск теста...")
                 }
-                delay(1500)
+                hideLoading()
+
+                showStatus("Выполняется замер задержки. Ожидаем завершения...")
+                mainViewModel.testAllRealPing()
+            } catch (e: kotlinx.coroutines.CancellationException) {
+                // Пользователь нажал стоп — уже обработано выше
             } catch (e: Exception) {
                 Log.e(AppConfig.TAG, "Error in handleLiteAction", e)
+                isLiteTesting = false
+                hideLoading()
             } finally {
                 isFabOperationInProgress = false
+                liteActionJob = null
             }
         }
     }
@@ -473,33 +503,58 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
     }
 
     private fun applyRunningState(isLoading: Boolean, isRunning: Boolean) {
+        val secContainer = ColorStateList.valueOf(
+            com.google.android.material.color.MaterialColors.getColor(this, com.google.android.material.R.attr.colorSecondaryContainer, 0)
+        )
         if (isLoading) {
-            // Идёт процесс подключения/отключения — блокируем всё
-            setButtonsEnabled(false)
-            binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive))
+            // Во время загрузки FAB и молния остаются доступны для отмены
+            binding.fab.isEnabled = true
+            binding.fab.alpha = 1.0f
+            val menu = binding.toolbar.menu
+            menu.findItem(R.id.real_ping_all)?.let { it.isEnabled = false; it.icon?.alpha = 128 }
+            menu.findItem(R.id.filter_by_country)?.let { it.isEnabled = false; it.icon?.alpha = 128 }
+            menu.findItem(R.id.sub_update)?.let { it.isEnabled = false; it.icon?.alpha = 128 }
+            binding.btnSummaryLite.isEnabled = true
+            binding.btnSummaryLite.alpha = 1.0f
+            binding.fab.backgroundTintList = secContainer
+            setStatusDot(DotState.LOADING)
             return
         }
 
         if (isRunning) {
-            // Подключены: только FAB (отключить) активен, остальное блокируем
             setSecondaryButtonsEnabled(false)
             binding.fab.isEnabled = true
             binding.fab.alpha = 1.0f
             binding.fab.backgroundTintList = accentColor()
-            binding.btnSummaryLite.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive))
+            binding.btnSummaryLite.backgroundTintList = secContainer
             binding.fab.contentDescription = getString(R.string.action_stop_service)
             setTestState(getString(R.string.connection_connected))
             binding.layoutTest.isFocusable = true
+            setStatusDot(DotState.CONNECTED)
         } else {
             setButtonsEnabled(true)
-            binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive))
-            binding.btnSummaryLite.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive))
+            binding.fab.backgroundTintList = accentColor()
+            binding.btnSummaryLite.backgroundTintList = secContainer
             binding.fab.contentDescription = getString(R.string.tasker_start_service)
             setTestState(getString(R.string.connection_not_connected))
             binding.layoutTest.isFocusable = false
+            setStatusDot(DotState.IDLE)
         }
     }
 
+    private enum class DotState { IDLE, CONNECTED, LOADING }
+
+    private fun setStatusDot(state: DotState) {
+        val dot = binding.statusDot
+        dot.animate().cancel()
+        dot.alpha = 1f; dot.scaleX = 1f; dot.scaleY = 1f
+        dot.backgroundTintList = ColorStateList.valueOf(when (state) {
+            DotState.CONNECTED -> ContextCompat.getColor(this, R.color.status_connected)
+            DotState.LOADING   -> com.google.android.material.color.MaterialColors.getColor(this, com.google.android.material.R.attr.colorPrimaryContainer, 0)
+            DotState.IDLE      -> com.google.android.material.color.MaterialColors.getColor(this, com.google.android.material.R.attr.colorOutline, 0)
+        })
+    }
+
     override fun onResume() {
         super.onResume()
         MessageUtil.sendMsg2Service(this, AppConfig.MSG_REGISTER_CLIENT, "")

V2rayNG/app/src/main/java/xyz/zarazaex/olc/ui/MainRecyclerAdapter.kt

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.color.MaterialColors
 import java.util.Collections
 import xyz.zarazaex.olc.AppConfig
 import xyz.zarazaex.olc.R
@@ -35,7 +36,11 @@ class MainRecyclerAdapter(
             MmkvManager.decodeSettingsBool(AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, false)
     private val showCopyButton =
             MmkvManager.decodeSettingsBool(AppConfig.PREF_SHOW_COPY_BUTTON, false)
+    private val showServerIp =
+            MmkvManager.decodeSettingsBool(AppConfig.PREF_SHOW_SERVER_IP, false)
     private var data: MutableList<ServersCache> = mutableListOf()
+    private var minReachablePing: Long? = null
+    private var maxReachablePing: Long? = null
     private var recyclerView: RecyclerView? = null
 
     override fun onAttachedToRecyclerView(rv: RecyclerView) {
@@ -59,6 +64,7 @@ class MainRecyclerAdapter(
 
         if (data.isEmpty() || parsedNewData.isEmpty() || position >= 0) {
             data = parsedNewData.toMutableList()
+            recomputePingRange()
             if (position >= 0 && position in data.indices) {
                 notifyItemChanged(position)
             } else {
@@ -106,6 +112,7 @@ class MainRecyclerAdapter(
                 )
 
         data = parsedNewData.toMutableList()
+        recomputePingRange()
         diffResult.dispatchUpdatesTo(this)
 
         if (isAtTop) {
@@ -162,26 +169,32 @@ class MainRecyclerAdapter(
 
             // Name address
             holder.itemMainBinding.tvName.text = profile.remarks
-            holder.itemMainBinding.tvStatistics.text = getAddress(profile)
+            val addressText = getAddress(profile)
+            holder.itemMainBinding.tvStatistics.text = addressText
+            holder.itemMainBinding.tvStatistics.visibility =
+                    if (addressText.isEmpty()) View.GONE else View.VISIBLE
 
             // TestResult
             val aff = MmkvManager.decodeServerAffiliationInfo(guid)
             holder.itemMainBinding.tvTestResult.text = aff?.getTestDelayString().orEmpty()
-            if ((aff?.testDelayMillis ?: 0L) < 0L) {
-                holder.itemMainBinding.tvTestResult.setTextColor(
-                        ContextCompat.getColor(context, R.color.colorPingRed)
-                )
-            } else {
-                holder.itemMainBinding.tvTestResult.setTextColor(
-                        ContextCompat.getColor(context, R.color.colorPing)
-                )
-            }
+            holder.itemMainBinding.tvTestResult.setTextColor(
+                    getPingColor(context, aff?.testDelayMillis)
+            )
+            (holder.itemMainBinding.tvTestResult.layoutParams as? ViewGroup.MarginLayoutParams)?.marginStart =
+                    if (addressText.isEmpty()) 0 else 6.dpToPx(context)
 
-            // layoutIndicator
-            if (guid == MmkvManager.getSelectServer()) {
-                holder.itemMainBinding.layoutIndicator.setBackgroundResource(R.color.colorIndicator)
-            } else {
-                holder.itemMainBinding.layoutIndicator.setBackgroundResource(0)
+            // Keep regular list items on the page surface; selected state is a quiet surface pill.
+            val isSelected = guid == MmkvManager.getSelectServer()
+            holder.itemMainBinding.cardContainer.apply {
+                val selectedColor = MaterialColors.getColor(
+                    context,
+                    com.google.android.material.R.attr.colorSurfaceContainerHigh,
+                    Color.TRANSPARENT
+                )
+
+                setCardBackgroundColor(if (isSelected) selectedColor else Color.TRANSPARENT)
+                strokeWidth = 0
+                strokeColor = Color.TRANSPARENT
             }
 
             // subscription remarks
@@ -223,9 +236,52 @@ class MainRecyclerAdapter(
      * @return Formatted address string
      */
     private fun getAddress(profile: ProfileItem): String {
+        if (!showServerIp) {
+            return ""
+        }
         return AngConfigManager.generateDescription(profile)
     }
 
+    private fun getPingColor(context: android.content.Context, delayMillis: Long?): Int {
+        val delay = delayMillis ?: return MaterialColors.getColor(
+                context,
+                com.google.android.material.R.attr.colorOnSurfaceVariant,
+                ContextCompat.getColor(context, R.color.colorPing)
+        )
+        if (delay == 0L) {
+            return MaterialColors.getColor(
+                    context,
+                    com.google.android.material.R.attr.colorOnSurfaceVariant,
+                    ContextCompat.getColor(context, R.color.colorPing)
+            )
+        }
+        return when {
+            delay < 0L -> ContextCompat.getColor(context, R.color.colorPingRed)
+            minReachablePing == null || maxReachablePing == null -> ContextCompat.getColor(context, R.color.colorPingGood)
+            minReachablePing == maxReachablePing -> ContextCompat.getColor(context, R.color.colorPingGood)
+            else -> {
+                val min = minReachablePing ?: delay
+                val max = maxReachablePing ?: delay
+                val relative = ((delay - min).toFloat() / (max - min).toFloat()).coerceIn(0f, 1f)
+                when {
+                    relative <= 0.33f -> ContextCompat.getColor(context, R.color.colorPingGood)
+                    relative <= 0.66f -> ContextCompat.getColor(context, R.color.colorPingMedium)
+                    else -> ContextCompat.getColor(context, R.color.colorPingRed)
+                }
+            }
+        }
+    }
+
+    private fun recomputePingRange() {
+        val delays = data.mapNotNull { item ->
+            MmkvManager.decodeServerAffiliationInfo(item.guid)
+                ?.testDelayMillis
+                ?.takeIf { it > 0L }
+        }
+        minReachablePing = delays.minOrNull()
+        maxReachablePing = delays.maxOrNull()
+    }
+
     /**
      * Gets the subscription remarks information
      * @param profile The server configuration
@@ -245,6 +301,7 @@ class MainRecyclerAdapter(
         val idx = data.indexOfFirst { it.guid == guid }
         if (idx >= 0) {
             data.removeAt(idx)
+            recomputePingRange()
             notifyItemRemoved(idx)
             notifyItemRangeChanged(idx, data.size - idx)
         }
@@ -255,6 +312,10 @@ class MainRecyclerAdapter(
         notifyItemChanged(toPosition)
     }
 
+    private fun Int.dpToPx(context: android.content.Context): Int {
+        return (this * context.resources.displayMetrics.density).toInt()
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
         return when (viewType) {
             VIEW_TYPE_ITEM ->

V2rayNG/app/src/main/java/xyz/zarazaex/olc/viewmodel/MainViewModel.kt

@@ -120,6 +120,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             list
         }
 
+        pinSelectedGuidToTop(serverList)
         updateCache()
         updateListAction.value = -1
     }
@@ -638,6 +639,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 }
             }
         ))
+        pinSelectedCacheItemToTop(serversCache)
     }
 
     fun sortByTestResults() {
@@ -689,6 +691,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val serversBySubId = allServerDelays.groupBy { it.subId }
         serversBySubId.forEach { (subId, servers) ->
             val sortedList = servers.map { it.guid }.toMutableList()
+            pinSelectedGuidToTop(sortedList)
             MmkvManager.encodeServerList(sortedList, subId)
         }
     }
@@ -716,11 +719,32 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         serverDelays.sortWith(compareBy({ !it.isFav }, { it.testDelayMillis }))
 
         val sortedServerList = serverDelays.map { it.guid }.toMutableList()
+        pinSelectedGuidToTop(sortedServerList)
 
         // Save the sorted list for this subscription
         MmkvManager.encodeServerList(sortedServerList, subId)
     }
 
+    private fun pinSelectedGuidToTop(list: MutableList<String>) {
+        val selectedGuid = MmkvManager.getSelectServer().orEmpty()
+        if (selectedGuid.isEmpty()) return
+        val index = list.indexOf(selectedGuid)
+        if (index > 0) {
+            list.removeAt(index)
+            list.add(0, selectedGuid)
+        }
+    }
+
+    private fun pinSelectedCacheItemToTop(list: MutableList<ServersCache>) {
+        val selectedGuid = MmkvManager.getSelectServer().orEmpty()
+        if (selectedGuid.isEmpty()) return
+        val index = list.indexOfFirst { it.guid == selectedGuid }
+        if (index > 0) {
+            val selectedItem = list.removeAt(index)
+            list.add(0, selectedItem)
+        }
+    }
+
 
     /**
      * Initializes assets.

V2rayNG/app/src/main/res/drawable/ic_circle.xml

@@ -1,7 +1,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/divider_color_light" />
+    <solid android:color="?attr/colorSecondaryContainer" />
     <size
-        android:width="48dp"
-        android:height="48dp" />
-</shape>
+        android:width="24dp"
+        android:height="24dp" />
+</shape>

V2rayNG/app/src/main/res/drawable/server_list_divider.xml

@@ -0,0 +1,12 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="0dp"
+        android:left="28dp"
+        android:right="28dp"
+        android:top="0dp">
+        <shape>
+            <size android:height="1dp" />
+            <solid android:color="@color/server_list_divider" />
+        </shape>
+    </item>
+</layer-list>

V2rayNG/app/src/main/res/drawable/status_dot.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#FF888888" />
+    <size android:width="10dp" android:height="10dp" />
+</shape>

V2rayNG/app/src/main/res/layout/activity_about.xml

@@ -1,171 +1,228 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp">
 
-        <LinearLayout
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="top"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp"
+            app:strokeWidth="0dp">
 
             <LinearLayout
-                android:id="@+id/layout_soure_ccode"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center|start"
-                android:orientation="horizontal"
-                android:padding="@dimen/padding_spacing_dp16">
+                android:layout_height="match_parent"
+                android:gravity="top"
+                android:orientation="vertical">
 
-                <ImageView
-                    android:layout_width="@dimen/image_size_dp24"
-                    android:layout_height="@dimen/image_size_dp24"
-                    android:importantForAccessibility="no"
-                    app:srcCompat="@drawable/ic_source_code_24dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/layout_soure_ccode"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_spacing_dp16"
-                    android:text="@string/title_source_code"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center|start"
+                    android:orientation="horizontal"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:importantForAccessibility="no"
+                        app:srcCompat="@drawable/ic_source_code_24dp"
+                        app:tint="?attr/colorOnSurfaceVariant" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="16dp"
+                        android:text="@string/title_source_code"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="?attr/colorOutlineVariant" />
+
+                <LinearLayout
+                    android:id="@+id/layout_oss_licenses"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center|start"
+                    android:orientation="horizontal"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:importantForAccessibility="no"
+                        app:srcCompat="@drawable/license_24px"
+                        app:tint="?attr/colorOnSurfaceVariant" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="16dp"
+                        android:text="@string/title_oss_license"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="?attr/colorOutlineVariant" />
+
+                <LinearLayout
+                    android:id="@+id/layout_feedback"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center|start"
+                    android:orientation="horizontal"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:importantForAccessibility="no"
+                        app:srcCompat="@drawable/ic_feedback_24dp"
+                        app:tint="?attr/colorOnSurfaceVariant" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="16dp"
+                        android:text="@string/title_pref_feedback"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="?attr/colorOutlineVariant" />
+
+                <LinearLayout
+                    android:id="@+id/layout_tg_channel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center|start"
+                    android:orientation="horizontal"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:importantForAccessibility="no"
+                        app:srcCompat="@drawable/ic_telegram_24dp"
+                        app:tint="?attr/colorOnSurfaceVariant" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="16dp"
+                        android:text="@string/title_tg_channel"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="?attr/colorOutlineVariant" />
+
+                <LinearLayout
+                    android:id="@+id/layout_privacy_policy"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center|start"
+                    android:orientation="horizontal"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:importantForAccessibility="no"
+                        app:srcCompat="@drawable/ic_privacy_24dp"
+                        app:tint="?attr/colorOnSurfaceVariant" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="16dp"
+                        android:text="@string/title_privacy_policy"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+                </LinearLayout>
+
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/layout_oss_licenses"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center|start"
-                android:orientation="horizontal"
-                android:padding="@dimen/padding_spacing_dp16">
+        </com.google.android.material.card.MaterialCardView>
 
-                <ImageView
-                    android:layout_width="@dimen/image_size_dp24"
-                    android:layout_height="@dimen/image_size_dp24"
-                    android:importantForAccessibility="no"
-                    app:srcCompat="@drawable/license_24px" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_spacing_dp16"
-                    android:text="@string/title_oss_license"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/layout_feedback"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center|start"
-                android:orientation="horizontal"
-                android:padding="@dimen/padding_spacing_dp16">
-
-                <ImageView
-                    android:layout_width="@dimen/image_size_dp24"
-                    android:layout_height="@dimen/image_size_dp24"
-                    android:importantForAccessibility="no"
-                    app:srcCompat="@drawable/ic_feedback_24dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_spacing_dp16"
-                    android:text="@string/title_pref_feedback"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/layout_tg_channel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center|start"
-                android:orientation="horizontal"
-                android:padding="@dimen/padding_spacing_dp16">
-
-                <ImageView
-                    android:layout_width="@dimen/image_size_dp24"
-                    android:layout_height="@dimen/image_size_dp24"
-                    android:importantForAccessibility="no"
-                    app:srcCompat="@drawable/ic_telegram_24dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_spacing_dp16"
-                    android:text="@string/title_tg_channel"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/layout_privacy_policy"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center|start"
-                android:orientation="horizontal"
-                android:padding="@dimen/padding_spacing_dp16">
-
-                <ImageView
-                    android:layout_width="@dimen/image_size_dp24"
-                    android:layout_height="@dimen/image_size_dp24"
-                    android:importantForAccessibility="no"
-                    app:srcCompat="@drawable/ic_privacy_24dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_spacing_dp16"
-                    android:text="@string/title_privacy_policy"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-            </LinearLayout>
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardBackgroundColor="?attr/colorSurfaceContainerLowest"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp"
+            app:strokeWidth="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:padding="@dimen/padding_spacing_dp16">
+                android:padding="20dp">
 
                 <TextView
                     android:id="@+id/tv_version"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/title_about"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                    android:textAppearance="@style/TextAppearance.Material3.LabelMedium"
+                    android:textColor="?attr/colorOnSurfaceVariant" />
 
                 <TextView
                     android:id="@+id/tv_app_id"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
                     android:text="@string/title_about"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                    android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                    android:textColor="?attr/colorOutline" />
             </LinearLayout>
 
-        </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
     </LinearLayout>
 
 </ScrollView>
-

V2rayNG/app/src/main/res/layout/activity_base.xml

@@ -5,33 +5,41 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
         android:layout_width="0dp"
-        android:layout_height="?attr/actionBarSize"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorSurface"
+        app:elevation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:titleTextAppearance="@style/TextAppearance.AppCompat.Title" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:titleTextAppearance="@style/TextAppearance.Material3.TitleLarge" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintTop_toBottomOf="@id/app_bar"
         android:indeterminate="true"
         android:visibility="gone"
-        app:indicatorColor="@color/color_fab_active" />
+        app:indicatorColor="?attr/colorPrimary"
+        app:trackColor="?attr/colorSurfaceVariant" />
 
     <FrameLayout
         android:id="@+id/content_container"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintTop_toBottomOf="@id/app_bar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
-
-    </FrameLayout>
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,7 +4,7 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/md_theme_surface">
+    android:background="?attr/colorSurface">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -15,8 +15,9 @@
             android:id="@+id/app_bar_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/md_theme_surface"
-            app:elevation="0dp">
+            android:background="?attr/colorSurface"
+            app:elevation="0dp"
+            app:liftOnScroll="false">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
@@ -24,7 +25,8 @@
                 android:layout_height="?attr/actionBarSize"
                 app:title="@string/app_name"
                 app:titleCentered="true"
-                app:titleTextColor="?attr/colorOnSurface" />
+                app:titleTextColor="?attr/colorOnSurface"
+                app:titleTextAppearance="@style/TextAppearance.Material3.TitleLarge" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -61,7 +63,7 @@
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-                        android:background="@color/divider_color_light" />
+                        android:background="?attr/colorOutlineVariant" />
 
                     <androidx.viewpager2.widget.ViewPager2
                         android:id="@+id/view_pager"
@@ -71,16 +73,18 @@
                         android:scrollbars="vertical"
                         android:layout_weight="1" />
 
+                    <!-- Bottom container: tab + action card -->
                     <LinearLayout
                         android:id="@+id/bottom_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:orientation="vertical"
+                        android:background="?attr/colorSurfaceContainer">
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="1dp"
-                            android:background="@color/divider_color_light" />
+                            android:background="?attr/colorOutlineVariant" />
 
                         <LinearLayout
                             android:id="@+id/tab_slot_bottom"
@@ -88,106 +92,130 @@
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
-                        <com.google.android.material.tabs.TabLayout
-                            android:id="@+id/tab_group"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            app:tabIndicatorFullWidth="true"
-                            app:tabMode="fixed"
-                            app:tabGravity="fill"
-                            app:tabMaxWidth="0dp"
-                            app:tabRippleColor="@android:color/transparent"
-                            app:tabTextAppearance="@style/TabLayoutTextStyle" />
+                            <com.google.android.material.tabs.TabLayout
+                                android:id="@+id/tab_group"
+                                android:layout_width="match_parent"
+                                android:layout_height="56dp"
+                                android:minHeight="56dp"
+                                android:background="?attr/colorSurface"
+                                app:tabIndicatorFullWidth="true"
+                                app:tabIndicatorHeight="3dp"
+                                app:tabMode="fixed"
+                                app:tabGravity="fill"
+                                app:tabMaxWidth="0dp"
+                                app:tabRippleColor="@android:color/transparent"
+                                app:tabIndicatorColor="?attr/colorPrimary"
+                                app:tabSelectedTextColor="?attr/colorPrimary"
+                                app:tabTextColor="?attr/colorOnSurfaceVariant"
+                                app:tabTextAppearance="@style/TabLayoutTextStyle" />
 
                         </LinearLayout>
 
-                        <LinearLayout
+                        <!-- Bottom action row -->
+                        <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:gravity="center"
-                            android:paddingTop="12dp"
-                            android:paddingBottom="8dp">
-
-                            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                                android:id="@+id/btn_summary_lite"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="16dp"
-                                android:clickable="true"
-                                android:focusable="true"
-                                android:src="@drawable/bolt_24"
-                                android:stateListAnimator="@null"
-                                app:tint="@color/colorWhite"
-                                app:backgroundTint="@color/color_fab_inactive"
-                                app:rippleColor="#33FFFFFF"
-                                app:fabSize="normal"
-                                app:maxImageSize="28dp"
-                                app:elevation="0dp"
-                                app:pressedTranslationZ="0dp"
-                                app:hoveredFocusedTranslationZ="0dp" />
-
-                            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                                android:id="@+id/fab"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:clickable="true"
-                                android:contentDescription="@string/tasker_start_service"
-                                android:focusable="true"
-                                android:nextFocusLeft="@+id/layout_test"
-                                android:src="@drawable/shield_24"
-                                android:stateListAnimator="@null"
-                                app:tint="@color/colorWhite"
-                                app:rippleColor="#33FFFFFF"
-                                app:fabSize="normal"
-                                app:maxImageSize="28dp"
-                                app:elevation="0dp"
-                                app:pressedTranslationZ="0dp"
-                                app:hoveredFocusedTranslationZ="0dp" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/layout_test"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:clickable="true"
-                            android:contentDescription="@string/connection_test_pending"
-                            android:focusable="true"
-                            android:nextFocusLeft="@+id/view_pager"
-                            android:nextFocusRight="@+id/fab"
-                            android:orientation="vertical"
-                            android:gravity="center"
-                            android:paddingTop="4dp"
-                            android:paddingBottom="12dp"
                             android:paddingStart="16dp"
-                            android:paddingEnd="16dp">
+                            android:paddingEnd="16dp"
+                            android:paddingTop="12dp"
+                            android:paddingBottom="12dp">
 
-                            <TextView
-                                android:id="@+id/tv_test_state"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:maxLines="2"
-                                android:minLines="1"
-                                android:text="@string/connection_test_pending"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                            <!-- Bolt icon button -->
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/btn_summary_lite"
+                                style="@style/Widget.ActionSquareButton"
+                                android:layout_width="52dp"
+                                android:layout_height="52dp"
+                                app:icon="@drawable/bolt_24"
+                                app:iconSize="22dp"
+                                app:backgroundTint="?attr/colorSecondaryContainer"
+                                app:iconTint="?attr/colorOnSecondaryContainer"
+                                app:rippleColor="?attr/colorOnSecondaryContainer"
+                                app:layout_constraintEnd_toStartOf="@+id/fab"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                android:layout_marginEnd="8dp" />
+
+                            <!-- Connect / Disconnect icon button -->
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/fab"
+                                style="@style/Widget.ActionSquareButton"
+                                android:layout_width="52dp"
+                                android:layout_height="52dp"
+                                android:contentDescription="@string/tasker_start_service"
+                                app:icon="@drawable/shield_24"
+                                app:iconSize="26dp"
+                                app:backgroundTint="?attr/colorPrimary"
+                                app:iconTint="?attr/colorOnPrimary"
+                                app:rippleColor="?attr/colorOnPrimary"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent" />
+
+                            <!-- Status pill: dot + text, tappable for ping -->
+                            <com.google.android.material.card.MaterialCardView
+                                android:id="@+id/layout_test"
+                                android:layout_width="0dp"
+                                android:layout_height="52dp"
+                                android:layout_marginEnd="8dp"
+                                android:clickable="true"
+                                android:focusable="true"
+                                android:contentDescription="@string/connection_test_pending"
+                                app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+                                app:cardCornerRadius="26dp"
+                                app:cardElevation="0dp"
+                                app:strokeWidth="0dp"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintEnd_toStartOf="@+id/btn_summary_lite"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent">
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:orientation="horizontal"
+                                    android:gravity="center_vertical"
+                                    android:paddingStart="16dp"
+                                    android:paddingEnd="12dp">
+
+                                    <View
+                                        android:id="@+id/status_dot"
+                                        android:layout_width="10dp"
+                                        android:layout_height="10dp"
+                                        android:background="@drawable/status_dot"
+                                        android:layout_marginEnd="10dp" />
+
+                                    <TextView
+                                        android:id="@+id/tv_test_state"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:maxLines="1"
+                                        android:ellipsize="end"
+                                        android:text="@string/connection_test_pending"
+                                        android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+                                        android:textColor="?attr/colorOnSurfaceVariant" />
+
+                                </LinearLayout>
+
+                            </com.google.android.material.card.MaterialCardView>
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                        </LinearLayout>
                     </LinearLayout>
                 </LinearLayout>
 
-
             </androidx.coordinatorlayout.widget.CoordinatorLayout>
         </RelativeLayout>
     </LinearLayout>
 
+    <!-- Navigation Drawer -->
     <LinearLayout
         android:id="@+id/drawer_content_layout"
-        android:layout_width="wrap_content"
+        android:layout_width="280dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="?android:attr/windowBackground"
+        android:background="?attr/colorSurfaceContainerLow"
         android:orientation="vertical">
 
         <com.google.android.material.navigation.NavigationView
@@ -195,6 +223,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
+            android:background="@android:color/transparent"
             app:headerLayout="@layout/nav_header" />
 
         <LinearLayout
@@ -203,61 +232,65 @@
             android:orientation="vertical"
             android:padding="16dp">
 
-            <TextView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/drawer_settings"
+                style="@style/Widget.Material3.Button.TextButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
                 android:drawablePadding="12dp"
-                android:gravity="center_vertical"
                 android:paddingTop="12dp"
                 android:paddingBottom="12dp"
                 android:text="@string/title_settings"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true" />
+                android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+                android:textColor="?attr/colorOnSurface"
+                app:iconGravity="start"
+                app:iconTint="?attr/colorOnSurfaceVariant" />
 
-            <TextView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/drawer_per_app"
+                style="@style/Widget.Material3.Button.TextButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
                 android:drawablePadding="12dp"
-                android:gravity="center_vertical"
                 android:paddingTop="12dp"
                 android:paddingBottom="12dp"
                 android:text="@string/per_app_proxy_settings"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true" />
+                android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+                android:textColor="?attr/colorOnSurface"
+                app:iconGravity="start"
+                app:iconTint="?attr/colorOnSurfaceVariant" />
 
-            <TextView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/drawer_check_update"
+                style="@style/Widget.Material3.Button.TextButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
                 android:drawablePadding="12dp"
-                android:gravity="center_vertical"
                 android:paddingTop="12dp"
                 android:paddingBottom="16dp"
                 android:text="@string/update_check_for_update"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true" />
+                android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+                android:textColor="?attr/colorOnSurface"
+                app:iconGravity="start"
+                app:iconTint="?attr/colorOnSurfaceVariant" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginBottom="12dp"
-                android:background="@color/divider_color_light" />
+                android:background="?attr/colorOutlineVariant" />
 
             <TextView
                 android:id="@+id/tv_forked"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/drawer_forked_text"
-                android:textColor="#9E9E9E"
-                android:textColorLink="#9E9E9E"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:textColorLink="?attr/colorPrimary"
+                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 android:linksClickable="true"
                 android:textIsSelectable="true" />
 
@@ -267,8 +300,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/drawer_developed_text"
-                android:textColor="#9E9E9E"
-                android:textColorLink="#9E9E9E"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:textColorLink="?attr/colorPrimary"
+                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 android:linksClickable="true"
                 android:textIsSelectable="true" />
         </LinearLayout>

V2rayNG/app/src/main/res/layout/item_recycler_main.xml

@@ -1,163 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_bg"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingStart="12dp"
+    android:paddingTop="6dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="6dp"
     android:gravity="center_vertical">
 
-    <LinearLayout
-        android:id="@+id/info_container"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center"
-        android:nextFocusRight="@+id/layout_share"
-        android:orientation="horizontal"
-        android:paddingStart="@dimen/padding_spacing_dp4"
-        android:paddingTop="@dimen/padding_spacing_dp8"
-        android:paddingEnd="@dimen/padding_spacing_dp4"
-        android:paddingBottom="@dimen/padding_spacing_dp8">
-
-        <LinearLayout
-            android:id="@+id/layout_indicator"
-            android:layout_width="@dimen/padding_spacing_dp4"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:orientation="vertical" />
+        app:cardBackgroundColor="@android:color/transparent"
+        app:cardCornerRadius="14dp"
+        app:cardElevation="0dp"
+        app:strokeWidth="0dp">
 
         <LinearLayout
+            android:id="@+id/info_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_gravity="center"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:nextFocusRight="@+id/layout_share"
+            android:orientation="horizontal"
+            android:paddingStart="0dp"
+            android:paddingTop="13dp"
+            android:paddingEnd="4dp"
+            android:paddingBottom="13dp">
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_weight="1"
+                android:orientation="vertical">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingStart="@dimen/padding_spacing_dp8">
-
-                        <TextView
-                            android:id="@+id/tv_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:maxLines="2"
-                            android:minLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
                         <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:paddingTop="@dimen/padding_spacing_dp8">
-
-                            <androidx.constraintlayout.widget.ConstraintLayout
-                                android:id="@+id/layout_subscription"
-                                android:layout_width="@dimen/image_size_dp24"
-                                android:layout_height="@dimen/image_size_dp24"
-                                android:layout_gravity="bottom"
-                                android:layout_marginEnd="@dimen/padding_spacing_dp4"
-                                android:background="@drawable/ic_circle">
-
-                                <TextView
-                                    android:id="@+id/tv_subscription"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                                    android:textSize="11sp"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintEnd_toEndOf="parent"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent" />
-                            </androidx.constraintlayout.widget.ConstraintLayout>
+                            android:orientation="vertical"
+                            android:paddingStart="12dp">
 
                             <TextView
-                                android:id="@+id/tv_statistics"
+                                android:id="@+id/tv_name"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:lines="1"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                                android:maxLines="2"
+                                android:minLines="1"
+                                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                                android:textColor="?attr/colorOnSurface" />
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal"
+                                android:paddingTop="5dp">
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:id="@+id/layout_subscription"
+                                    android:layout_width="18dp"
+                                    android:layout_height="18dp"
+                                    android:layout_gravity="bottom"
+                                    android:layout_marginEnd="4dp"
+                                    android:background="@drawable/ic_circle">
+
+                                    <TextView
+                                        android:id="@+id/tv_subscription"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                                        android:textSize="10sp"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <TextView
+                                    android:id="@+id/tv_statistics"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:lines="1"
+                                    android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                                    android:textColor="?attr/colorOnSurfaceVariant" />
+
+                                <TextView
+                                    android:id="@+id/tv_test_result"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="6dp"
+                                    android:lines="1"
+                                    android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                                    android:textColor="@color/colorPing"
+                                    android:textSize="11sp" />
+
+                            </LinearLayout>
 
                         </LinearLayout>
 
                     </LinearLayout>
 
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:gravity="end">
-
-                    <ImageView
-                        android:id="@+id/iv_favorite"
+                    <LinearLayout
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:padding="@dimen/padding_spacing_dp8"
-                        android:src="@drawable/kid_star_outline_24" />
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                    <ImageView
-                        android:id="@+id/iv_copy"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:padding="@dimen/padding_spacing_dp8"
-                        android:visibility="gone"
-                        app:srcCompat="@drawable/ic_copy"
-                        app:tint="?attr/colorAccent" />
+                        <ImageView
+                            android:id="@+id/iv_favorite"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:padding="6dp"
+                            android:src="@drawable/kid_star_outline_24" />
+
+                        <ImageView
+                            android:id="@+id/iv_copy"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:padding="6dp"
+                            android:visibility="gone"
+                            app:srcCompat="@drawable/ic_copy"
+                            app:tint="?attr/colorPrimary" />
+
+                    </LinearLayout>
 
                 </LinearLayout>
 
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingStart="@dimen/padding_spacing_dp8"
-                android:paddingTop="@dimen/padding_spacing_dp8"
-                android:paddingEnd="@dimen/padding_spacing_dp8">
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
-
-                <TextView
-                    android:id="@+id/tv_test_result"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:lines="1"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="@color/colorPing"
-                    android:textSize="11sp"
-                    tools:text="214ms" />
-
-            </LinearLayout>
-
         </LinearLayout>
 
-    </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>

V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml

@@ -4,110 +4,127 @@
     android:id="@+id/item_bg"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
     android:gravity="center_vertical">
 
-    <LinearLayout
-        android:id="@+id/info_container"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center"
-        android:nextFocusRight="@+id/layout_edit"
-        android:orientation="horizontal"
-        android:padding="@dimen/padding_spacing_dp8">
+        app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp"
+        app:strokeWidth="0dp">
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:id="@+id/info_container"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_spacing_dp8">
+            android:layout_gravity="center"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center"
+            android:nextFocusRight="@+id/layout_edit"
+            android:orientation="horizontal"
+            android:padding="8dp">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:padding="8dp">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/remarks"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+
+                    <ImageView
+                        android:id="@+id/img_locked"
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:layout_gravity="center"
+                        android:layout_marginStart="16dp"
+                        android:importantForAccessibility="no"
+                        app:srcCompat="@drawable/ic_lock_24dp"
+                        app:tint="?attr/colorOnSurfaceVariant" />
+
+                </LinearLayout>
 
                 <TextView
-                    android:id="@+id/remarks"
+                    android:id="@+id/domainIp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+                    android:layout_marginTop="6dp"
+                    android:lines="1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                    android:textColor="?attr/colorOnSurfaceVariant" />
 
-                <ImageView
-                    android:id="@+id/img_locked"
-                    android:layout_width="@dimen/padding_spacing_dp16"
-                    android:layout_height="@dimen/padding_spacing_dp16"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="@dimen/padding_spacing_dp16"
-                    android:importantForAccessibility="no"
-                    app:srcCompat="@drawable/ic_lock_24dp" />
+                <TextView
+                    android:id="@+id/outboundTag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:lines="1"
+                    android:textAppearance="@style/TextAppearance.Material3.LabelMedium"
+                    android:textColor="?attr/colorPrimary" />
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/domainIp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/padding_spacing_dp8"
-                android:lines="1"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-
-            <TextView
-                android:id="@+id/outboundTag"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/padding_spacing_dp8"
-                android:lines="1"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_spacing_dp8">
-
             <LinearLayout
-                android:id="@+id/layout_edit"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:contentDescription="@string/menu_item_edit_config"
-                android:focusable="true"
                 android:gravity="center"
-                android:nextFocusLeft="@+id/info_container"
                 android:orientation="vertical"
-                android:padding="@dimen/padding_spacing_dp8">
+                android:padding="8dp">
 
-                <ImageView
-                    android:layout_width="@dimen/image_size_dp24"
-                    android:layout_height="@dimen/image_size_dp24"
-                    android:importantForAccessibility="no"
-                    app:srcCompat="@drawable/ic_edit_24dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/padding_spacing_dp8"
-                android:orientation="horizontal">
-
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/chk_enable"
+                <LinearLayout
+                    android:id="@+id/layout_edit"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:theme="@style/BrandedSwitch" />
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:contentDescription="@string/menu_item_edit_config"
+                    android:focusable="true"
+                    android:gravity="center"
+                    android:nextFocusLeft="@+id/info_container"
+                    android:orientation="vertical"
+                    android:padding="8dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:importantForAccessibility="no"
+                        app:srcCompat="@drawable/ic_edit_24dp"
+                        app:tint="?attr/colorOnSurfaceVariant" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:orientation="horizontal">
+
+                    <androidx.appcompat.widget.SwitchCompat
+                        android:id="@+id/chk_enable"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:theme="@style/BrandedSwitch" />
+                </LinearLayout>
             </LinearLayout>
+
         </LinearLayout>
 
-    </LinearLayout>
-
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>

V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml

@@ -4,195 +4,214 @@
     android:id="@+id/item_bg"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
     android:gravity="center_vertical">
 
-    <LinearLayout
-        android:id="@+id/info_container"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center"
-        android:nextFocusRight="@+id/layout_share"
-        android:orientation="horizontal"
-        android:padding="@dimen/padding_spacing_dp8">
+        app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp"
+        app:strokeWidth="0dp">
 
         <LinearLayout
+            android:id="@+id/info_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_gravity="center"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center"
+            android:nextFocusRight="@+id/layout_share"
+            android:orientation="horizontal"
+            android:padding="8dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:paddingStart="@dimen/padding_spacing_dp8">
-
-                    <TextView
-                        android:id="@+id/tv_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="2"
-                        android:minLines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
                     android:orientation="horizontal">
 
                     <LinearLayout
-                        android:id="@+id/layout_share"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:contentDescription="@string/title_configuration_share"
-                        android:focusable="true"
-                        android:gravity="center"
-                        android:nextFocusLeft="@+id/info_container"
+                        android:layout_weight="1"
                         android:orientation="vertical"
-                        android:padding="@dimen/padding_spacing_dp8">
+                        android:paddingStart="8dp">
 
-                        <ImageView
+                        <TextView
+                            android:id="@+id/tv_name"
                             android:layout_width="wrap_content"
-                            android:layout_height="@dimen/image_size_dp24"
-                            android:importantForAccessibility="no"
-                            app:srcCompat="@drawable/ic_share_24dp" />
+                            android:layout_height="wrap_content"
+                            android:maxLines="2"
+                            android:minLines="1"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
 
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/layout_edit"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:contentDescription="@string/menu_item_edit_config"
-                        android:focusable="true"
                         android:gravity="center"
-                        android:orientation="vertical"
-                        android:padding="@dimen/padding_spacing_dp8">
+                        android:orientation="horizontal">
 
-                        <ImageView
-                            android:layout_width="@dimen/image_size_dp24"
-                            android:layout_height="@dimen/image_size_dp24"
-                            android:importantForAccessibility="no"
-                            app:srcCompat="@drawable/ic_edit_24dp" />
+                        <LinearLayout
+                            android:id="@+id/layout_share"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/title_configuration_share"
+                            android:focusable="true"
+                            android:gravity="center"
+                            android:nextFocusLeft="@+id/info_container"
+                            android:orientation="vertical"
+                            android:padding="8dp">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="24dp"
+                                android:importantForAccessibility="no"
+                                app:srcCompat="@drawable/ic_share_24dp"
+                                app:tint="?attr/colorOnSurfaceVariant" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/layout_edit"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/menu_item_edit_config"
+                            android:focusable="true"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:padding="8dp">
+
+                            <ImageView
+                                android:layout_width="24dp"
+                                android:layout_height="24dp"
+                                android:importantForAccessibility="no"
+                                app:srcCompat="@drawable/ic_edit_24dp"
+                                app:tint="?attr/colorOnSurfaceVariant" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/layout_remove"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/menu_item_del_config"
+                            android:focusable="true"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:padding="8dp">
+
+                            <ImageView
+                                android:layout_width="24dp"
+                                android:layout_height="24dp"
+                                android:importantForAccessibility="no"
+                                app:srcCompat="@drawable/ic_delete_24dp"
+                                app:tint="?attr/colorError" />
+
+                        </LinearLayout>
 
                     </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/layout_remove"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:contentDescription="@string/menu_item_del_config"
-                        android:focusable="true"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:padding="@dimen/padding_spacing_dp8">
-
-                        <ImageView
-                            android:layout_width="@dimen/image_size_dp24"
-                            android:layout_height="@dimen/image_size_dp24"
-                            android:importantForAccessibility="no"
-                            app:srcCompat="@drawable/ic_delete_24dp" />
-
-                    </LinearLayout>
-
-
                 </LinearLayout>
 
-            </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/layout_url"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp">
 
-            <LinearLayout
-                android:id="@+id/layout_url"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingStart="@dimen/padding_spacing_dp8"
-                android:paddingEnd="@dimen/padding_spacing_dp8">
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="horizontal"
+                        android:paddingTop="6dp">
+
+                        <TextView
+                            android:id="@+id/tv_url"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:lines="2"
+                            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                            android:textColor="?attr/colorOnSurfaceVariant" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <androidx.appcompat.widget.SwitchCompat
+                            android:id="@+id/chk_enable"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:theme="@style/BrandedSwitch" />
+                    </LinearLayout>
+
+                </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/layout_last_updated"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:orientation="horizontal"
-                    android:paddingTop="@dimen/padding_spacing_dp8">
+                    android:layout_marginTop="6dp"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:paddingBottom="4dp">
 
                     <TextView
-                        android:id="@+id/tv_url"
+                        android:id="@+id/tv_last_updated"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                        android:textColor="?attr/colorOnSurfaceVariant" />
+
+                    <ProgressBar
+                        android:id="@+id/progress_bar"
+                        style="?android:attr/progressBarStyleSmall"
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:layout_marginStart="8dp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/tv_update_status"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:lines="2"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                        android:layout_marginStart="8dp"
+                        android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                        android:visibility="gone" />
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/padding_spacing_dp8"
-                    android:orientation="horizontal">
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/chk_enable"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:theme="@style/BrandedSwitch" />
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/layout_last_updated"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginTop="@dimen/padding_spacing_dp8"
-                android:paddingStart="@dimen/padding_spacing_dp8"
-                android:paddingEnd="@dimen/padding_spacing_dp8">
-
-                <TextView
-                    android:id="@+id/tv_last_updated"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
-
-                <ProgressBar
-                    android:id="@+id/progress_bar"
-                    style="?android:attr/progressBarStyleSmall"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:layout_marginStart="@dimen/padding_spacing_dp8"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/tv_update_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/padding_spacing_dp8"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:visibility="gone"/>
-
             </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
-</LinearLayout>
+</LinearLayout>

V2rayNG/app/src/main/res/layout/preference_with_help_link.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Widget.AppCompat.Button.Borderless"
+    style="@style/Widget.Material3.Button.TextButton"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:onClick="onModeHelpClicked"
     android:text="@string/title_mode_help"
     android:textAlignment="textStart"
     android:textStyle="italic"
     android:textColor="?attr/colorPrimary"
+    app:iconTint="?attr/colorPrimary"
     tools:ignore="UsingOnClickInXml" />

V2rayNG/app/src/main/res/values-night/colors.xml

@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="color_fab_active">#C0C0C0</color>
-    <color name="color_fab_inactive">#646464</color>
-    <color name="divider_color_light">#424242</color>
+    <color name="colorPing">#90CAF9</color>
+    <color name="colorPingGood">#86D993</color>
+    <color name="colorPingMedium">#F1C76A</color>
+    <color name="status_connected">#66BB6A</color>
+    <color name="colorPingRed">#FFB4AB</color>
+    <color name="color_fab_active">@color/md_theme_primary</color>
+    <color name="color_fab_inactive">@color/md_theme_secondaryContainer</color>
+    <color name="divider_color_light">@color/md_theme_outlineVariant</color>
+    <color name="server_list_divider">#2649454F</color>
 
-    <color name="md_theme_primary">#C0C0C0</color>
-    <color name="md_theme_onPrimary">#303030</color>
-    <color name="md_theme_primaryContainer">#474747</color>
-    <color name="md_theme_onPrimaryContainer">#E0E0E0</color>
+    <!-- M3 Dark scheme — Purple/Violet tonal palette -->
+    <color name="md_theme_primary">#D0BCFF</color>
+    <color name="md_theme_onPrimary">#381E72</color>
+    <color name="md_theme_primaryContainer">#4F378B</color>
+    <color name="md_theme_onPrimaryContainer">#EADDFF</color>
 
-    <color name="md_theme_secondary">#90CAF9</color>
-    <color name="md_theme_onSecondary">#FFFFFF</color>
-    <color name="md_theme_secondaryContainer">#6F3800</color>
-    <color name="md_theme_onSecondaryContainer">#FFE8D6</color>
+    <color name="md_theme_secondary">#CCC2DC</color>
+    <color name="md_theme_onSecondary">#332D41</color>
+    <color name="md_theme_secondaryContainer">#4A4458</color>
+    <color name="md_theme_onSecondaryContainer">#E8DEF8</color>
 
-    <color name="md_theme_tertiary">#64B5F6</color>
-    <color name="md_theme_onTertiary">#00382E</color>
-    <color name="md_theme_tertiaryContainer">#005143</color>
-    <color name="md_theme_onTertiaryContainer">#BBDEFB</color>
+    <color name="md_theme_tertiary">#EFB8C8</color>
+    <color name="md_theme_onTertiary">#492532</color>
+    <color name="md_theme_tertiaryContainer">#633B48</color>
+    <color name="md_theme_onTertiaryContainer">#FFD8E4</color>
 
     <!-- Error colors -->
-    <color name="md_theme_error">#FFB4AB</color>
-    <color name="md_theme_errorContainer">#93000A</color>
-    <color name="md_theme_onError">#690005</color>
-    <color name="md_theme_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_error">#F2B8B5</color>
+    <color name="md_theme_errorContainer">#8C1D18</color>
+    <color name="md_theme_onError">#601410</color>
+    <color name="md_theme_onErrorContainer">#F9DEDC</color>
 
     <!-- Background colors -->
     <color name="md_theme_background">#1C1B1F</color>
@@ -35,15 +42,22 @@
     <color name="md_theme_surfaceVariant">#49454F</color>
     <color name="md_theme_onSurfaceVariant">#CAC4D0</color>
     <color name="md_theme_inverseSurface">#E6E1E5</color>
-    <color name="md_theme_inverseOnSurface">#1C1B1F</color>
+    <color name="md_theme_inverseOnSurface">#313033</color>
+
+    <!-- Surface containers — M3 dark elevation tones -->
+    <color name="md_theme_surfaceContainerLowest">#0F0D13</color>
+    <color name="md_theme_surfaceContainerLow">#1D1B20</color>
+    <color name="md_theme_surfaceContainer">#211F26</color>
+    <color name="md_theme_surfaceContainerHigh">#2B2930</color>
+    <color name="md_theme_surfaceContainerHighest">#36343B</color>
 
     <!-- Outline colors -->
     <color name="md_theme_outline">#938F99</color>
     <color name="md_theme_outlineVariant">#49454F</color>
 
     <!-- Other colors -->
-    <color name="md_theme_inversePrimary">#000000</color>
+    <color name="md_theme_inversePrimary">#6750A4</color>
     <color name="md_theme_shadow">#000000</color>
-    <color name="md_theme_surfaceTint">#C0C0C0</color>
+    <color name="md_theme_surfaceTint">#D0BCFF</color>
     <color name="md_theme_scrim">#000000</color>
 </resources>

V2rayNG/app/src/main/res/values-night/themes.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- Night theme: inherit the shared AppThemeBase and only override night-specific items -->
+    <!-- Night theme: inherit shared base, only override night-specific items -->
     <style name="AppThemeDayNight" parent="AppThemeBase">
-        <!-- Night mode specific overrides -->
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
     </style>
 
-</resources>
+</resources>

V2rayNG/app/src/main/res/values-ru/strings.xml

@@ -159,6 +159,11 @@
     <string name="title_pref_auto_sort_after_test">Автосортировка профилей</string>
     <string name="summary_pref_auto_sort_after_test">Автоматическая сортировка профилей после проверки (результаты проверки могут быть неточными)</string>
 
+    <string name="title_pref_show_copy_button">Показывать кнопку копирования</string>
+    <string name="summary_pref_show_copy_button">Показывать кнопку для копирования конфигурации сервера в буфер обмена</string>
+    <string name="title_pref_show_server_ip">Показывать IP / хост сервера</string>
+    <string name="summary_pref_show_server_ip">Отображать IP-адрес или хост сервера под названием</string>
+
     <string name="title_mux_settings">Настройки мультиплексирования</string>
     <string name="title_pref_mux_enabled">Использовать мультиплексирование</string>
     <string name="summary_pref_mux_enabled">Быстрее, но это может привести к нестабильному соединению.\nНиже можно настроить обработку TCP, UDP и QUIC.</string>
@@ -237,8 +242,6 @@
     <string name="title_pref_group_all_display">Общая вкладка групп</string>
     <string name="summary_pref_group_all_display">Показывать дополнительную вкладку со всеми профилями групп</string>
 
-    <string name="title_pref_show_copy_button">Кнопка копирования</string>
-    <string name="summary_pref_show_copy_button">Показывать кнопку копирования конфигурации сервера в буфер обмена</string>
     <!-- AboutActivity -->
     <string name="title_pref_feedback">Обратная связь</string>
     <string name="summary_pref_feedback">Предложить улучшение или сообщить об ошибке на GitHub</string>

V2rayNG/app/src/main/res/values/attrs.xml

@@ -1,7 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="TabLayoutTextStyle" parent="TextAppearance.Design.Tab">
-        <item name="textAllCaps">false</item>
-    </style>
-</resources>
+</resources>

V2rayNG/app/src/main/res/values/colors.xml

@@ -1,54 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPing">#1565C0</color>
-    <color name="colorPingRed">#FF0099</color>
-    <color name="colorConfigType">#1976D2</color>
+    <color name="colorPing">#006494</color>
+    <color name="colorPingGood">#2E7D32</color>
+    <color name="colorPingMedium">#9A6700</color>
+    <color name="status_connected">#4CAF50</color>
+    <color name="colorPingRed">#BA1A1A</color>
+    <color name="colorConfigType">#1565C0</color>
     <color name="colorWhite">#FFFFFF</color>
-    <color name="color_fab_active">#000000</color>
-    <color name="color_fab_inactive">#9C9C9C</color>
-    <color name="divider_color_light">#E0E0E0</color>
+    <color name="color_fab_active">@color/md_theme_primary</color>
+    <color name="color_fab_inactive">@color/md_theme_secondaryContainer</color>
+    <color name="divider_color_light">@color/md_theme_outlineVariant</color>
+    <color name="server_list_divider">#22CAC4D0</color>
     <color name="colorIndicator">@color/md_theme_primary</color>
 
-    <color name="md_theme_primary">#000000</color>
+    <!-- M3 Light scheme — Purple/Violet tonal palette -->
+    <color name="md_theme_primary">#6750A4</color>
     <color name="md_theme_onPrimary">#FFFFFF</color>
-    <color name="md_theme_primaryContainer">#E0E0E0</color>
-    <color name="md_theme_onPrimaryContainer">#000000</color>
+    <color name="md_theme_primaryContainer">#EADDFF</color>
+    <color name="md_theme_onPrimaryContainer">#21005D</color>
 
-    <color name="md_theme_secondary">#1976D2</color>
+    <color name="md_theme_secondary">#625B71</color>
     <color name="md_theme_onSecondary">#FFFFFF</color>
-    <color name="md_theme_secondaryContainer">#FFE8D6</color>
-    <color name="md_theme_onSecondaryContainer">#2B1700</color>
+    <color name="md_theme_secondaryContainer">#E8DEF8</color>
+    <color name="md_theme_onSecondaryContainer">#1D192B</color>
 
-    <color name="md_theme_tertiary">#1565C0</color>
+    <color name="md_theme_tertiary">#7D5260</color>
     <color name="md_theme_onTertiary">#FFFFFF</color>
-    <color name="md_theme_tertiaryContainer">#BBDEFB</color>
-    <color name="md_theme_onTertiaryContainer">#00201A</color>
+    <color name="md_theme_tertiaryContainer">#FFD8E4</color>
+    <color name="md_theme_onTertiaryContainer">#31111D</color>
 
     <!-- Error colors -->
-    <color name="md_theme_error">#BA1A1A</color>
-    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_error">#B3261E</color>
+    <color name="md_theme_errorContainer">#F9DEDC</color>
     <color name="md_theme_onError">#FFFFFF</color>
-    <color name="md_theme_onErrorContainer">#410002</color>
+    <color name="md_theme_onErrorContainer">#410E0B</color>
 
     <!-- Background colors -->
-    <color name="md_theme_background">#FFFFFF</color>
+    <color name="md_theme_background">#FFFBFE</color>
     <color name="md_theme_onBackground">#1C1B1F</color>
 
-    <!-- Surface colors -->
-    <color name="md_theme_surface">#FFFFFF</color>
+    <!-- Surface colors — M3 tonal surface hierarchy -->
+    <color name="md_theme_surface">#FFFBFE</color>
     <color name="md_theme_onSurface">#1C1B1F</color>
     <color name="md_theme_surfaceVariant">#E7E0EC</color>
     <color name="md_theme_onSurfaceVariant">#49454F</color>
     <color name="md_theme_inverseSurface">#313033</color>
     <color name="md_theme_inverseOnSurface">#F4EFF4</color>
 
+    <!-- Surface containers — M3 elevation tones -->
+    <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow">#F7F2FA</color>
+    <color name="md_theme_surfaceContainer">#F3EDF7</color>
+    <color name="md_theme_surfaceContainerHigh">#ECE6F0</color>
+    <color name="md_theme_surfaceContainerHighest">#E6E0E9</color>
+
     <!-- Outline colors -->
     <color name="md_theme_outline">#79747E</color>
     <color name="md_theme_outlineVariant">#CAC4D0</color>
 
     <!-- Other colors -->
-    <color name="md_theme_inversePrimary">#C0C0C0</color>
+    <color name="md_theme_inversePrimary">#D0BCFF</color>
     <color name="md_theme_shadow">#000000</color>
-    <color name="md_theme_surfaceTint">#000000</color>
+    <color name="md_theme_surfaceTint">#6750A4</color>
     <color name="md_theme_scrim">#000000</color>
 </resources>

V2rayNG/app/src/main/res/values/strings.xml

@@ -163,6 +163,8 @@
 
     <string name="title_pref_show_copy_button">Show copy button</string>
     <string name="summary_pref_show_copy_button">Show button to copy server configuration to clipboard</string>
+    <string name="title_pref_show_server_ip">Show server IP / host</string>
+    <string name="summary_pref_show_server_ip">Display the server IP address or host under the server name</string>
 
     <string name="title_mux_settings">Mux Settings</string>
     <string name="title_pref_mux_enabled">Enable Mux</string>

V2rayNG/app/src/main/res/values/themes.xml

@@ -1,58 +1,65 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- Common base theme: put all shared items here so day/night can reuse -->
+    <!-- Common base theme -->
     <style name="AppThemeBase" parent="Theme.Material3.DayNight">
-        <!-- Primary colors - main tone: black -->
+        <!-- Primary -->
         <item name="colorPrimary">@color/md_theme_primary</item>
         <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
 
+        <!-- Secondary -->
         <item name="colorSecondary">@color/md_theme_secondary</item>
         <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
         <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
         <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
 
+        <!-- Tertiary -->
         <item name="colorTertiary">@color/md_theme_tertiary</item>
         <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
         <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
         <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
 
-        <!-- Error colors -->
+        <!-- Error -->
         <item name="colorError">@color/md_theme_error</item>
         <item name="colorOnError">@color/md_theme_onError</item>
         <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
 
-        <!-- Surface colors -->
+        <!-- Surface -->
         <item name="colorSurface">@color/md_theme_surface</item>
         <item name="colorOnSurface">@color/md_theme_onSurface</item>
         <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
         <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
         <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
-        <item name="colorSurfaceContainer">@color/md_theme_surface</item>
-        <item name="colorSurfaceContainerHigh">@color/md_theme_surface</item>
-        <item name="colorSurfaceContainerHighest">@color/md_theme_surface</item>
-        <item name="colorSurfaceContainerLow">@color/md_theme_surface</item>
-        <item name="colorSurfaceContainerLowest">@color/md_theme_surface</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
 
-        <!-- Background colors -->
+        <!-- Background -->
         <item name="android:colorBackground">@color/md_theme_background</item>
         <item name="colorOnBackground">@color/md_theme_onBackground</item>
 
-        <!-- Outline colors -->
+        <!-- Outline -->
         <item name="colorOutline">@color/md_theme_outline</item>
         <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
 
-        <!-- Other colors -->
+        <!-- Misc -->
         <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
 
-        <!-- Status bar and navigation bar - system bars -->
+        <!-- System bars — transparent so edge-to-edge works -->
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@color/md_theme_surface</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
 
-        <!-- Typography: use Roboto (Google's Material font) everywhere -->
+        <!-- Shape — M3 uses larger corner radii -->
+        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.App.SmallComponent</item>
+        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent</item>
+        <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.App.LargeComponent</item>
+
+        <!-- Typography: Roboto -->
         <item name="android:fontFamily">sans-serif</item>
         <item name="fontFamily">sans-serif</item>
         <item name="android:editTextStyle">@style/RobotoEditTextStyle</item>
@@ -60,7 +67,23 @@
         <item name="android:dialogTheme">@style/RobotoAlertDialogTheme</item>
     </style>
 
-    <style name="RobotoEditTextStyle" parent="Widget.AppCompat.EditText">
+    <!-- M3 Shape tokens -->
+    <style name="ShapeAppearance.App.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">8dp</item>
+    </style>
+
+    <style name="ShapeAppearance.App.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">12dp</item>
+    </style>
+
+    <style name="ShapeAppearance.App.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">16dp</item>
+    </style>
+
+    <style name="RobotoEditTextStyle" parent="Widget.Material3.TextInputEditText.OutlinedBox">
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">16sp</item>
     </style>
@@ -68,16 +91,15 @@
     <style name="RobotoAlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="android:fontFamily">sans-serif</item>
         <item name="fontFamily">sans-serif</item>
+        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent</item>
     </style>
 
-    <!-- Day/Night theme: inherit common values and set light-mode-specific items -->
+    <!-- Light -->
     <style name="AppThemeDayNight" parent="AppThemeBase">
-        <!-- day/night-specific overrides (light/default) -->
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
     </style>
 
-    <!-- Theme without ActionBar -->
     <style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -89,8 +111,40 @@
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
+    <!-- Switch uses primary color -->
     <style name="BrandedSwitch" parent="AppThemeDayNight">
-        <item name="colorPrimary">@color/color_fab_active</item>
+        <item name="colorPrimary">@color/md_theme_primary</item>
+    </style>
+
+    <!-- Rounded-square FAB shape overlay (16dp corners) -->
+    <style name="ShapeAppearance.App.RoundedSquare" parent="ShapeAppearance.Material3.SmallComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">16dp</item>
+    </style>
+
+    <!-- Square icon button: no insets, no minHeight, no text -->
+    <style name="Widget.ActionSquareButton" parent="Widget.Material3.Button">
+        <item name="android:minWidth">0dp</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:insetTop">0dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:insetLeft">0dp</item>
+        <item name="android:insetRight">0dp</item>
+        <item name="android:paddingStart">0dp</item>
+        <item name="android:paddingEnd">0dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="iconGravity">textStart</item>
+        <item name="iconPadding">0dp</item>
+        <item name="android:text"></item>
+        <item name="shapeAppearance">@style/ShapeAppearance.App.RoundedSquare</item>
+        <item name="elevation">0dp</item>
+        <item name="android:stateListAnimator">@null</item>
+    </style>
+
+    <!-- Tab label -->
+    <style name="TabLayoutTextStyle" parent="TextAppearance.Material3.LabelLarge">
+        <item name="android:textSize">14sp</item>
     </style>
 
 </resources>

V2rayNG/app/src/main/res/xml/pref_settings.xml

@@ -34,6 +34,12 @@
             android:summary="@string/summary_pref_show_copy_button"
             android:title="@string/title_pref_show_copy_button" />
 
+        <CheckBoxPreference
+            android:key="pref_show_server_ip"
+            android:defaultValue="false"
+            android:summary="@string/summary_pref_show_server_ip"
+            android:title="@string/title_pref_show_server_ip" />
+
         <ListPreference
             android:defaultValue="auto"
             android:entries="@array/language_select"
@@ -310,4 +316,4 @@
 
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>