Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Infinity Base UI

Browse Source 
Add a UI option for the Infinity Base within the Android Emulation Activity
This commit is contained in:
Joshua de Reeper committed 2023-05-28 19:01:21 +12:00
1 parent 6d9529a68d
commit f8abc2c0e6
16 files changed
+586 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Android/app/src/main/res/layout/dialog_create_infinity_figure.xml
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/root"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/spacing_medlarge">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/layout_infinity_dropdown"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/spacing_medlarge"
android:paddingHorizontal="@dimen/spacing_medlarge"
android:hint="@string/infinity_label"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/infinity_dropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:spinnerMode="dialog"
android:imeOptions="actionDone" />
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/layout_infinity_dropdown"
android:gravity="center_vertical"
android:baselineAligned="false">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/layout_infinity_num"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/infinity_number"
android:paddingHorizontal="@dimen/spacing_medlarge">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/infinity_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="number" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
Source/Android/app/src/main/res/layout/dialog_skylanders_manager.xml → Source/Android/app/src/main/res/layout/dialog_nfc_figures_manager.xml
+3 -3
View File
@@ -4,10 +4,10 @@
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/skylanders_manager"
android:id="@+id/figure_manager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:scrollbars="vertical"
android:fadeScrollbars="false"/>
android:fadeScrollbars="false"
android:scrollbars="vertical" />
</androidx.appcompat.widget.LinearLayoutCompat>
Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
+5
View File
@@ -106,6 +106,11 @@
android:text="@string/emulate_skylander_portal"
style="@style/InGameMenuOption" />
<Button
android:id="@+id/menu_infinitybase"
android:text="@string/emulate_infinity_base"
style="@style/InGameMenuOption" />
</LinearLayout>
</ScrollView>
Source/Android/app/src/main/res/layout/list_item_skylander_slot.xml → Source/Android/app/src/main/res/layout/list_item_nfc_figure_slot.xml
+13 -13
View File
@@ -8,43 +8,43 @@
android:padding="@dimen/spacing_medlarge">
<Button
android:id="@+id/button_create_skylander"
android:id="@+id/button_create_figure"
style="?attr/materialIconButtonFilledTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_small"
android:layout_toStartOf="@id/button_load_skylander"
android:contentDescription="@string/create_skylander"
android:tooltipText="@string/create_skylander"
android:layout_toStartOf="@id/button_load_figure"
android:contentDescription="@string/create_figure"
android:tooltipText="@string/create_figure"
app:icon="@drawable/ic_add" />
<Button
android:id="@+id/button_load_skylander"
android:id="@+id/button_load_figure"
style="?attr/materialIconButtonFilledTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_small"
android:layout_toStartOf="@+id/button_clear_skylander"
android:contentDescription="@string/load_skylander"
android:tooltipText="@string/load_skylander"
android:layout_toStartOf="@+id/button_clear_figure"
android:contentDescription="@string/load_figure"
android:tooltipText="@string/load_figure"
app:icon="@drawable/ic_load" />
<Button
android:id="@+id/button_clear_skylander"
android:id="@+id/button_clear_figure"
style="?attr/materialIconButtonFilledTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_large"
android:contentDescription="@string/remove_skylander"
android:tooltipText="@string/remove_skylander"
android:contentDescription="@string/remove_figure"
android:tooltipText="@string/remove_figure"
app:icon="@drawable/ic_clear" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_skylander_name"
android:id="@+id/text_figure_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
@@ -52,7 +52,7 @@
android:layout_marginBottom="@dimen/spacing_medlarge"
android:layout_marginEnd="@dimen/spacing_large"
android:layout_marginStart="@dimen/spacing_large"
android:layout_toStartOf="@+id/button_create_skylander"
android:layout_toStartOf="@+id/button_create_figure"
android:textAlignment="viewStart"
android:textColor="?attr/colorOnSurface"
android:textSize="16sp"
Source/Android/app/src/main/res/values/strings.xml
+19 -3
View File
@@ -846,9 +846,6 @@ It can efficiently compress both junk data and encrypted Wii data.
<string name="emulated_usb_devices">Emulated USB Devices</string>
<string name="emulate_skylander_portal">Skylanders Portal</string>
<string name="skylanders_manager">Skylanders Manager</string>
<string name="load_skylander">Load</string>
<string name="remove_skylander">Remove</string>
<string name="create_skylander">Create</string>
<string name="create_skylander_title">Create Skylander</string>
<string name="skylander_label">Skylander</string>
<string name="skylander_slot">Slot %1$d</string>
@@ -856,4 +853,23 @@ It can efficiently compress both junk data and encrypted Wii data.
<string name="skylander_variant">Variant</string>
<string name="invalid_skylander">Invalid Skylander Selection</string>
<string name="emulate_infinity_base">Infinity Base</string>
<string name="infinity_manager">Infinity Manager</string>
<string name="load_figure">Load</string>
<string name="remove_figure">Remove</string>
<string name="create_figure">Create</string>
<string name="create_figure_title">Create Figure</string>
<string name="infinity_label">Infinity Figure</string>
<string name="infinity_number">Figure Number</string>
<string name="invalid_infinity_figure">Invalid Figure Selection</string>
<string name="infinity_hexagon_label">Power Disc/Play Set</string>
<string name="infinity_p1_label">Player One</string>
<string name="infinity_p2_label">Player Two</string>
<string name="infinity_p1a1_label">P1 Ability One</string>
<string name="infinity_p2a1_label">P2 Ability One</string>
<string name="infinity_p1a2_label">P1 Ability Two</string>
<string name="infinity_p2a2_label">P2 Ability Two</string>
<string name="incompatible_figure_selected">Incompatible Figure Selected</string>
<string name="select_compatible_figure">Please select a compatible figure file</string>
</resources>