github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-14 18:57:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Android PIN Instruction depend on Console

Browse source
This commit is contained in:
Florian Märkl 2020-12-28 22:43:19 +01:00
commit 264eb92792
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt
View file

@ -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)
})
}

4
android/app/src/main/java/com/metallic/chiaki/regist/RegistViewModel.kt
View file

@ -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)

2
android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsAdapter.kt
View file

@ -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()
}
}

4
android/app/src/main/res/layout/activity_regist.xml
View file

@ -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"/>

6
android/app/src/main/res/values/strings.xml
View file

@ -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>