New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Android: Infinity Base UI #11808
Android: Infinity Base UI #11808
Conversation
d0edd97
to
21ec612
Compare
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
Outdated
Show resolved
Hide resolved
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
Outdated
Show resolved
Hide resolved
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
Outdated
Show resolved
Hide resolved
.../Android/app/src/main/java/org/dolphinemu/dolphinemu/features/infinitybase/InfinityConfig.kt
Outdated
Show resolved
Hide resolved
.../Android/app/src/main/java/org/dolphinemu/dolphinemu/features/infinitybase/InfinityConfig.kt
Outdated
Show resolved
Hide resolved
5b375c5
to
c459efe
Compare
|
@t895, any comments? |
|
I just did a quick look over and things look great (it's basically the same as the Skylanders UI). But I just noticed something. It lets you pick any file and that's fine since we don't have a MIME type for these files but when you do pick an incompatible file, this happens. Could you add a check to make sure the selected file at least has the right file extension? Sure we could have a situation where the extension is right but the file isn't, but this should make things better. Or is there a better way of checking that the file is incompatible? Seems like something goes wrong that you could check for given that the text view is blank in the screen shot. Note - I can't test this in game since I don't have a copy |
c459efe
to
35146ce
Compare
|
@t895 thanks for that! I haven't gone down the checking the file extension route, but I have done a check for if the returned name is null (in the case of the file being too small), but also notice that the CPP code that fetches the name of the figure from the file provided wasn't working as intended, and returning an empty string. Hopefully latest commit should fix this - happy to add checks for the file type as well! |
|
Just tried it. This isn't a bad option but not exactly intuitive either. We shouldn't keep a slot occupied by something incompatible. Instead could you leave the slot empty and create a toast message saying that the file was incompatible? Also since you have checks for the file as is, the extension check shouldn't be necessary. |
|
Makes sense - let me whip something up and will add it in here |
35146ce
to
4ab5843
Compare
|
Latest change adds a super simple dialog window - let me know if I should add anything more to it |
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
Outdated
Show resolved
Hide resolved
...e/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/infinitybase/ui/FigureSlot.kt
Outdated
Show resolved
Hide resolved
...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/infinitybase/model/Figure.kt
Outdated
Show resolved
Hide resolved
2489cc8
to
91a2d6d
Compare
|
I was just about to give the go ahead and of course I found something else strange. Check out this video I got of what happens on a fresh install. screen-20230513-151955.3.mp4Note - If this wasn't clear, some of the text changes to a different value if you press the clear button |
91a2d6d
to
0e74814
Compare
|
Ah I see what I'd done wrong there - fix pushed up for that now |
|
Now I'm getting a bug where the wrong items are being updated (still to different strings) when pressing the clear button |
0e74814
to
ef14688
Compare
|
Okay - actually tested this time so should be fine now, was using notifyItemChanged on the wrong index. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
809fed4
to
17ebe1e
Compare
Add a UI option for the Infinity Base within the Android Emulation Activity
17ebe1e
to
2c98efa
Compare

Building off of #11546, this PR intends to bring the Infinity Base functionality over to Android, creating a UI largely the same as the Skylanders Portal, using Material GUI components. Note, that this should be tested with someone with a better phone than me as I only have a Nokia 5!