diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-04-03 22:27:49 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-04-04 23:08:57 +0200 |
| commit | a3c8b2c5cfe8bc65be203f24934c9938f4184c48 (patch) | |
| tree | 289ac2a49c434ba38ebb280ae55437b0b541809f /ui/src/main | |
| parent | e3ad6021092214380ddba6cc4f8ee4477c569de9 (diff) | |
WIP: rename dhcp_addresses to dynamic_addressesold/dhcp4
Diffstat (limited to 'ui/src/main')
| -rw-r--r-- | ui/src/main/res/layout/tunnel_detail_fragment.xml | 20 | ||||
| -rw-r--r-- | ui/src/main/res/values/strings.xml | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml index c371aa80..45dbcdd3 100644 --- a/ui/src/main/res/layout/tunnel_detail_fragment.xml +++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml @@ -141,8 +141,8 @@ android:layout_height="wrap_content" android:contentDescription="@string/addresses" android:nextFocusUp="@id/public_key_text" - android:nextFocusDown="@id/dhcp_addresses_text" - android:nextFocusForward="@id/dhcp_addresses_text" + android:nextFocusDown="@id/dynamic_addresses_text" + android:nextFocusForward="@id/dynamic_addresses_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{config.config.interface.addresses}" android:textAppearance="?attr/textAppearanceBodyLarge" @@ -152,21 +152,21 @@ tools:text="fc00:bbbb:bbbb:bb11::3:368b/128" /> <TextView - android:id="@+id/dhcp_addresses_label" + android:id="@+id/dynamic_addresses_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:labelFor="@+id/dhcp_addresses_text" - android:text="@string/dhcp_addresses" + android:labelFor="@+id/dynamic_addresses_text" + android:text="@string/dynamic_addresses" android:visibility="@{tunnel.dhcp == null ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/addresses_text" /> <TextView - android:id="@+id/dhcp_addresses_text" + android:id="@+id/dynamic_addresses_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:contentDescription="@string/dhcp_addresses" + android:contentDescription="@string/dynamic_addresses" android:nextFocusUp="@id/addresses_text" android:nextFocusDown="@id/dns_servers_text" android:nextFocusForward="@id/dns_servers_text" @@ -175,7 +175,7 @@ android:textAppearance="?attr/textAppearanceBodyLarge" android:visibility="@{tunnel.dhcp == null ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/dhcp_addresses_label" + app:layout_constraintTop_toBottomOf="@+id/dynamic_addresses_label" tools:text="fc00:bbbb:bbbb:bb11::3:368b/128" /> <TextView @@ -187,14 +187,14 @@ android:text="@string/dns_servers" android:visibility="@{config.config.interface.dnsServers.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/dhcp_addresses_text" /> + app:layout_constraintTop_toBottomOf="@id/dynamic_addresses_text" /> <TextView android:id="@+id/dns_servers_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:contentDescription="@string/dns_servers" - android:nextFocusUp="@id/dhcp_addresses_text" + android:nextFocusUp="@id/dynamic_addresses_text" android:nextFocusDown="@id/dns_search_domains_text" android:nextFocusForward="@id/dns_search_domains_text" android:onClick="@{ClipboardUtils::copyTextView}" diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 18eac96a..e1d66a3c 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -105,7 +105,7 @@ <string name="dark_theme_summary_on">Currently using dark (night) theme</string> <string name="dark_theme_title">Use dark theme</string> <string name="delete">Delete</string> - <string name="dhcp_addresses">DHCP Addresses</string> + <string name="dynamic_addresses">Dynamic addresses</string> <string name="tv_delete">Select tunnel to delete</string> <string name="tv_select_a_storage_drive">Select a storage drive</string> <string name="tv_no_file_picker">Please install a file management utility to browse files</string> |