93 Commits

Author SHA1 Message Date
Nacho
f7a4039d66 Merge branch 'main' into vb/nfc_compat
# Conflicts:
#	app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/ScanScreenControllerImpl.kt
2025-07-29 01:35:21 +02:00
nacabaro
1eed6a4c17
Merge pull request #32 from nacabaro/navigation/animations
Graphical things
2025-07-29 01:29:55 +02:00
nacabaro
1a09e40d1d
Merge pull request #31 from nacabaro/database/get_all_sprites
Fetch all the character sprites into the internal database
2025-07-29 01:26:49 +02:00
Nacho
13051145b7 Few things:
- Speed up the fade animation a tad bit
- Added a back arrow in the scan screen
- Improved a bit the placeholder of the battles screen, since it'd throw out the transition animation.
2025-07-29 00:01:02 +02:00
Nacho
1a150ce7ce Few things:
- Speed up the fade animation a tad bit
- Added a back arrow in the scan screen
- Improved a bit the placeholder of the battles screen, since it'd throw out the transition animation.
2025-07-28 23:58:41 +02:00
Nacho
39ba48d867 Forgot to remove the dependency to SpriteRepo 2025-07-27 19:46:07 +02:00
Nacho
3f324ca141 SpriteRepo is not needed anymore 2025-07-27 19:44:12 +02:00
Nacho
1e28a8c249 Application now imports all the sprites related to the character into the internal database. 2025-07-27 19:42:25 +02:00
Nacho
d46769b0cb Added credits for the app in preparation for version 0.1 prerelease 2025-07-26 22:26:41 +02:00
Nacho
fce05870c5 This should allow the app to build, otherwise it won't or it will crash 2025-07-26 14:23:53 +02:00
Nacho
9f5f806786 Added basic stuff for compatibility with VB 2025-06-01 18:51:30 +02:00
nacabaro
d749af0a9c
Merge pull request #27 from cfogrady/FixStageAndAttributeFromCharacter
Fix stage and attribute coming from character instead of UserCharacter
2025-04-08 15:35:13 +02:00
Christopher O'Grady
076f6bfacf Fix stage and attribute coming from character instead of UserCharacter 2025-04-05 20:31:03 -04:00
nacabaro
a4f3b701e5
Merge pull request #26 from cfogrady/RemoveDuplicatedData
Remove duplicated stage and attribute from UserCharacter
2025-03-22 00:34:07 +01:00
Christopher O'Grady
da134247b1 Remove duplicated stage and attribute from UserCharacter
These fields are on the Character entity.
2025-03-19 15:33:52 -04:00
Nacho
f7b3b7256a VB NFC compatibility
- Refactored some names (not really relevant)
- Added the ability to store special missions inside the application's database
- Refactored the conversion code into two classes inside the scan screen package
- Added the missing tables to store the necessary vb data

Also not relevant to this update
- Updated adventure progress app wide, so that instead of it being stored in a character basis, it is shared across all characters in the same dim
2025-02-10 17:44:13 +01:00
nacabaro
e36a700d9f
Merge pull request #25 from nacabaro/database/adventure
Adventure mode
2025-01-26 02:01:24 +01:00
Nacho
fb6b6d2825 While I'm at it...
- Resized some buttons in the dialogs
- Added a dismiss button in get item dialog after adventure and in the send on adventure choose time dialogs
- Moved the export/import data lower in the settings screen
2025-01-26 01:59:43 +01:00
Nacho
e17f6c23e4 Renaming terms and other bits and bobs
- Changed adventure database so that the original intended time is also stored with the final time. This will come useful once the algorithm for determining which object to give is made.
2025-01-26 01:40:32 +01:00
Nacho
409474b5d1 Phew
- Added adventure screen, dialogs, components and controllers needed to rock.
- Modified DTOs so that it is possible to tell if a character is in adventure or not
- Updated layout of items database
- Fixed an issue with importing bems where the character name would be read incorrectly
- Also added a ton of checks
2025-01-26 01:25:25 +01:00
nacabaro
547318864b
Merge pull request #24 from nacabaro/cleanup
Bigger icons plus material obscurity
2025-01-21 13:35:43 +01:00
Nacho
5e92895656 Made item icons a bit smaller in order to be similarly sized to character icons 2025-01-21 13:34:49 +01:00
Nacho
25500e9cb4 Made character icons bigger and also made the obscured characters follow material guidelines, as being pure black can be difficult to see in dark theme 2025-01-21 13:28:13 +01:00
nacabaro
1a38cefb92
Merge pull request #23 from nacabaro/cleanup
Cleanup MainActivity
2025-01-21 13:12:38 +01:00
Nacho
a974bd366e Moved read character from watch to its corresponding controller 2025-01-21 13:02:45 +01:00
Nacho
bb5f66d167 Moved import card logic outside of the MainActivity 2025-01-21 12:42:52 +01:00
nacabaro
09394871e5
Merge pull request #22 from nacabaro/database/items
Add items functionality
2025-01-20 15:49:22 +01:00
Nacho
972a640394 Added missing icons, ready to merge! 2025-01-20 15:46:53 +01:00
Nacho
35a7c9d959 Slowdowns and UI
- Current item can be seen from a character when clicked on it, you can also see how much time left does that item have on that character.
- Fixed slowdown issue in the items screen. Also fixed this issue in the storage screen as it'd also affect it if there are a lot of characters in the storage.
2025-01-20 15:23:40 +01:00
Nacho
b4a73031e7 Working items
- Click on use item > then choose the mon you want to apply the item to
2025-01-20 14:45:28 +01:00
Nacho
3e41f82273 Forgot to push the updated db 2025-01-20 00:29:07 +01:00
Nacho
f3740d4816 Here comes the train (with more things)
- Updated available items
- Created ItemsScreenController
- Moved the ItemsScreen to keep code organized
2025-01-20 00:06:42 +01:00
Nacho
305b776b52 Things
- Added items store and a way to switch between the store and your items
- Added an items dialog, click on it to see details of the item (description, amount) and use it
- Added items store, it lists all the items available
2025-01-19 13:41:50 +01:00
Nacho
c0a67e382b Things items related
- Added a MyItems screen
- Added an ItemElement placeholder
- Included database with all the items in the app (not final)
- Also included some demo items

