Skip to content

Commit

Permalink
[ui] improve credentials display format
Browse files Browse the repository at this point in the history
  • Loading branch information
@capcom6
capcom6 committed Oct 16, 2024
1 parent 910e4da commit fcec94f
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 145 deletions.
68 changes: 43 additions & 25 deletions app/src/main/java/me/capcom/smsgateway/ui/HomeFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,20 @@ class HomeFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

binding.textAuthentication.movementMethod = LinkMovementMethod.getInstance()
binding.textAuthentication.text = makeCopyableLink(
Html
.fromHtml(
getString(
R.string.settings_basic_auth,
"sms",
settingsHelper.serverToken
)
)
binding.textLocalIP.movementMethod = LinkMovementMethod.getInstance()
binding.textPublicIP.movementMethod = LinkMovementMethod.getInstance()
binding.textLocalUsername.movementMethod = LinkMovementMethod.getInstance()
binding.textLocalPassword.movementMethod = LinkMovementMethod.getInstance()

binding.textLocalUsername.text = makeCopyableLink(
Html.fromHtml(
"<a href>sms</a>"
)
)
binding.textLocalPassword.text = makeCopyableLink(
Html.fromHtml(
"<a href>${settingsHelper.serverToken}</a>"
)
)

binding.switchAutostart.isChecked = settingsHelper.autostart
Expand Down Expand Up @@ -103,15 +107,20 @@ class HomeFragment : Fragment() {
viewLifecycleOwner.lifecycleScope.launch {
events.collect<DeviceRegisteredEvent> { event ->
binding.textRemoteAddress.text = getString(R.string.address_is, event.server)
binding.textRemoteAuth.movementMethod = LinkMovementMethod.getInstance()
binding.textRemoteAuth.text = makeCopyableLink(

binding.textRemoteUsername.movementMethod = LinkMovementMethod.getInstance()
binding.textRemotePassword.movementMethod = LinkMovementMethod.getInstance()

binding.textRemoteUsername.text = makeCopyableLink(
Html
.fromHtml(
getString(
R.string.settings_basic_auth,
event.login,
event.password
)
"<a href>${event.login}</a>"
)
)
binding.textRemotePassword.text = makeCopyableLink(
Html
.fromHtml(
"<a href>${event.password}</a>"
)
)
}
Expand All @@ -120,18 +129,27 @@ class HomeFragment : Fragment() {
viewLifecycleOwner.lifecycleScope.launch {
events.collect<IPReceivedEvent> { event ->
binding.textLocalIP.text = event.localIP?.let {
getString(
R.string.settings_local_address_is,
event.localIP,
settingsHelper.serverPort
makeCopyableLink(
Html.fromHtml(
getString(
R.string.settings_local_address_is,
event.localIP,
settingsHelper.serverPort
)
)
)

} ?: getString(R.string.settings_local_address_not_found)

binding.textPublicIP.text = event.publicIP?.let {
getString(
R.string.settings_public_address_is,
event.publicIP,
settingsHelper.serverPort
makeCopyableLink(
Html.fromHtml(
getString(
R.string.settings_public_address_is,
event.publicIP,
settingsHelper.serverPort
)
)
)
} ?: getString(R.string.settings_public_address_not_found)
}
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/drawable/ic_settings_24.xml
View file

This file was deleted.

72 changes: 0 additions & 72 deletions app/src/main/res/layout/dialog_encryption.xml
View file

This file was deleted.

111 changes: 91 additions & 20 deletions app/src/main/res/layout/fragment_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,53 +17,93 @@
android:gravity="center"
android:orientation="vertical">

<androidx.appcompat.widget.LinearLayoutCompat
<GridLayout
android:id="@+id/layoutLocalServer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="4dp"
android:visibility="gone">
android:layout_width="wrap_content"
android:columnCount="2"
android:visibility="gone"
tools:visibility="visible">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnSpan="2"
android:layout_margin="8dp"
android:layout_gravity="center"
android:text="@string/settings_local_server"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_margin="4dp"
android:text="@string/local_address" />

<TextView
android:id="@+id/textLocalIP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:autoLink="web"
tools:text="Local address is 127.0.0.1:8080" />
android:layout_gravity="start"
android:text="@string/dots"
tools:text="127.0.0.1:8080" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_margin="4dp"
android:text="@string/public_address" />

<TextView
android:id="@+id/textPublicIP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_gravity="start"
android:text="@string/dots"
tools:text="127.0.0.1:8080" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_margin="4dp"
android:text="@string/username" />

<TextView
android:id="@+id/textLocalUsername"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_gravity="start"
android:autoLink="web"
tools:text="Public address is 127.0.0.1:8080" />
tools:text="sms" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_margin="4dp"
android:text="@string/password" />

<TextView
android:id="@+id/textAuthentication"
android:id="@+id/textLocalPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
tools:text="Basic auth sms:token" />
</androidx.appcompat.widget.LinearLayoutCompat>
android:layout_gravity="start"
android:autoLink="web"
tools:text="1q2w3e4r" />
</GridLayout>

<androidx.appcompat.widget.LinearLayoutCompat
<GridLayout
android:id="@+id/layoutRemoteServer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="4dp"
android:layout_width="wrap_content"
android:columnCount="2"
android:visibility="gone"
tools:visibility="visible">

Expand All @@ -72,9 +112,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_columnSpan="2"
android:layout_gravity="center"
android:text="@string/cloud_server"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_margin="4dp"
android:text="@string/server_address" />

<TextView
android:id="@+id/textRemoteAddress"
android:layout_width="wrap_content"
Expand All @@ -84,13 +133,35 @@
android:text="@string/settings_address_is_sms_capcom_me" />

<TextView
android:id="@+id/textRemoteAuth"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_margin="4dp"
android:text="@string/username" />

<TextView
android:id="@+id/textRemoteUsername"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:text="@string/dots"
tools:text="1Q2W3E" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_margin="4dp"
tools:text="Basic auth: sms:token" />
android:text="@string/password" />

</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/textRemotePassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:text="@string/dots"
tools:text="1q2w3e4r" />
</GridLayout>

</LinearLayout>

Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="text_margin">16dp</dimen>
</resources>
<resources></resources>
Loading

0 comments on commit fcec94f

Please sign in to comment.