Commit Graph

Select branches

Hide Pull Requests

card/card_management

card/import_more

cleanup

database/adventure

database/get_all_sprites

database/initialise

database/items

db/data_export

dex/functionality

dex/possible_fusions

dim/read_cards

logger

main

navigation/animations

nfc/reading_character

nfc/upload_mon_new_model

revert-merge-vitalwear

screen/upload_screen

specialMissions/fix

store/updated_store

ui/cardIcon

ui/get_character_details

ui/home_screen

ui/main_screens

vb/nfc_compat

vb/special_missions

widget

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#41

#42

#43

#44

#46

#47

#49

#5

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#64

#7

#8

#9

prerelease

v0.2-pre

v0.3-pre

v0.4-pre

v0.4.1-pre

v0.5-pre

v0.5.1-pre

v0.5.2-pre

v0.6-pre

v0.6.1-pre

v0.6.2-pre

v0.6.3-pre

v0.6.4-pre

v0.6.5-pre

v0.6.5.1-pre

Mono Color

• d749af0a9c
  Merge pull request #27 from cfogrady/FixStageAndAttributeFromCharacter nacabaro 2025-04-08 15:35:13 +02:00
• 076f6bfacf Fix stage and attribute coming from character instead of UserCharacter Christopher O'Grady 2025-04-05 20:31:03 -04:00
• a4f3b701e5
  Merge pull request #26 from cfogrady/RemoveDuplicatedData nacabaro 2025-03-22 00:34:07 +01:00
• da134247b1 Remove duplicated stage and attribute from UserCharacter Christopher O'Grady 2025-03-19 15:33:52 -04:00
• 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 Nacho 2025-02-10 17:44:13 +01:00
• e36a700d9f
  Merge pull request #25 from nacabaro/database/adventure nacabaro 2025-01-26 02:01:24 +01:00
• 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 database/adventure Nacho 2025-01-26 01:59:43 +01:00
• 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. Nacho 2025-01-26 01:40:32 +01:00
• 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 Nacho 2025-01-26 01:25:25 +01:00
• 547318864b
  Merge pull request #24 from nacabaro/cleanup nacabaro 2025-01-21 13:35:43 +01:00
• 5e92895656 Made item icons a bit smaller in order to be similarly sized to character icons cleanup Nacho 2025-01-21 13:34:49 +01:00
• 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 Nacho 2025-01-21 13:28:13 +01:00
• 1a38cefb92
  Merge pull request #23 from nacabaro/cleanup nacabaro 2025-01-21 13:12:38 +01:00
• a974bd366e Moved read character from watch to its corresponding controller Nacho 2025-01-21 13:02:45 +01:00
• bb5f66d167 Moved import card logic outside of the MainActivity Nacho 2025-01-21 12:42:52 +01:00
• 09394871e5
  Merge pull request #22 from nacabaro/database/items nacabaro 2025-01-20 15:49:22 +01:00
• 972a640394 Added missing icons, ready to merge! database/items Nacho 2025-01-20 15:46:53 +01:00
• 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. Nacho 2025-01-20 15:23:40 +01:00
• b4a73031e7 Working items - Click on use item > then choose the mon you want to apply the item to Nacho 2025-01-20 14:45:28 +01:00
• 3e41f82273 Forgot to push the updated db Nacho 2025-01-20 00:29:07 +01:00
• f3740d4816 Here comes the train (with more things) - Updated available items - Created ItemsScreenController - Moved the ItemsScreen to keep code organized Nacho 2025-01-20 00:06:42 +01:00
• 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 Nacho 2025-01-19 13:41:50 +01:00
• 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 Nacho 2025-01-18 23:44:38 +01:00
• bc7a05ccd3
  Merge pull request #21 from nacabaro/db/data_export nacabaro 2025-01-18 16:02:29 +01:00
• 660dbaca19 Forgot to include the settingsscreencontroller interface my bad db/data_export Nacho 2025-01-18 16:01:42 +01:00
• b89dfb0df3
  Merge pull request #20 from nacabaro/db/data_export nacabaro 2025-01-18 12:11:58 +01:00
• 23e233227a Finished refactoring the old SettingsScreenController.kt Nacho 2025-01-18 12:05:10 +01:00
• 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. Nacho 2025-01-18 01:05:45 +01:00
• 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. Nacho 2025-01-18 00:45:16 +01:00
• 635be60cdb
  Merge pull request #19 from nacabaro/dex/functionality nacabaro 2025-01-17 21:21:35 +01:00
• 88163684ca Dex stuff - Added dex domain model, and rearranged class - Added dex functionality to the dex screen, and updated the corresponding controller dex/functionality Nacho 2025-01-17 21:12:41 +01:00
• 586d6c01ef
  Merge pull request #18 from nacabaro/ui/home_screen nacabaro 2025-01-16 01:05:29 +01:00
• 5d996edc1e
  Merge branch 'main' into ui/home_screen ui/home_screen nacabaro 2025-01-16 01:05:21 +01:00
• 074ced1082
  Merge pull request #17 from cfogrady/ObscuredDex nacabaro 2025-01-16 01:04:32 +01:00
• 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. Nacho 2025-01-16 01:03:57 +01:00
• 98bd74c544 Algorithm to obscure undiscovered digimon Christopher O'Grady 2025-01-12 21:36:02 -05:00
• ce1cf3eddb Quicm fix, DisposableEffect isn't reloading when isDoneSendCard is true Nacho 2025-01-12 13:50:41 +01:00
• 0bd745ac86
  Merge pull request #16 from nacabaro/ui/home_screen nacabaro 2025-01-12 10:23:49 +01:00
• 0d999925b5
  Merge pull request #14 from cfogrady/home_screen nacabaro 2025-01-12 10:23:09 +01:00
