From 264eb92792548f1b89700a3042fd8e28ff2adc39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 28 Dec 2020 22:43:19 +0100
Subject: [PATCH] Make Android PIN Instruction depend on Console

---
 .../main/java/com/metallic/chiaki/regist/RegistActivity.kt  | 2 ++
 .../main/java/com/metallic/chiaki/regist/RegistViewModel.kt | 4 +++-
 .../chiaki/settings/SettingsRegisteredHostsAdapter.kt       | 2 +-
 android/app/src/main/res/layout/activity_regist.xml         | 4 ++--
 android/app/src/main/res/values/strings.xml                 | 6 ++++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt b/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt
index 1332fdc..fb3ddaa 100644
--- a/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt
@@ -74,6 +74,8 @@ class RegistActivity: AppCompatActivity(), RevealActivity
 				RegistViewModel.ConsoleVersion.PS4_LT_7 -> R.string.hint_regist_psn_online_id
 				else -> R.string.hint_regist_psn_account_id
 			})
+			pinHelpBeforeTextView.setText(if(it.isPS5) R.string.regist_pin_instructions_ps5_before else R.string.regist_pin_instructions_ps4_before)
+			pinHelpNavigationTextView.setText(if(it.isPS5) R.string.regist_pin_instructions_ps5_navigation else R.string.regist_pin_instructions_ps4_navigation)
 		})
 	}
 
diff --git a/android/app/src/main/java/com/metallic/chiaki/regist/RegistViewModel.kt b/android/app/src/main/java/com/metallic/chiaki/regist/RegistViewModel.kt
index 31c6bda..ab7253f 100644
--- a/android/app/src/main/java/com/metallic/chiaki/regist/RegistViewModel.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/regist/RegistViewModel.kt
@@ -11,7 +11,9 @@ class RegistViewModel: ViewModel()
 		PS5,
 		PS4_GE_8,
 		PS4_GE_7,
-		PS4_LT_7
+		PS4_LT_7;
+
+		val isPS5 get() = this == PS5
 	}
 
 	val ps4Version = MutableLiveData<ConsoleVersion>(ConsoleVersion.PS5)
diff --git a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsAdapter.kt b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsAdapter.kt
index 84eebe5..57a06ce 100644
--- a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsAdapter.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsAdapter.kt
@@ -29,7 +29,7 @@ class SettingsRegisteredHostsAdapter: RecyclerView.Adapter<SettingsRegisteredHos
 	{
 		val view = holder.itemView
 		val host = hosts[position]
-		view.nameTextView.text = host.serverNickname
+		view.nameTextView.text = "${host.serverNickname} (${if(host.target.isPS5) "PS5" else "PS4"})"
 		view.summaryTextView.text = host.serverMac.toString()
 	}
 }
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/activity_regist.xml b/android/app/src/main/res/layout/activity_regist.xml
index 607fcc8..7a8398b 100644
--- a/android/app/src/main/res/layout/activity_regist.xml
+++ b/android/app/src/main/res/layout/activity_regist.xml
@@ -151,7 +151,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@string/regist_pin_instructions_before"
+                android:text="@string/regist_pin_instructions_ps4_before"
                 app:layout_constraintTop_toBottomOf="@id/psnIdTextInputLayout"
                 android:textAppearance="?attr/textAppearanceBody1"
                 android:layout_marginTop="32dp"
@@ -162,7 +162,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@string/regist_pin_instructions_navigation"
+                android:text="@string/regist_pin_instructions_ps4_navigation"
                 app:layout_constraintTop_toBottomOf="@id/pinHelpBeforeTextView"
                 android:textAppearance="?attr/textAppearanceBody1"
                 android:textStyle="bold"/>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 721fe31..0f54522 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -21,8 +21,10 @@
     <string name="display_host_app_title_id">App: %s\nTitle ID: %s</string>
     <string name="action_register">Register Console</string>
     <string name="action_add_manual">Add Console Manually</string>
-    <string name="regist_pin_instructions_before">On the PS4, navigate to</string>
-    <string name="regist_pin_instructions_navigation">Settings →\nRemote Play Connection Settings →\nAdd Device</string>
+    <string name="regist_pin_instructions_ps4_before">On the PS4, navigate to</string>
+    <string name="regist_pin_instructions_ps4_navigation">Settings →\nRemote Play Connection Settings →\nAdd Device</string>
+    <string name="regist_pin_instructions_ps5_before">On the PS5, navigate to</string>
+    <string name="regist_pin_instructions_ps5_navigation">Settings →\nSystem → Remote Play →\nLink Device</string>
     <string name="regist_pin_instructions_after">to obtain the PIN</string>
     <string name="title_regist">Register Console</string>
     <string name="hint_regist_host">Host</string>