sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Support more than one controller

Browse Source
This commit is contained in:
Connor McLaughlin
2021-03-14 17:21:39 +10:00
parent 1839bfab3b
commit c8a029c5cb
15 changed files with 234 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/main/res/layout/fragment_controller_mapping.xml → android/app/src/main/res/layout/fragment_controller_settings.xml
View File

@ -10,7 +10,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabTextAppearance="@style/TabTextAppearance"
app:tabMode="fixed" />
app:tabMinWidth="150dp"
app:tabMode="scrollable" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/view_pager"

8
android/app/src/main/res/menu/menu_main.xml
View File

@ -21,12 +21,14 @@
android:id="@+id/action_switch_view"
android:icon="@drawable/ic_baseline_settings_24"
android:orderInCategory="100"
android:title="@string/action_settings"
android:title="Switch View"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_controller_mapping"
android:id="@+id/action_controller_settings"
android:icon="@drawable/ic_baseline_gamepad_24"
android:title="@string/action_controller_mapping" />
android:orderInCategory="102"
android:title="@string/action_controller_mapping"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_edit_game_directories"
android:title="@string/menu_main_edit_game_directories" />

4
android/app/src/main/res/values-es/arrays.xml
View File

@ -69,8 +69,11 @@
<item>xBR (Sin unión de bordes)</item>
</string-array>
<string-array name="settings_controller_type_entries">
<item>None</item>
<item>Control Digital (Mando)</item>
<item>Control Analógico (DualShock)</item>
<item>Analog Joystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_memory_card_mode_entries">
<item>Sin tarjeta de memoria</item>
@ -139,7 +142,6 @@
<item>Pantalla</item>
<item>Audio</item>
<item>Mejoras</item>
<item>Controles</item>
<item>Achievements</item>
<item>Avanzado</item>
</string-array>

4
android/app/src/main/res/values-it/arrays.xml
View File

@ -69,8 +69,11 @@
<item>xBR (No Blending Bordi)</item>
</string-array>
<string-array name="settings_controller_type_entries">
<item>None</item>
<item>Controller Digitale (Gamepad)</item>
<item>Controller Analogico (DualShock)</item>
<item>Analog Joystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_memory_card_mode_entries">
<item>No Memory Card</item>
@ -139,7 +142,6 @@
<item>Display</item>
<item>Audio</item>
<item>Miglioramenti</item>
<item>Controller</item>
<item>Achievements</item>
<item>Avanzate</item>
</string-array>

4
android/app/src/main/res/values-nl/arrays.xml
View File

@ -69,8 +69,11 @@
<item>xBR (Geen Edge Blending)</item>
</string-array>
<string-array name="settings_controller_type_entries">
<item>None</item>
<item>Digitale Controller (Gamepad)</item>
<item>Analoge Controller (DualShock)</item>
<item>Analog Joystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_memory_card_mode_entries">
<item>Geen Geheugenkaart</item>
@ -139,7 +142,6 @@
<item>Weergave</item>
<item>Audio</item>
<item>Verbeteringen</item>
<item>Controllers</item>
<item>Achievements</item>
<item>Geavanceerd</item>
</string-array>

4
android/app/src/main/res/values-pt-rBR/arrays.xml
View File

@ -69,8 +69,11 @@
<item>xBR (Sem ajustes laterais)</item>
</string-array>
<string-array name="settings_controller_type_entries">
<item>None</item>
<item>Controle Digital (Gamepad)</item>
<item>Controle Analógico (DualShock)</item>
<item>Analog Joystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_memory_card_mode_entries">
<item>Sem Cartão de Memória</item>
@ -139,7 +142,6 @@
<item>Vídeo</item>
<item>Áudio</item>
<item>Melhorias</item>
<item>Controles</item>
<item>Achievements</item>
<item>Avançado</item>
</string-array>

4
android/app/src/main/res/values-ru/arrays.xml
View File