• dd893a08da
  Merge pull request #15 from nacabaro/ui/home_screen nacabaro 2025-01-12 10:22:57 +01:00
• c5e8236e19 Fix arrays for NFCCharacter Christopher O'Grady 2025-01-11 22:57:07 -05:00
• cac5198488 A few things, again... - Added ability to write character (incomplete) - Renamed BottomNavItem.kt to NavigationItems.kt, as it covers the entire application navigation, not just the bottom navigation bar - Modified the ScanScreenController and the Impl to accomodate writing characters on the BE (need to do the VB later on) - Modified repositories to fetch data from the database and additional information needed to convert back to NfcCharacter - Function to convert to NfcCharacter Nacho 2025-01-12 00:57:34 +01:00
• 7f22650601
  Merge pull request #13 from cfogrady/TransparentBackground nacabaro 2025-01-10 23:10:04 +01:00
• 1088e5259a Make background on characters and icons transparent. Christopher O'Grady 2025-01-10 14:24:12 -05:00
• eabf8770cc
  Merge pull request #12 from cfogrady/IntegrateSecretsWithApp nacabaro 2025-01-10 19:38:26 +01:00
• da5e6c6628
  Merge pull request #11 from cfogrady/SecretsRepo nacabaro 2025-01-10 19:38:13 +01:00
• 4c0e2fafd0
  Merge pull request #10 from cfogrady/APK_Import nacabaro 2025-01-10 19:38:01 +01:00
• 4529925906 Integrate SecretsRepository and ApkImporter with app Christopher O'Grady 2025-01-10 13:21:53 -05:00
• c456d455ef Implement Secrets Repository Christopher O'Grady 2025-01-09 15:24:10 -05:00
• 9871f0420f Verify Secret correctness as part of loading. Christopher O'Grady 2025-01-08 22:12:03 -05:00
• f4974c8705 Import APK in tests Christopher O'Grady 2025-01-08 21:01:37 -05:00
• 5d6e3743f0
  Merge pull request #9 from nacabaro/nfc/upload_mon_new_model nacabaro 2025-01-08 02:37:01 +01:00
• b91da136df Removed unused imports that'd cause compile issues. nfc/upload_mon_new_model Nacho 2025-01-08 02:34:46 +01:00
• e4366ce15c
  Merge pull request #8 from nacabaro/nfc/upload_mon_new_model nacabaro 2025-01-08 02:33:22 +01:00
• 7582f944b5 Forgot to actually remove the files, my bad Nacho 2025-01-08 02:32:13 +01:00
• 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 Nacho 2025-01-08 02:31:36 +01:00
• 5edd753da1
  Merge pull request #7 from nacabaro/dim/read_cards nacabaro 2025-01-05 22:24:31 +01:00
• 5691f998f2 Cleaned settings screen dim/read_cards Nacho 2025-01-05 22:18:39 +01:00
• 4e2b9eb541 Fixed flickering and banner overlapping Nacho 2025-01-05 18:13:41 +01:00
• 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). Nacho 2025-01-05 17:38:12 +01:00
• 82292823d3
  Merge pull request #6 from cfogrady/dim-reader-library nacabaro 2025-01-05 10:50:04 +01:00
• 01e82a6a44
  Merge pull request #5 from cfogrady/nfc-reader-from-maven nacabaro 2025-01-05 10:49:39 +01:00
• 1e73f52da5 Add dim-reader library Christopher O'Grady 2025-01-04 23:46:13 -05:00
• d9e492eb0e Add readme describing how to setup Christopher O'Grady 2025-01-04 23:07:07 -05:00
• 5bd5fc3f74 Use nfc library from maven local instead of copied module. Christopher O'Grady 2025-01-04 23:03:01 -05:00
• 3019560a26 Ignore keys file for now. Christopher O'Grady 2025-01-04 22:47:13 -05:00
• a01d0eba47 Ignore generated project files. Christopher O'Grady 2025-01-04 22:45:35 -05:00
• bc02689850
  Merge pull request #4 from nacabaro/ui/get_character_details nacabaro 2025-01-05 02:12:44 +01:00
• 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 ui/get_character_details Nacho 2025-01-05 01:58:08 +01:00
• 59033e6459 Forgot to update some foreign key references... sorry! Nacho 2025-01-04 19:02:13 +01:00
• 4736202838
  Merge pull request #2 from nacabaro/database/initialise nacabaro 2025-01-04 18:51:17 +01:00
• 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 database/initialise Nacho 2025-01-04 18:49:16 +01:00
• fbbb8f6ad1 Merge branch 'refs/heads/nfc/reading_character' into database/initialise Nacho 2025-01-04 17:35:50 +01:00
• 859786c7f3 Updating database with temporary daos in order to have an MVP Nacho 2025-01-04 16:51:11 +01:00
• 2f0555484e Forgot to reset the state of the scan... Thus making scan innaccessible nfc/reading_character Nacho 2025-01-04 16:47:25 +01:00
• 2f4bc9dba6 Added temporary domain objects Nacho 2025-01-04 16:42:50 +01:00
• aa0f4241ea
  Merge pull request #1 from nacabaro/ui/main_screens nacabaro 2025-01-04 16:12:07 +01:00
• e9eedb7429 Started working in database initialization NOT WORKING YET Nacho 2025-01-04 16:10:23 +01:00
• d40758dc02 Added ability to scan mons Nacho 2025-01-04 16:09:27 +01:00
• 187ac970de Added dummy screens plus icons ui/main_screens Nacho 2025-01-04 01:20:03 +01:00
• 84a1c1af72 Initial commit Nacho 2025-01-04 01:12:57 +01:00
• 4e3ebd43f4
  Initial commit nacabaro 2025-01-04 01:09:13 +01:00