diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9583301..1a8eedb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -107,7 +107,7 @@ dependencies { implementation("androidx.activity:activity-compose:1.9.1") // Compose - implementation("androidx.compose.ui:ui:1.6.8") + implementation("androidx.compose.ui:ui:1.7.0-rc01") implementation("androidx.compose.ui:ui-util:1.6.8") implementation("androidx.compose.ui:ui-graphics:1.6.8") implementation("androidx.compose.ui:ui-tooling-preview:1.6.8") @@ -143,7 +143,7 @@ dependencies { ) // Import the BoM for the Firebase platform - implementation(platform("com.google.firebase:firebase-bom:33.1.2")) + implementation(platform("com.google.firebase:firebase-bom:33.2.0")) implementation("com.google.firebase:firebase-crashlytics-ktx") implementation("com.google.firebase:firebase-analytics-ktx") implementation("com.google.firebase:firebase-auth-ktx") diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/CharacterSheetScreen.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/CharacterSheetScreen.kt index e73c714..91a6d69 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/CharacterSheetScreen.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/CharacterSheetScreen.kt @@ -359,7 +359,7 @@ private fun CharacterSheetContent( .fillMaxWidth() .pullRefresh(refreshState), state = pagerState, - beyondBoundsPageCount = 0, + beyondViewportPageCount = 0, verticalAlignment = Alignment.Top, pageContent = { page -> when (tabs.value[page]) { diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/ItemElementUioFactory.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/ItemElementUioFactory.kt index fd81961..66e04f0 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/ItemElementUioFactory.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/ItemElementUioFactory.kt @@ -28,7 +28,9 @@ class ItemElementUioFactory @Inject constructor() { ?.contains(other = filter, ignoreCase = true) == true val type = it.type.normalize() ?.contains(other = filter, ignoreCase = true) == true - name || type + val context = it.context.normalize() + ?.contains(other = filter, ignoreCase = true) == true + name || type || context } .sortedWith(compareBy(Collator.getInstance()) { it.fullName }) .sortedWith(compareBy(Collator.getInstance()) { it.type }) diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/inventory/InventoryPage.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/inventory/InventoryPage.kt index b1e79be..920c606 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/inventory/InventoryPage.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/inventory/InventoryPage.kt @@ -248,7 +248,7 @@ private fun InventoryContent( when (item) { is String -> CategoryHeader( modifier = Modifier - .animateItemPlacement() + .animateItem() .fillMaxWidth() .padding( start = 16.dp, diff --git a/app/src/main/java/com/pixelized/rplexicon/utilitary/ImageCache.kt b/app/src/main/java/com/pixelized/rplexicon/utilitary/ImageCache.kt index 26f5d5e..67b3522 100644 --- a/app/src/main/java/com/pixelized/rplexicon/utilitary/ImageCache.kt +++ b/app/src/main/java/com/pixelized/rplexicon/utilitary/ImageCache.kt @@ -10,12 +10,17 @@ object ImageCache { // https://bg3.wiki/wiki/Category:Controller_UI_Icons private val uri = mapOf( "https://bg3.wiki/w/images/0/00/GRN_Grease_Bottle_Unfaded.png" to R.drawable.icbg_grn_grease_bottle_unfaded, + "https://bg3.wiki/w/images/0/01/Darkvision_spell_Icon.webp" to R.drawable.icbg_darkvision_spell, "https://bg3.wiki/w/images/0/01/Instrument_PanFlute_Unfaded.png" to R.drawable.icbg_instrument_panflute_unfaded, "https://bg3.wiki/w/images/0/02/Shortsword_Unfaded.png" to R.drawable.icbg_shortsword_unfaded, + "https://bg3.wiki/w/images/0/03/Bone_Chill_Icon.webp" to R.drawable.icbg_bone_chill, + "https://bg3.wiki/w/images/0/03/Draconic_Ancestry_Brass_Fire_Icon.webp" to R.drawable.icbg_draconic_ancestry_brass_fire, + "https://bg3.wiki/w/images/0/04/Thunderwave_Icon.webp" to R.drawable.icbg_thunderwave, "https://bg3.wiki/w/images/0/07/Camp_Rich_G_Green_Unfaded.png" to R.drawable.icbg_camp_rich_g_green_unfaded, "https://bg3.wiki/w/images/0/07/Forest_Icon.webp" to R.drawable.icbg_forest, "https://bg3.wiki/w/images/0/08/Instrument_Lute_Unfaded.png" to R.drawable.icbg_instrument_lute_unfaded, "https://bg3.wiki/w/images/0/09/Multiattack_Defense_Icon.webp" to R.drawable.icbg_multiattack_defense, + "https://bg3.wiki/w/images/0/09/Silver_Pendant_Unfaded.png" to R.drawable.icbg_silver_pendant_unfaded, "https://bg3.wiki/w/images/0/0a/Bardic_Inspiration_Icon.webp" to R.drawable.icbg_bardic_inspiration, "https://bg3.wiki/w/images/0/0b/Warden_of_Vitality_Icon.webp" to R.drawable.icbg_warden_of_vitality, "https://bg3.wiki/w/images/0/0c/ELX_Tadpole_Elixir_Unfaded.png" to R.drawable.icbg_elk_tadpole_elixir_unfaded, @@ -23,6 +28,7 @@ object ImageCache { "https://bg3.wiki/w/images/0/0d/Darkvision_Icon.webp" to R.drawable.icbg_darkvision, "https://bg3.wiki/w/images/0/0f/Clutter_Bedroll_Unfaded.webp" to R.drawable.icbg_clutter_bedroll_unfaded, "https://bg3.wiki/w/images/1/12/Draconic_Ancestry_Copper_Acid_Icon.webp" to R.drawable.icbg_draconic_ancestry_copper_acid, + "https://bg3.wiki/w/images/1/12/Instrument_Flute_Unfaded.png" to R.drawable.icbg_instrument_flute_unfaded, "https://bg3.wiki/w/images/1/14/Spear_PlusOne_Unfaded.png" to R.drawable.icbg_shortsword_plusone_unfaded, "https://bg3.wiki/w/images/1/14/Spear_PlusOne_Unfaded.png" to R.drawable.icbg_spear_plusone_unfaded, "https://bg3.wiki/w/images/1/15/Silver_Ingot_Unfaded.png" to R.drawable.icbg_silver_ingot_unfaded, @@ -42,6 +48,7 @@ object ImageCache { "https://bg3.wiki/w/images/2/21/Partial_Ceremorphosis_Icon.webp" to R.drawable.icbg_partial_ceremorphosis, "https://bg3.wiki/w/images/2/21/Reckless_Attack_Icon.webp" to R.drawable.icbg_reckless_attack, "https://bg3.wiki/w/images/2/23/Heavy_Crossbow_Unfaded.png" to R.drawable.icbg_heavy_crossbow_unfaded, + "https://bg3.wiki/w/images/2/24/Command_Approach_Icon.webp" to R.drawable.icbg_command_approach, "https://bg3.wiki/w/images/2/24/Intimidating_Presence_Icon.webp" to R.drawable.icbg_intimidating_presence, "https://bg3.wiki/w/images/2/24/Speak_with_Animals_Icon.webp" to R.drawable.icbg_speak_with_animals, "https://bg3.wiki/w/images/2/27/Unarmoured_Defence_Barbarian_Icon.webp" to R.drawable.icbg_unarmoured_defence_barbarian, @@ -55,6 +62,7 @@ object ImageCache { "https://bg3.wiki/w/images/2/2e/GRN_Holy_Water_Unfaded.png" to R.drawable.icbg_grn_holy_water_unfaded, "https://bg3.wiki/w/images/2/2f/Chain_Shirt_3_Unfaded.png" to R.drawable.icbg_chain_shirt_3_unfaded, "https://bg3.wiki/w/images/3/34/Ancient_Grudges_Icon.webp" to R.drawable.icbg_ancient_grudges, + "https://bg3.wiki/w/images/3/35/Protection_from_Evil_and_Good_Icon.webp" to R.drawable.icbg_protection_from_evil_and_good, "https://bg3.wiki/w/images/3/36/Animal_Friendship_Icon.webp" to R.drawable.icbg_animal_friendship, "https://bg3.wiki/w/images/3/37/Quill_Unfaded.png" to R.drawable.icbg_quill_unfaded, "https://bg3.wiki/w/images/3/39/Backpack_A_Unfaded.webp" to R.drawable.icbg_backpack_a_unfaded, @@ -62,19 +70,24 @@ object ImageCache { "https://bg3.wiki/w/images/3/39/Mace_Unfaded.png" to R.drawable.icbg_mace_unfaded, "https://bg3.wiki/w/images/3/3a/Generic_Control_Icon.webp" to R.drawable.icbg_generic_control, "https://bg3.wiki/w/images/3/3a/Relentless_Endurance_Icon.webp" to R.drawable.icbg_relentless_endurance, + "https://bg3.wiki/w/images/3/3f/Thaumaturgy_Icon.webp" to R.drawable.icbg_thaumaturgy, "https://bg3.wiki/w/images/4/40/Cure_Wounds_Icon.webp" to R.drawable.icbg_cure_wounds, "https://bg3.wiki/w/images/4/40/Incense_Bowl_B_Unfaded.png" to R.drawable.icbg_incense_bowl_b_unfaded, "https://bg3.wiki/w/images/4/40/Unarmed_Strike_Icon.webp" to R.drawable.icbg_unarmed_strike, "https://bg3.wiki/w/images/4/41/Rapier_Unfaded.png" to R.drawable.icbg_rapier_unfaded, "https://bg3.wiki/w/images/4/42/Goodberry_Icon.webp" to R.drawable.icbg_goodberry, + "https://bg3.wiki/w/images/4/45/Grant_Flight_Icon.webp" to R.drawable.icbg_grant_flight, "https://bg3.wiki/w/images/4/45/Studded_Shield_Unfaded.png" to R.drawable.icbg_studded_shield_unfaded, "https://bg3.wiki/w/images/4/46/MISC_Arrow_Unfaded.png" to R.drawable.icbg_misc_arrow_unfaded, "https://bg3.wiki/w/images/4/46/POT_Potion_of_Greater_Healing_Unfaded.png" to R.drawable.icbg_potion_of_greater_healing_unfaded, "https://bg3.wiki/w/images/4/47/Enriched_Infernal_Iron_Unfaded.png" to R.drawable.icbg_enriched_infernal_iron_unfaded, + "https://bg3.wiki/w/images/4/47/Fey_Presence_Icon.webp" to R.drawable.icbg_fey_presence, "https://bg3.wiki/w/images/4/48/Bolstering_Magic_Boon_Icon.webp" to R.drawable.icbg_bolstering_magic_boon, "https://bg3.wiki/w/images/4/49/Arrow_of_Piercing_Unfaded.png" to R.drawable.icbg_arrow_of_piercing_unfaded, "https://bg3.wiki/w/images/4/4b/Daylight_Sphere_Icon.webp" to R.drawable.icbg_daylight_sphere, + "https://bg3.wiki/w/images/4/4c/Hellish_Resistance_Icon.webp" to R.drawable.icbg_hellish_resistance, "https://bg3.wiki/w/images/4/4c/Turn_Undead_Icon.webp" to R.drawable.icbg_turn_undead, + "https://bg3.wiki/w/images/4/4d/Crusader%27s_Mantle_Icon.webp" to R.drawable.icbg_crusaders_mantle, "https://bg3.wiki/w/images/4/4d/Uncanny_Dodge_Icon.webp" to R.drawable.icbg_uncanny_dodge, "https://bg3.wiki/w/images/4/4e/Feral_Instinct_Icon.webp" to R.drawable.icbg_feral_instinct, "https://bg3.wiki/w/images/4/4e/Leather_Pouch_Old_Unfaded.webp" to R.drawable.icbg_leather_pouch_old_unfaded, @@ -91,14 +104,18 @@ object ImageCache { "https://bg3.wiki/w/images/5/5c/Light_Icon.webp" to R.drawable.icbg_light, "https://bg3.wiki/w/images/5/5d/Battleaxe_PlusOne_Unfaded.png" to R.drawable.icbg_battleaxe_plus_one_unfaded, "https://bg3.wiki/w/images/5/5d/Protection_from_Missiles_Icon.webp" to R.drawable.icbg_protection_from_missiles, + "https://bg3.wiki/w/images/5/5f/Mirror_Unfaded.png" to R.drawable.icbg_mirror_unfaded, "https://bg3.wiki/w/images/5/5f/Soap_Bar_Unfaded.png" to R.drawable.icbg_soap_bar_unfaded, "https://bg3.wiki/w/images/6/60/Ensnaring_Strike_Ranged_Icon.webp" to R.drawable.icbg_ensnaring_strike_ranged, + "https://bg3.wiki/w/images/6/60/Hex_Charisma_Icon.webp" to R.drawable.icbg_hex_charisma, "https://bg3.wiki/w/images/6/61/Divine_Intervention_Sunder_the_Heretical_Icon.webp" to R.drawable.icbg_divine_intervention_sunder_the_heretical, + "https://bg3.wiki/w/images/6/62/Bane_Spell_Icon.webp" to R.drawable.icbg_bane_spell, "https://bg3.wiki/w/images/6/63/Bite_Icon.webp" to R.drawable.icbg_bite, "https://bg3.wiki/w/images/6/63/Dagger_PlusOne_Unfaded.png" to R.drawable.icbg_dagger_plusone_unfaded, "https://bg3.wiki/w/images/6/64/Book_Tome_W_Unfaded.png" to R.drawable.icbg_book_tome_w_unfaded, "https://bg3.wiki/w/images/6/66/Book_Parchment_I_Unfaded.png" to R.drawable.icbg_book_parchment_i_unfaded, "https://bg3.wiki/w/images/6/66/Flaming_Sphere_Icon.webp" to R.drawable.icbg_flaming_sphere, + "https://bg3.wiki/w/images/6/66/Vicious_Mockery_Icon.webp" to R.drawable.icbg_vicious_mockery, "https://bg3.wiki/w/images/6/68/Scale_Mail_Unfaded.png" to R.drawable.icbg_scale_mail_unfaded, "https://bg3.wiki/w/images/6/6d/Backpack_B_Unfaded.webp" to R.drawable.icbg_backpack_b_unfaded, "https://bg3.wiki/w/images/6/6e/FOOD_Goodberry_Unfaded.png" to R.drawable.icbg_food_goodberry_unfaded, @@ -109,20 +126,27 @@ object ImageCache { "https://bg3.wiki/w/images/7/74/Light_Crossbow_Unfaded.png" to R.drawable.icbg_light_crossbow_unfaded, "https://bg3.wiki/w/images/7/75/Friends_Icon.webp" to R.drawable.icbg_friends, "https://bg3.wiki/w/images/7/75/Hold_Person_Icon.webp" to R.drawable.icbg_hold_person, + "https://bg3.wiki/w/images/7/77/Armour_of_Agathys_Icon.webp" to R.drawable.icbg_armour_of_agathys, "https://bg3.wiki/w/images/7/77/Ink_Pot_Unfaded.png" to R.drawable.icbg_ink_pot_unfaded, "https://bg3.wiki/w/images/7/78/Book_Generic_D_Unfaded.png" to R.drawable.icbg_book_generic_d_unfaded, "https://bg3.wiki/w/images/7/78/POT_Potion_of_Supreme_Healing_Unfaded.png" to R.drawable.icbg_potion_of_supreme_healing_unfaded, + "https://bg3.wiki/w/images/7/78/Silence_Icon.webp" to R.drawable.icbg_silence, "https://bg3.wiki/w/images/7/78/VAL_MISC_Silver_Spoon_Unfaded.png" to R.drawable.icbg_val_misc_silver_spoon_unfaded, + "https://bg3.wiki/w/images/7/7a/Globe_of_Invulnerability_Icon.webp" to R.drawable.icbg_globe_of_invulnerability, "https://bg3.wiki/w/images/7/7c/GRN_Haste_Spore_Grenade_Unfaded.png" to R.drawable.icbg_haste_spore_grenade_unfaded, "https://bg3.wiki/w/images/7/7f/Guidance_Icon.webp" to R.drawable.icbg_guidance, "https://bg3.wiki/w/images/7/7f/Torch_Unfaded.png" to R.drawable.icbg_torch_unfaded, "https://bg3.wiki/w/images/8/81/Patient_Defence_Icon.webp" to R.drawable.icbg_patient_defence, + "https://bg3.wiki/w/images/8/82/Hellish_Rebuke_Icon.webp" to R.drawable.icbg_hellish_rebuke, "https://bg3.wiki/w/images/8/83/Aspect_of_the_Beast_Bear_Icon.webp" to R.drawable.icbg_aspect_of_the_beast_bear, "https://bg3.wiki/w/images/8/84/Savage_Attacks_Icon.webp" to R.drawable.icbg_savage_attacks, "https://bg3.wiki/w/images/8/85/Cloak_Of_Protection_Unfaded.png" to R.drawable.icbg_cloak_of_protection_unfaded, + "https://bg3.wiki/w/images/8/85/Vampiric_Touch_Icon.webp" to R.drawable.icbg_vampiric_touch, "https://bg3.wiki/w/images/8/89/Help_Icon.webp" to R.drawable.icbg_help, + "https://bg3.wiki/w/images/8/8b/Find_Familiar_Cat_Icon.webp" to R.drawable.icbg_find_familiar_cat, "https://bg3.wiki/w/images/8/8b/Key_Flower_B_Unfaded.png" to R.drawable.icbg_key_flower_b_unfaded, "https://bg3.wiki/w/images/8/8c/Book_Tome_O_Unfaded.png" to R.drawable.icbg_book_tome_o_unfaded, + "https://bg3.wiki/w/images/8/8c/Iron_Mind_Icon.webp" to R.drawable.icbg_iron_mind, "https://bg3.wiki/w/images/8/8e/Scorching_Ray_Icon.webp" to R.drawable.icbg_scorching_ray, "https://bg3.wiki/w/images/8/8f/Scroll_of_Bless_Unfaded.png" to R.drawable.icbg_scroll_of_bless_unfaded, "https://bg3.wiki/w/images/9/92/Bolt_of_Celestial_Light_Icon.webp" to R.drawable.icbg_bolt_of_celestial_light, @@ -132,28 +156,37 @@ object ImageCache { "https://bg3.wiki/w/images/9/98/Off-Hand_Attack_Melee_Icon.webp" to R.drawable.icbg_off_hand_attack_melee, "https://bg3.wiki/w/images/9/9a/Pike_PlusOne_Unfaded.png" to R.drawable.icbg_pike_plusone_unfaded, "https://bg3.wiki/w/images/9/9c/Magic_Weapon_Icon.webp" to R.drawable.icbg_magic_weapon, + "https://bg3.wiki/w/images/9/9d/Agonising_Blast_Icon.webp" to R.drawable.icbg_agonising_blast, + "https://bg3.wiki/w/images/9/9d/Minor_Illusion_Icon.webp" to R.drawable.icbg_minor_illusion, "https://bg3.wiki/w/images/9/9d/Rage_Bear_Heart_Icon.webp" to R.drawable.icbg_rage_bear_heart, "https://bg3.wiki/w/images/9/9e/Bed_Linen_Unfaded.png" to R.drawable.icbg_bed_linen_unfaded, "https://bg3.wiki/w/images/a/a0/Book_Note_J_Unfaded.png" to R.drawable.icbg_book_note_j_unfaded, "https://bg3.wiki/w/images/a/a1/Arrow_of_Many_Targets_Unfaded.png" to R.drawable.icbg_arrow_of_many_targets_unfaded, "https://bg3.wiki/w/images/a/a1/Faerie_Fire_Icon.webp" to R.drawable.icbg_faerie_fire, "https://bg3.wiki/w/images/a/a2/Healing_Radiance_Icon.webp" to R.drawable.icbg_healing_radiance, + "https://bg3.wiki/w/images/a/a3/Bardic_Defence_Icon.webp" to R.drawable.icbg_bardic_defence, "https://bg3.wiki/w/images/a/a6/Jeweled_Chest_B_Unfaded.webp" to R.drawable.icbg_jeweled_chest_b_unfaded, "https://bg3.wiki/w/images/a/a9/VAL_MISC_Incense_Pile_A_Unfaded.png" to R.drawable.icbg_val_misc_incense_pile_a_unfaded, "https://bg3.wiki/w/images/a/aa/Amulet_Necklace_A_Silver_A_Unfaded.png" to R.drawable.icbg_amulet_necklace_a_silver_a_unfaded, "https://bg3.wiki/w/images/a/ac/Book_Parchment_L_Unfaded.png" to R.drawable.icbg_book_parchment_l_unfaded, "https://bg3.wiki/w/images/a/ad/FOOD_Sourdough_Bread_Unfaded.png" to R.drawable.icbg_sourdough_bread_unfaded, + "https://bg3.wiki/w/images/a/ad/Plant_Growth_Icon.webp" to R.drawable.icbg_plant_growth, "https://bg3.wiki/w/images/b/b1/Longbow_Unfaded.png" to R.drawable.icbg_longbow_unfaded, + "https://bg3.wiki/w/images/b/b1/Song_of_Rest_Icon.webp" to R.drawable.icbg_song_of_rest, + "https://bg3.wiki/w/images/b/b3/Blink_Icon.webp" to R.drawable.icbg_blink, "https://bg3.wiki/w/images/b/b5/Dryad_Staff_Unfaded.png" to R.drawable.icbg_dryad_staff_unfaded, "https://bg3.wiki/w/images/b/b7/Book_Parchment_K_Unfaded.png" to R.drawable.icbg_book_parchment_k_unfaded, "https://bg3.wiki/w/images/b/bc/Charm_Person_Icon.webp" to R.drawable.icbg_charm_person, "https://bg3.wiki/w/images/b/bc/Clutter_Wooden_Bowl_Unfaded.webp" to R.drawable.icbg_clutter_wooden_bowl_unfaded, + "https://bg3.wiki/w/images/b/bd/Arrow_of_Slaying_Unfaded.png" to R.drawable.icbg_arrow_of_slaying_unfaded, "https://bg3.wiki/w/images/b/bd/Club_Unfaded.png" to R.drawable.icbg_club_unfaded, "https://bg3.wiki/w/images/b/bd/Nature%27s_Ward_Icon.webp" to R.drawable.icbg_natures_ward, "https://bg3.wiki/w/images/b/be/Cutting_Words_passive_feature_Icon.webp" to R.drawable.icbg_cutting_words_passive_feature, "https://bg3.wiki/w/images/b/bf/Gemless_Ring_Unfaded.png" to R.drawable.icbg_gemless_ring_unfaded, + "https://bg3.wiki/w/images/b/bf/Psionic_Suggestion_Hush_Icon.webp" to R.drawable.icbg_psionic_suggestion_hush, "https://bg3.wiki/w/images/c/c0/Keychain_Unfaded.png" to R.drawable.icbg_keychain_unfaded, "https://bg3.wiki/w/images/c/c1/Sanctuary_Icon.webp" to R.drawable.icbg_sanctuary, + "https://bg3.wiki/w/images/c/c3/Generic_Psychic_Icon.webp" to R.drawable.icbg_generic_psychic, "https://bg3.wiki/w/images/c/c3/Ranged_Attack_Icon.webp" to R.drawable.icbg_ranged_attack, "https://bg3.wiki/w/images/c/c4/Bless_Icon.webp" to R.drawable.icbg_bless, "https://bg3.wiki/w/images/c/c6/Pouch_A_Unfaded.webp" to R.drawable.icbg_pouch_a_unfaded, @@ -168,10 +201,12 @@ object ImageCache { "https://bg3.wiki/w/images/c/cf/Burning_Hands_Icon.webp" to R.drawable.icbg_burning_hands, "https://bg3.wiki/w/images/d/d1/Create_Water_Icon.webp" to R.drawable.icbg_create_water, "https://bg3.wiki/w/images/d/d4/Leather_Armour_Rogue_Unfaded.png" to R.drawable.icbg_leather_armour_rogue_unfaded, + "https://bg3.wiki/w/images/d/d5/Invisibility_Icon.webp" to R.drawable.icbg_invisibility, "https://bg3.wiki/w/images/d/d6/ALCH_Farsea_Marshwine_Unfaded.png" to R.drawable.icbg_alch_farsea_marshwine_unfaded, "https://bg3.wiki/w/images/d/d6/Javelin_Unfaded.png" to R.drawable.icbg_javelin_unfaded, "https://bg3.wiki/w/images/d/d6/Spirit_Guardians_Icon.webp" to R.drawable.icbg_spirit_guardians, "https://bg3.wiki/w/images/d/db/BOOK_SignedTradeVisa_Unfaded.png" to R.drawable.icbg_book_signedtradebisa_unfaded, + "https://bg3.wiki/w/images/d/db/Eldritch_Blast_Icon.webp" to R.drawable.icbg_eldritch_blast, "https://bg3.wiki/w/images/d/dc/ALCH_Ashaba_Dusk_Unfaded.png" to R.drawable.icbg_alch_ashaba_dusk_unfaded, "https://bg3.wiki/w/images/d/dd/Elaborate_Slate_Unfaded.png" to R.drawable.icbg_elaborate_slate_unfaded, "https://bg3.wiki/w/images/d/df/FOOD_Treacle_Tart_Unfaded.png" to R.drawable.icbg_food_treacle_tart_unfaded, @@ -186,7 +221,10 @@ object ImageCache { "https://bg3.wiki/w/images/f/f4/Cauldron_A_Unfaded.png" to R.drawable.icbg_cauldron_a_unfaded, "https://bg3.wiki/w/images/f/f5/Copper_Coin_Pile_Unfaded.png" to R.drawable.ic_copper_coin_pile_unfaded, "https://bg3.wiki/w/images/f/f6/Hunter%27s_Mark_Icon.webp" to R.drawable.icbg_hunters_mark, + "https://bg3.wiki/w/images/f/f7/Magic_Initiate_Bard_Icon.webp" to R.drawable.icbg_magic_initiate_bard, + "https://bg3.wiki/w/images/f/f9/Mage_Hand_Icon.webp" to R.drawable.icbg_mage_hand, "https://bg3.wiki/w/images/f/fb/Camp_Rich_B_Purple_Unfaded.png" to R.drawable.icbg_camp_rich_b_purple_unfaded, + "https://bg3.wiki/w/images/thumb/0/0a/Unshackling_Strike_Icon.webp/144px-Unshackling_Strike_Icon.webp.png" to R.drawable.icbg_unshackling_strike, "https://drive.google.com/uc?export=view&id=15D3Jum_X_nw4tWfbaLbEvhTQQbmYCMwf" to R.drawable.ic_dice_advantage, "https://drive.google.com/uc?export=view&id=17MrL-HAlpqPI5c6APjz5arGYrfma42on" to R.drawable.ic_drive_orc_mask, "https://drive.google.com/uc?export=view&id=1AeSHg792EwVbkjCNjJaqzC4v0uNj9NRn" to R.drawable.ic_drive_fire_starter, @@ -208,40 +246,7 @@ object ImageCache { "https://drive.google.com/uc?export=view&id=1WSpydN6AVjQrS6J_F8EFT00McQqCCxCw" to R.drawable.ic_drive_stake, "https://drive.google.com/uc?export=view&id=1ywDHw0C6exwxNCu-qNgQ0X2Sx9LfqSNH" to R.drawable.ic_drive_bird_skull, "https://drive.google.com/uc?export=view&id=1YYgZ2SlSn6TkRiphpIf62KgwTZWQZHQJ" to R.drawable.ic_drive_tome_of_strahd, - "https://bg3.wiki/w/images/0/01/Darkvision_spell_Icon.webp" to R.drawable.icbg_darkvision_spell, - "https://bg3.wiki/w/images/0/03/Bone_Chill_Icon.webp" to R.drawable.icbg_bone_chill, - "https://bg3.wiki/w/images/0/03/Draconic_Ancestry_Brass_Fire_Icon.webp" to R.drawable.icbg_draconic_ancestry_brass_fire, - "https://bg3.wiki/w/images/0/04/Thunderwave_Icon.webp" to R.drawable.icbg_thunderwave, - "https://bg3.wiki/w/images/2/24/Command_Approach_Icon.webp" to R.drawable.icbg_command_approach, - "https://bg3.wiki/w/images/3/35/Protection_from_Evil_and_Good_Icon.webp" to R.drawable.icbg_protection_from_evil_and_good, - "https://bg3.wiki/w/images/3/3f/Thaumaturgy_Icon.webp" to R.drawable.icbg_thaumaturgy, - "https://bg3.wiki/w/images/4/45/Grant_Flight_Icon.webp" to R.drawable.icbg_grant_flight, - "https://bg3.wiki/w/images/4/47/Fey_Presence_Icon.webp" to R.drawable.icbg_fey_presence, - "https://bg3.wiki/w/images/4/4c/Hellish_Resistance_Icon.webp" to R.drawable.icbg_hellish_resistance, - "https://bg3.wiki/w/images/4/4d/Crusader%27s_Mantle_Icon.webp" to R.drawable.icbg_crusaders_mantle, - "https://bg3.wiki/w/images/6/60/Hex_Charisma_Icon.webp" to R.drawable.icbg_hex_charisma, - "https://bg3.wiki/w/images/6/62/Bane_Spell_Icon.webp" to R.drawable.icbg_bane_spell, - "https://bg3.wiki/w/images/6/66/Vicious_Mockery_Icon.webp" to R.drawable.icbg_vicious_mockery, - "https://bg3.wiki/w/images/7/77/Armour_of_Agathys_Icon.webp" to R.drawable.icbg_armour_of_agathys, - "https://bg3.wiki/w/images/7/78/Silence_Icon.webp" to R.drawable.icbg_silence, - "https://bg3.wiki/w/images/7/7a/Globe_of_Invulnerability_Icon.webp" to R.drawable.icbg_globe_of_invulnerability, - "https://bg3.wiki/w/images/8/82/Hellish_Rebuke_Icon.webp" to R.drawable.icbg_hellish_rebuke, - "https://bg3.wiki/w/images/8/85/Vampiric_Touch_Icon.webp" to R.drawable.icbg_vampiric_touch, - "https://bg3.wiki/w/images/8/8b/Find_Familiar_Cat_Icon.webp" to R.drawable.icbg_find_familiar_cat, - "https://bg3.wiki/w/images/8/8c/Iron_Mind_Icon.webp" to R.drawable.icbg_iron_mind, - "https://bg3.wiki/w/images/9/9d/Agonising_Blast_Icon.webp" to R.drawable.icbg_agonising_blast, - "https://bg3.wiki/w/images/9/9d/Minor_Illusion_Icon.webp" to R.drawable.icbg_minor_illusion, - "https://bg3.wiki/w/images/a/a3/Bardic_Defence_Icon.webp" to R.drawable.icbg_bardic_defence, - "https://bg3.wiki/w/images/a/ad/Plant_Growth_Icon.webp" to R.drawable.icbg_plant_growth, - "https://bg3.wiki/w/images/b/b1/Song_of_Rest_Icon.webp" to R.drawable.icbg_song_of_rest, - "https://bg3.wiki/w/images/b/b3/Blink_Icon.webp" to R.drawable.icbg_blink, - "https://bg3.wiki/w/images/b/bf/Psionic_Suggestion_Hush_Icon.webp" to R.drawable.icbg_psionic_suggestion_hush, - "https://bg3.wiki/w/images/c/c3/Generic_Psychic_Icon.webp" to R.drawable.icbg_generic_psychic, - "https://bg3.wiki/w/images/d/d5/Invisibility_Icon.webp" to R.drawable.icbg_invisibility, - "https://bg3.wiki/w/images/d/db/Eldritch_Blast_Icon.webp" to R.drawable.icbg_eldritch_blast, - "https://bg3.wiki/w/images/f/f7/Magic_Initiate_Bard_Icon.webp" to R.drawable.icbg_magic_initiate_bard, - "https://bg3.wiki/w/images/f/f9/Mage_Hand_Icon.webp" to R.drawable.icbg_mage_hand, - "https://bg3.wiki/w/images/thumb/0/0a/Unshackling_Strike_Icon.webp/144px-Unshackling_Strike_Icon.webp.png" to R.drawable.icbg_unshackling_strike, + "https://drive.google.com/uc?export=view&id=1ambLD186agIOAQjoug6VPGSvOd1-ungj" to R.drawable.ic_drive_broken_mirror, ) fun cache(uri: Uri?): ImageUio = when (uri) { diff --git a/app/src/main/res/drawable/ic_drive_broken_mirror.webp b/app/src/main/res/drawable/ic_drive_broken_mirror.webp new file mode 100644 index 0000000..2f25b00 Binary files /dev/null and b/app/src/main/res/drawable/ic_drive_broken_mirror.webp differ diff --git a/app/src/main/res/drawable/icbg_arrow_of_slaying_unfaded.webp b/app/src/main/res/drawable/icbg_arrow_of_slaying_unfaded.webp new file mode 100644 index 0000000..f6508c6 Binary files /dev/null and b/app/src/main/res/drawable/icbg_arrow_of_slaying_unfaded.webp differ diff --git a/app/src/main/res/drawable/icbg_instrument_flute_unfaded.webp b/app/src/main/res/drawable/icbg_instrument_flute_unfaded.webp new file mode 100644 index 0000000..5270e11 Binary files /dev/null and b/app/src/main/res/drawable/icbg_instrument_flute_unfaded.webp differ diff --git a/app/src/main/res/drawable/icbg_mirror_unfaded.webp b/app/src/main/res/drawable/icbg_mirror_unfaded.webp new file mode 100644 index 0000000..a5b59cf Binary files /dev/null and b/app/src/main/res/drawable/icbg_mirror_unfaded.webp differ diff --git a/app/src/main/res/drawable/icbg_silver_pendant_unfaded.webp b/app/src/main/res/drawable/icbg_silver_pendant_unfaded.webp new file mode 100644 index 0000000..29fc48a Binary files /dev/null and b/app/src/main/res/drawable/icbg_silver_pendant_unfaded.webp differ