140 Commits

Author SHA1 Message Date
nacabaro
7f22650601
Merge pull request #13 from cfogrady/TransparentBackground
Make background on characters and icons transparent.
2025-01-10 23:10:04 +01:00
Christopher O'Grady
1088e5259a Make background on characters and icons transparent. 2025-01-10 14:24:12 -05:00
nacabaro
eabf8770cc
Merge pull request #12 from cfogrady/IntegrateSecretsWithApp
Integrate secrets with app
2025-01-10 19:38:26 +01:00
nacabaro
da5e6c6628
Merge pull request #11 from cfogrady/SecretsRepo
Add Secrets Repo Using a Proto DataStore
2025-01-10 19:38:13 +01:00
nacabaro
4c0e2fafd0
Merge pull request #10 from cfogrady/APK_Import
APK Import
2025-01-10 19:38:01 +01:00
Christopher O'Grady
4529925906 Integrate SecretsRepository and ApkImporter with app
Refactor methods out of MainActivity into Controllers for ScanScreen and SettingsScreen
2025-01-10 13:21:53 -05:00
Christopher O'Grady
c456d455ef Implement Secrets Repository
Add proto plugin and dependencies
Create Secrets Proto
Create Secrets Proto DataStore
Replace old secrets with proto secrets
Fix importers and tests to use new proto secrets.
2025-01-09 15:24:10 -05:00
Christopher O'Grady
9871f0420f Verify Secret correctness as part of loading.
Improve tests
2025-01-08 22:12:03 -05:00
Christopher O'Grady
f4974c8705 Import APK in tests 2025-01-08 21:01:37 -05:00
nacabaro
5d6e3743f0
Merge pull request #9 from nacabaro/nfc/upload_mon_new_model
Removed unused imports that'd cause compile issues.
2025-01-08 02:37:01 +01:00
Nacho
b91da136df Removed unused imports that'd cause compile issues. 2025-01-08 02:34:46 +01:00
nacabaro
e4366ce15c
Merge pull request #8 from nacabaro/nfc/upload_mon_new_model
Nfc/upload mon new model
2025-01-08 02:33:22 +01:00
Nacho
7582f944b5 Forgot to actually remove the files, my bad 2025-01-08 02:32:13 +01:00
Nacho
a028611d8a More things:
- Improved upload function to support VB (still to do to add VB)
- Adapted to the latest version of the vb-nfc-reader library
- Added foreign keys with uploaded characters and existing dim database
- Removed the tempoorary objects
- Handled errors uploading (dim not existing for now and VB not supported yet)
- Improved bitmap conversion by moving it to it's own composable
  - Also added object to move bitmap data around
- Added DTO to read sprite data and character data simultaneously

Good night!
2025-01-08 02:31:36 +01:00
nacabaro
5edd753da1
Merge pull request #7 from nacabaro/dim/read_cards
Read cards
2025-01-05 22:24:31 +01:00
Nacho
5691f998f2 Cleaned settings screen 2025-01-05 22:18:39 +01:00
Nacho
4e2b9eb541 Fixed flickering and banner overlapping 2025-01-05 18:13:41 +01:00
Nacho
19fbed0ef2 More things!
- Started slowly implementing the original model.
- Names are bitmaps, so we use that.
- Sprites are stored in RoomDB as bitmap.
- Can now import DiMs, need to implement BEms.
- Can also view all the sprites for all the DiMs and now you can view DiMs individually (these two are temporary).

Things to do next
- Use the new model when uploading characters from the watch.
- Figure out why my implementation of ABGR to BGRA isn't working (or something like that)
- Improve data retrieval from the database, maybe using flows and properly implemented view models. As of now the interface is quite flickery.
- Improve code that handles DiMs and BEms.

As for bugs
- Interface sometimes likes flickering a lot, need to figure out why
- I cannot for the life of me create transparent bitmaps... help!
- Something else I might be forgetting...

Going to continue working in this branch.
2025-01-05 17:38:12 +01:00
nacabaro
82292823d3
Merge pull request #6 from cfogrady/dim-reader-library
Import vb-dim-reader library
2025-01-05 10:50:04 +01:00
nacabaro
01e82a6a44
Merge pull request #5 from cfogrady/nfc-reader-from-maven
Pull Nfc Reader Library from dependency repo instead of as second module.
2025-01-05 10:49:39 +01:00
Christopher O'Grady
1e73f52da5 Add dim-reader library
Update readme to reflect
Add commented out sample code.
2025-01-04 23:46:13 -05:00
Christopher O'Grady
d9e492eb0e Add readme describing how to setup
Fix readme
2025-01-04 23:07:07 -05:00
Christopher O'Grady
5bd5fc3f74 Use nfc library from maven local instead of copied module. 2025-01-04 23:03:01 -05:00
Christopher O'Grady
3019560a26 Ignore keys file for now. 2025-01-04 22:47:13 -05:00
Christopher O'Grady
a01d0eba47 Ignore generated project files. 2025-01-04 22:45:35 -05:00
nacabaro
bc02689850
Merge pull request #4 from nacabaro/ui/get_character_details
Few things, again!
2025-01-05 02:12:44 +01:00
Nacho
e8f441ba2b Few things, again!
- From "Battles" to "Battle"
- Added a settings screen, to import keys and cards
- Added a way to access the settings from home
- Get character details
2025-01-05 01:58:08 +01:00
Nacho
59033e6459 Forgot to update some foreign key references... sorry! 2025-01-04 19:02:13 +01:00
nacabaro
4736202838
Merge pull request #2 from nacabaro/database/initialise
Database/initialise
2025-01-04 18:51:17 +01:00
Nacho
08e3b844a4 A few things here
- Adding new mons is working
- database is also working (añlthough we are using a temporary domain model)
- Insertion should be working too
- I used an appcontainer for the dependency injection, maybe this is not the best approach, but I don't really know any other approaches

Known bug:
- When inserting a new mon, you need to reload the app in order for the storage view to refresh correctly, I don't know what happens and why, probably because I did not create a proper ViewModel to accompany the storage part... currently this is very barebones, but it works!
2025-01-04 18:49:16 +01:00
Nacho
fbbb8f6ad1 Merge branch 'refs/heads/nfc/reading_character' into database/initialise 2025-01-04 17:35:50 +01:00
Nacho
859786c7f3 Updating database with temporary daos in order to have an MVP
Will be changing this to the pre-established model once I sort out DiM/BEM import
2025-01-04 16:51:11 +01:00
Nacho
2f0555484e Forgot to reset the state of the scan...
Thus making scan innaccessible
2025-01-04 16:47:25 +01:00
Nacho
2f4bc9dba6 Added temporary domain objects 2025-01-04 16:42:50 +01:00
nacabaro
aa0f4241ea
Merge pull request #1 from nacabaro/ui/main_screens
Added dummy screens plus icons
2025-01-04 16:12:07 +01:00
Nacho
e9eedb7429 Started working in database initialization NOT WORKING YET 2025-01-04 16:10:23 +01:00
Nacho
d40758dc02 Added ability to scan mons 2025-01-04 16:09:27 +01:00
Nacho
187ac970de Added dummy screens plus icons 2025-01-04 01:20:03 +01:00
Nacho
84a1c1af72 Initial commit 2025-01-04 01:12:57 +01:00
nacabaro
4e3ebd43f4
Initial commit 2025-01-04 01:09:13 +01:00