@ -69,8 +69,11 @@
<item>xBR (без сглаживания краёв)</item>
</string-array>
<string-array name="settings_controller_type_entries">
<item>None</item>
<item>Цифровой</item>
<item>Аналоговый (DualShock)</item>
<item>Analog Joystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_memory_card_mode_entries">
<item>Без карты памяти</item>
@ -145,7 +148,6 @@
<item>Экран</item>
<item>Звук</item>
<item>Улучшения</item>
<item>Контроллеры</item>
<item>Достижения</item>
<item>Расширенные</item>
</string-array>

7
android/app/src/main/res/values/arrays.xml
View File

@ -138,12 +138,18 @@
<item>xBRBinAlpha</item>
</string-array>
<string-array name="settings_controller_type_entries">
<item>None</item>
<item>Digital Controller (Gamepad)</item>
<item>Analog Controller (DualShock)</item>
<item>Analog Joystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_controller_type_values">
<item>None</item>
<item>DigitalController</item>
<item>AnalogController</item>
<item>AnalogJoystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_memory_card_mode_entries">
<item>No Memory Card</item>
@ -265,7 +271,6 @@
<item>Display</item>
<item>Audio</item>
<item>Enhancements</item>
<item>Controllers</item>
<item>Achievements</item>
<item>Advanced</item>
</string-array>

11
android/app/src/main/res/values/strings.xml
View File

@ -1,7 +1,7 @@
<resources>
<string name="app_name">DuckStation</string>
<string name="action_settings">Settings</string>
<string name="action_controller_mapping">Controller Mapping</string>
<string name="action_controller_mapping">Controller Settings</string>
<string name="title_activity_settings">Settings</string>
<string name="settings_console_region">Console Region</string>
<string name="settings_console_tty_output">Enable TTY Output</string>
@ -167,7 +167,7 @@
<string name="controller_binding_dialog_no_binding"><![CDATA[<No Binding>]]></string>
<string name="controller_binding_dialog_cancel">Cancel</string>
<string name="controller_binding_dialog_clear">Clear</string>
<string name="controller_mapping_activity_title">Controller Mapping</string>
<string name="controller_mapping_activity_title">Controller Settings</string>
<string name="controller_mapping_activity_no_profiles_found">No profiles found.</string>
<string name="controller_mapping_activity_select_input_profile">Select Input Profile</string>
<string name="controller_mapping_activity_failed_to_load_profile">Failed to load profile \'%s\'</string>
@ -267,4 +267,11 @@
<string name="settings_achievements_confirm_logout_title">Confirm Logout</string>
<string name="settings_achievements_confirm_logout_message">After logging out, no more achievements will be unlocked until you log back in again. Achievements already unlocked will not be lost.</string>
<string name="controller_binding_device_for_vibration">Device for Vibration</string>
<string name="controller_settings_tab_settings">Settings</string>
<string name="controller_settings_tab_hotkeys">Hotkeys</string>
<string name="controller_settings_category_button_bindings">Button Bindings</string>
<string name="controller_settings_category_axis_bindings">Axis Bindings</string>
<string name="controller_settings_category_settings">Settings</string>
<string name="controller_settings_category_touchscreen_controller">Touchscreen Controller</string>
<string name="controller_settings_category_memory_cards">Memory Cards</string>
</resources>

138
android/app/src/main/res/xml/controllers_preferences.xml
View File

