minor ui improvements in wireguard screens

celzero · Jul 27, 2024 · d69d220 · d69d220
1 parent ed0f44e
commit d69d220
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/app/src/full/java/com/celzero/bravedns/adapter/WgConfigAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/WgConfigAdapter.kt
@@ -128,21 +128,21 @@ class WgConfigAdapter(private val context: Context) :
  if (config.isLockdown) {
  b.protocolInfoChipGroup.visibility = View.GONE
  b.interfaceActiveLayout.visibility = View.GONE
- b.interfaceConfigStatus.text =
+ b.interfaceStatus.text =
  context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase)
  val id = ProxyManager.ID_WG_BASE + config.id
  val appsCount = ProxyManager.getAppCountForProxy(id)
  updateUi(config, appsCount)
  } else {
- b.interfaceStatus.visibility = View.GONE
+ b.interfaceConfigStatus.visibility = View.GONE
  b.interfaceAppsCount.visibility = View.GONE
  b.interfaceActiveLayout.visibility = View.GONE
  b.interfaceDetailCard.strokeColor = UIUtils.fetchColor(context, R.attr.background)
  b.interfaceDetailCard.strokeWidth = 0
  b.interfaceSwitch.isChecked = false
  b.protocolInfoChipGroup.visibility = View.GONE
- b.interfaceConfigStatus.visibility = View.VISIBLE
- b.interfaceConfigStatus.text =
+ b.interfaceStatus.visibility = View.VISIBLE
+ b.interfaceStatus.text =
  context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase)
  }
  }
@@ -353,10 +353,10 @@ class WgConfigAdapter(private val context: Context) :
  b.interfaceDetailCard.strokeColor = UIUtils.fetchColor(context, R.attr.background)
  b.interfaceDetailCard.strokeWidth = 0
  b.interfaceSwitch.isChecked = false
- b.interfaceStatus.visibility = View.GONE
+ b.interfaceConfigStatus.visibility = View.GONE
  b.interfaceAppsCount.visibility = View.GONE
- b.interfaceConfigStatus.visibility = View.VISIBLE
- b.interfaceConfigStatus.text =
+ b.interfaceStatus.visibility = View.VISIBLE
+ b.interfaceStatus.text =
  context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase)
  }
  }

diff --git a/app/src/full/res/layout/activity_tunnel_settings.xml b/app/src/full/res/layout/activity_tunnel_settings.xml
@@ -579,7 +579,7 @@
  </RelativeLayout>
 
 
- <androidx.appcompat.widget.AppCompatButton
+ <androidx.appcompat.widget.AppCompatTextView
  android:id="@+id/settings_activity_ping_ips_btn"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
@@ -588,7 +588,10 @@
  android:layout_gravity="end"
  android:layout_marginEnd="10dp"
  android:layout_marginBottom="15dp"
- android:padding="5dp"
+ android:paddingTop="7dp"
+ android:paddingBottom="7dp"
+ android:paddingStart="15dp"
+ android:paddingEnd="15dp"
  android:textColor="?attr/primaryTextColor"
  />
 

diff --git a/app/src/main/res/layout/list_item_wg_peers.xml b/app/src/main/res/layout/list_item_wg_peers.xml
@@ -26,7 +26,7 @@
  android:layout_height="wrap_content"
  android:text="@string/lbl_peer"
  android:textAppearance="?attr/textAppearanceHeadline6"
- android:textColor="?attr/secondaryTextColor"
+ android:textColor="?attr/primaryTextColor"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toTopOf="parent" />