As of now items don't do anything, i'm still making the UI
2025-01-18 23:44:38 +01:00
nacabaro
bc7a05ccd3
Merge pull request #21 from nacabaro/db/data_export
Forgot to include the settingsscreencontroller interface my bad
2025-01-18 16:02:29 +01:00
Nacho
660dbaca19 Forgot to include the settingsscreencontroller interface my bad 2025-01-18 16:01:42 +01:00
nacabaro
b89dfb0df3
Merge pull request #20 from nacabaro/db/data_export
Added data importing/exporting
2025-01-18 12:11:58 +01:00
Nacho
23e233227a Finished refactoring the old SettingsScreenController.kt 2025-01-18 12:05:10 +01:00
Nacho
542072c238 Forgot to close DB before importing process
This will clear the database lock file before closing the application, ensuring that during the second startup the application does not see anything weird with the data. Not closing the database before import can lead to weird behavior.
2025-01-18 01:05:45 +01:00
Nacho
42dd87f0c4 Data export working
During export the database will be closed, otherwise the WAL will ruin the export. data will be saved as a .vbhelper file, then the app will be closed to avoid making any changes to the DB
For import, we check if the extension is .vbhelper, otherwise we can corrupt the database, IMPORTANT. Next we delete everything related to RoomDB and we swap it with the new files. Finally the app will be closed to ensure RoomDB is running on the new DB.

Finally, I still have to reintegrate the importApk functionality with the NewSettingsScreenController and get rid of the old one.
2025-01-18 00:45:16 +01:00
nacabaro
635be60cdb
Merge pull request #19 from nacabaro/dex/functionality
Dex stuff
2025-01-17 21:21:35 +01:00
Nacho
88163684ca Dex stuff
- Added dex domain model, and rearranged class
- Added dex functionality to the dex screen, and updated the corresponding controller
2025-01-17 21:12:41 +01:00
nacabaro
586d6c01ef
Merge pull request #18 from nacabaro/ui/home_screen
A lot more things
2025-01-16 01:05:29 +01:00
nacabaro
5d996edc1e
Merge branch 'main' into ui/home_screen 2025-01-16 01:05:21 +01:00
nacabaro
074ced1082
Merge pull request #17 from cfogrady/ObscuredDex
Algorithm to obscure undiscovered digimon
2025-01-16 01:04:32 +01:00
Nacho
5a1d52aa1d A lot more things
- Moved scan button to inside the home screen
- Added items screen
- Scanning functionality updated to work with BEms
- Different home screen layouts depending on the configuration (BE with BEm, BE with DIm, since they don't have the same data, looking at you, special training)
- It is now possible to import BEms
- Character size is now more accurate, (no more big babies)
- Once sent to the watch, characters are deleted from the app, and it shouldn't fail
- Updated domain model to support evolution history.

TODO:
- Reorganize some of the code, mostly SQL queries and reorganize the scan screen functionality
- Create home layout for the VB watch
- Start figuring out reading data from the VB
    - Also create VB data domain model
    - Also start figuring out writing to the VB (it's 3 steps)
- Block off scan button until secrets are imported
- Start working with the dex
    - Update domain model
    - Use cfogrady's blank character when not seen
- Cancel character upload in case the app database does not contain the card for it (otherwise, the watch will delete the character)
- Export character data (in case of any app issues or changing phones)

(Also added some more icons)

Woo
2025-01-16 01:03:57 +01:00
Christopher O'Grady
98bd74c544 Algorithm to obscure undiscovered digimon
Logic still needs to be implemented to distinguish discovered from undiscovered.
2025-01-12 21:36:02 -05:00
Nacho
ce1cf3eddb Quicm fix, DisposableEffect isn't reloading when isDoneSendCard is true
TODO: add more disposableeffects
2025-01-12 13:50:41 +01:00
nacabaro
0bd745ac86
Merge pull request #16 from nacabaro/ui/home_screen
UI/home screen
2025-01-12 10:23:49 +01:00
nacabaro
0d999925b5
Merge pull request #14 from cfogrady/home_screen
Fix arrays for NFCCharacter
2025-01-12 10:23:09 +01:00