@ -14,88 +14,64 @@
~ limitations under the License.
-->
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
<ListPreference
app:key="Controller1/Type"
app:title="@string/settings_controller_type"
app:entries="@array/settings_controller_type_entries"
app:entryValues="@array/settings_controller_type_values"
app:defaultValue="DigitalController"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<ListPreference
app:key="Controller1/TouchscreenControllerView"
app:title="@string/settings_touchscreen_controller_view"
app:entries="@array/settings_touchscreen_controller_view_entries"
app:entryValues="@array/settings_touchscreen_controller_view_values"
app:defaultValue="digital"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<Preference
app:title="@string/settings_controller_mapping"
app:summary="@string/settings_controller_mapping_summary"
app:iconSpaceReserved="false">
<intent
android:action="android.intent.action.VIEW"
android:targetClass="com.github.stenzek.duckstation.ControllerMappingActivity"
android:targetPackage="com.github.stenzek.duckstation" />
</Preference>
<SwitchPreferenceCompat
app:key="Controller1/ForceAnalogOnReset"
app:title="@string/settings_enable_analog_mode_on_reset"
app:summary="@string/settings_summary_enable_analog_mode_on_reset"
app:defaultValue="true"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Controller1/AnalogDPadInDigitalMode"
app:title="@string/settings_use_analog_sticks_for_dpad"
app:summary="@string/settings_summary_use_analog_sticks_for_dpad"
app:defaultValue="true"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Controller1/AutoHideTouchscreenController"
app:title="@string/settings_auto_hide_touchscreen_controller"
app:defaultValue="false"
app:summary="@string/settings_summary_auto_hide_touchscreen_controller"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Controller1/HapticFeedback"
app:title="@string/settings_vibrate_on_press"
app:defaultValue="false"
app:summary="@string/settings_summary_vibrate_on_press"
app:iconSpaceReserved="false" />
<PreferenceCategory
app:iconSpaceReserved="false"
app:title="@string/controller_settings_category_touchscreen_controller">
<ListPreference
app:defaultValue="digital"
app:entries="@array/settings_touchscreen_controller_view_entries"
app:entryValues="@array/settings_touchscreen_controller_view_values"
app:iconSpaceReserved="false"
app:key="Controller1/TouchscreenControllerView"
app:title="@string/settings_touchscreen_controller_view"
app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
app:defaultValue="false"
app:iconSpaceReserved="false"
app:key="Controller1/AutoHideTouchscreenController"
app:summary="@string/settings_summary_auto_hide_touchscreen_controller"
app:title="@string/settings_auto_hide_touchscreen_controller" />
<SwitchPreferenceCompat
app:defaultValue="false"
app:iconSpaceReserved="false"
app:key="Controller1/TouchGliding"
app:summary="@string/settings_summary_touch_gliding"
app:title="@string/settings_touch_gliding" />
<SwitchPreferenceCompat
app:defaultValue="false"
app:iconSpaceReserved="false"
app:key="Controller1/HapticFeedback"
app:summary="@string/settings_summary_vibrate_on_press"
app:title="@string/settings_vibrate_on_press" />
<SwitchPreferenceCompat
app:defaultValue="false"
app:iconSpaceReserved="false"
app:key="Controller1/Vibration"
app:summary="@string/settings_summary_enable_vibration"
app:title="@string/settings_enable_vibration" />
</PreferenceCategory>
<SwitchPreferenceCompat
app:key="Controller1/Vibration"
app:title="@string/settings_enable_vibration"
app:defaultValue="false"
app:summary="@string/settings_summary_enable_vibration"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Controller1/TouchGliding"
app:title="@string/settings_touch_gliding"
app:defaultValue="false"
app:summary="@string/settings_summary_touch_gliding"
app:iconSpaceReserved="false" />
<ListPreference
app:key="MemoryCards/Card1Type"
app:title="@string/settings_memory_card_1_type"
app:entries="@array/settings_memory_card_mode_entries"
app:entryValues="@array/settings_memory_card_mode_values"
app:defaultValue="PerGameTitle"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<ListPreference
app:key="MemoryCards/Card2Type"
app:title="@string/settings_memory_card_2_type"
app:entries="@array/settings_memory_card_mode_entries"
app:entryValues="@array/settings_memory_card_mode_values"
app:defaultValue="None"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<PreferenceCategory
app:iconSpaceReserved="false"
app:title="@string/controller_settings_category_memory_cards">
<ListPreference
app:defaultValue="PerGameTitle"
app:entries="@array/settings_memory_card_mode_entries"
app:entryValues="@array/settings_memory_card_mode_values"
app:iconSpaceReserved="false"
app:key="MemoryCards/Card1Type"
app:title="@string/settings_memory_card_1_type"
app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="None"
app:entries="@array/settings_memory_card_mode_entries"
app:entryValues="@array/settings_memory_card_mode_values"
app:iconSpaceReserved="false"
app:key="MemoryCards/Card2Type"
app:title="@string/settings_memory_card_2_type"
app:useSimpleSummaryProvider="true" />
</PreferenceCategory>
</PreferenceScreen>