diff --git a/app/src/main/java/com/pixelized/rplexicon/data/model/CharacterSheet.kt b/app/src/main/java/com/pixelized/rplexicon/data/model/CharacterSheet.kt
index 430a552..45472e9 100644
--- a/app/src/main/java/com/pixelized/rplexicon/data/model/CharacterSheet.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/data/model/CharacterSheet.kt
@@ -95,22 +95,22 @@ data class CharacterSheet(
label = R.string.class_druid,
resourceId = "Forme sauvage",
resourceLabel = R.string.character_sheet_title_wild_shape,
- icon = R.drawable.ic_class_druid_24,
+ icon = R.drawable.icbg_class_druid,
),
FIGHTER(
id = "Guerrier",
label = R.string.class_fighter,
- icon = R.drawable.ic_class_fighter_24,
+ icon = R.drawable.icbg_class_fighter,
),
MONK(
id = "Moine",
label = R.string.class_monk,
- icon = R.drawable.ic_class_monk_24,
+ icon = R.drawable.icbg_class_monk,
),
PALADIN(
id = "Paladin",
label = R.string.class_paladin,
- icon = R.drawable.ic_class_paladin_24,
+ icon = R.drawable.icbg_class_paladin,
),
RANGER(
id = "Rodeur",
@@ -120,12 +120,12 @@ data class CharacterSheet(
ROGUE(
id = "Roublard",
label = R.string.class_rogue,
- icon = R.drawable.ic_class_rogue_24,
+ icon = R.drawable.icbg_class_rogue,
),
SORCERER(
id = "Ensorceleur",
label = R.string.class_sorcerer,
- icon = R.drawable.ic_class_sorcerer_24,
+ icon = R.drawable.icbg_class_sorcerer,
),
WARLOCK(
id = "Occultiste",
@@ -135,7 +135,7 @@ data class CharacterSheet(
WIZARD(
id = "Magicien",
label = R.string.class_wizard,
- icon = R.drawable.ic_class_wizard_24,
+ icon = R.drawable.icbg_class_wizard,
),
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/AuthenticationViewModel.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/AuthenticationViewModel.kt
index d4e82a3..378204e 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/AuthenticationViewModel.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/AuthenticationViewModel.kt
@@ -48,7 +48,7 @@ class AuthenticationViewModel @Inject constructor(
withContext(Dispatchers.Main) {
authenticationState.value = AuthenticationStateUio.Progress
}
- // login to goole.
+ // login to google.
val result = credentialManager.getCredential(
request = request,
context = activity,
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/landing/LandingItem.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/landing/LandingItem.kt
index 486161f..76500e6 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/landing/LandingItem.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/landing/LandingItem.kt
@@ -163,27 +163,27 @@ private fun LandingItemPreview(
fun landingItems() = listOf(
LandingItemUio(
- icon = R.drawable.ic_class_barbarian_24,
+ icon = R.drawable.icbg_class_barbarian,
title = "Brulkhai",
subTitle = "Barbare"
),
LandingItemUio(
- icon = R.drawable.ic_class_cleric_24,
+ icon = R.drawable.icbg_class_cleric,
title = "Léandre",
subTitle = "Clerc"
),
LandingItemUio(
- icon = R.drawable.ic_class_ranger_24,
+ icon = R.drawable.icbg_class_ranger,
title = "Nélia",
subTitle = "Rôdeur"
),
LandingItemUio(
- icon = R.drawable.ic_class_warlock_24,
+ icon = R.drawable.icbg_class_warlock,
title = "Tigrane",
subTitle = "Occultiste",
),
LandingItemUio(
- icon = R.drawable.ic_class_bard_24,
+ icon = R.drawable.icbg_class_bard,
title = "Unathana",
subTitle = "Barde",
),
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/landing/LandingScreen.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/landing/LandingScreen.kt
index 1f240e7..f3e055d 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/landing/LandingScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/landing/LandingScreen.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
@@ -108,7 +107,7 @@ private fun LandingContent(
scrollState: ScrollState = rememberScrollState(),
paddings: PaddingValues = PaddingValues(
start = 16.dp,
- top = MaterialTheme.lexicon.dimens.detailPadding,
+ top = 360.dp,
end = 16.dp,
bottom = 16.dp,
),
@@ -231,26 +230,42 @@ private fun LandingContent(
) {
LandingItem(
modifier = Modifier
- .height(128.dp)
- .weight(1f),
- imagePadding = PaddingValues(all = 24.dp),
+ .weight(1f)
+ .aspectRatio(ratio = 1f),
+ imagePadding = PaddingValues(
+ top = 8.dp,
+ start = 16.dp,
+ end = 16.dp,
+ bottom = 24.dp
+ ),
item = LandingItemUio(
title = stringResource(id = R.string.summary__title),
subTitle = null,
- icon = R.drawable.ic_crowned_skull_24,
+ icon = R.drawable.icbg_skull_b_unfaded,
),
+ backgroundFilter = null,
+ backgroundGradientFrom = 0.0f,
+ backgroundGradientTo = 0.5f,
onClick = onGameMaster,
)
LandingItem(
modifier = Modifier
- .height(128.dp)
- .weight(1f),
- imagePadding = PaddingValues(all = 24.dp),
+ .weight(1f)
+ .aspectRatio(ratio = 1f),
+ imagePadding = PaddingValues(
+ top = 8.dp,
+ start = 16.dp,
+ end = 16.dp,
+ bottom = 24.dp
+ ),
item = LandingItemUio(
title = stringResource(id = R.string.default_search_label),
subTitle = null,
- icon = R.drawable.ic_baseline_search_24,
+ icon = R.drawable.icbg_magnifying_glass,
),
+ backgroundFilter = null,
+ backgroundGradientFrom = 0.0f,
+ backgroundGradientTo = 0.5f,
onClick = onSearch,
)
Spacer(modifier = Modifier.weight(1f))
@@ -270,38 +285,62 @@ private fun LandingContent(
) {
LandingItem(
modifier = Modifier
- .height(128.dp)
- .weight(1f),
- imagePadding = PaddingValues(all = 24.dp),
+ .weight(1f)
+ .aspectRatio(ratio = 1f),
+ imagePadding = PaddingValues(
+ top = 8.dp,
+ start = 16.dp,
+ end = 16.dp,
+ bottom = 24.dp
+ ),
item = LandingItemUio(
title = stringResource(id = R.string.lexicon_list__title),
subTitle = null,
- icon = R.drawable.ic_visored_helm_24,
+ icon = R.drawable.icbg_book_note_k,
),
+ backgroundFilter = null,
+ backgroundGradientFrom = 0.0f,
+ backgroundGradientTo = 0.5f,
onClick = onLexicon,
)
LandingItem(
modifier = Modifier
- .height(128.dp)
- .weight(1f),
- imagePadding = PaddingValues(all = 24.dp),
+ .weight(1f)
+ .aspectRatio(ratio = 1f),
+ imagePadding = PaddingValues(
+ top = 8.dp,
+ start = 16.dp,
+ end = 16.dp,
+ bottom = 24.dp
+ ),
item = LandingItemUio(
title = stringResource(id = R.string.quest_list__title),
subTitle = null,
- icon = R.drawable.ic_scroll_unfurled_24,
+ icon = R.drawable.icbg_book_parchment_e,
),
+ backgroundFilter = null,
+ backgroundGradientFrom = 0.0f,
+ backgroundGradientTo = 0.5f,
onClick = onQuest,
)
LandingItem(
modifier = Modifier
- .height(128.dp)
- .weight(1f),
- imagePadding = PaddingValues(all = 24.dp),
+ .weight(1f)
+ .aspectRatio(ratio = 1f),
+ imagePadding = PaddingValues(
+ top = 8.dp,
+ start = 16.dp,
+ end = 16.dp,
+ bottom = 24.dp
+ ),
item = LandingItemUio(
title = stringResource(id = R.string.location_list__title),
subTitle = null,
- icon = R.drawable.ic_treasure_map_24,
+ icon = R.drawable.icbg_map_world_a,
),
+ backgroundFilter = null,
+ backgroundGradientFrom = 0.0f,
+ backgroundGradientTo = 0.5f,
onClick = onMap,
)
}
@@ -346,8 +385,8 @@ private fun Modifier.magic(): Modifier = composed {
}
@Composable
-@Preview(uiMode = UI_MODE_NIGHT_NO)
-@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Preview(uiMode = UI_MODE_NIGHT_NO, heightDp = 1200)
+@Preview(uiMode = UI_MODE_NIGHT_YES, heightDp = 1200)
private fun LandingPreview() {
LexiconTheme {
Surface {
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/composable/ClassHeaderSummary.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/composable/ClassHeaderSummary.kt
index 3aa1748..f8147a2 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/composable/ClassHeaderSummary.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/composable/ClassHeaderSummary.kt
@@ -13,11 +13,14 @@ import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Icon
@@ -97,11 +100,15 @@ fun ClassHeaderSummary(
) {
header.classes.forEach {
IconButton(
- modifier = Modifier.width(MaterialTheme.lexicon.dimens.summary.cell.width),
+ modifier = Modifier.width(
+ width = MaterialTheme.lexicon.dimens.summary.cell.width,
+ ),
onClick = { onClass(it.value) },
) {
- Icon(
- modifier = Modifier.width(MaterialTheme.lexicon.dimens.summary.cell.width),
+ Image(
+ modifier = Modifier
+ .width(width = MaterialTheme.lexicon.dimens.summary.cell.width)
+ .aspectRatio(ratio = 1f),
painter = painterResource(id = it.value.icon),
contentDescription = null,
)
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/composable/preview/statistic/rememberClassHeaderSummary.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/composable/preview/statistic/rememberClassHeaderSummary.kt
index 6e28614..0bff155 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/composable/preview/statistic/rememberClassHeaderSummary.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/composable/preview/statistic/rememberClassHeaderSummary.kt
@@ -15,7 +15,7 @@ fun rememberClassHeaderSummary(): ClassHeaderSummaryUio {
clazz1 = mutableStateOf(
ClassHeaderSummaryUio.Header(
label = "Brulkai",
- icon = R.drawable.ic_class_barbarian_24,
+ icon = R.drawable.icbg_class_barbarian,
)
),
dice1 = mutableStateOf(
@@ -27,7 +27,7 @@ fun rememberClassHeaderSummary(): ClassHeaderSummaryUio {
clazz2 = mutableStateOf(
ClassHeaderSummaryUio.Header(
label = "Léandre",
- icon = R.drawable.ic_class_cleric_24,
+ icon = R.drawable.icbg_class_cleric,
)
),
dice2 = mutableStateOf(
@@ -38,7 +38,7 @@ fun rememberClassHeaderSummary(): ClassHeaderSummaryUio {
clazz3 = mutableStateOf(
ClassHeaderSummaryUio.Header(
label = "Nélia",
- icon = R.drawable.ic_class_ranger_24,
+ icon = R.drawable.icbg_class_ranger,
)
),
dice3 = mutableStateOf(
@@ -49,7 +49,7 @@ fun rememberClassHeaderSummary(): ClassHeaderSummaryUio {
clazz4 = mutableStateOf(
ClassHeaderSummaryUio.Header(
label = "Tigrane",
- icon = R.drawable.ic_class_warlock_24,
+ icon = R.drawable.icbg_class_warlock,
)
),
dice4 = mutableStateOf(
@@ -61,7 +61,7 @@ fun rememberClassHeaderSummary(): ClassHeaderSummaryUio {
clazz5 = mutableStateOf(
ClassHeaderSummaryUio.Header(
label = "Unathana",
- icon = R.drawable.ic_class_bard_24,
+ icon = R.drawable.icbg_class_bard,
)
),
dice5 = mutableStateOf(
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/StatisticSummary.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/StatisticSummary.kt
index b9575b9..5492e56 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/StatisticSummary.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/StatisticSummary.kt
@@ -100,7 +100,7 @@ fun StatisticSummary(
verticalArrangement = Arrangement.spacedBy(space = 8.dp),
) {
AnimatedVisibility(
- modifier = Modifier.padding(top = 96.dp + 8.dp),
+ modifier = Modifier.padding(top = 92.dp + 8.dp),
visible = summary.statsVisibility.value,
enter = enterTransition(),
) {
diff --git a/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/string/StringEx+Icon.kt b/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/string/StringEx+Icon.kt
index ece121a..de22c3f 100644
--- a/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/string/StringEx+Icon.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/string/StringEx+Icon.kt
@@ -64,9 +64,9 @@ private object ResourcesCache {
"Cape de protection" to R.drawable.icbg_cloak_of_protection_unfaded,
"Armure d'écailles" to R.drawable.icbg_scale_mail_unfaded,
"Armure de cuir" to R.drawable.icbg_leather_armour_rogue_unfaded,
- "Avantage" to R.drawable.ic_advantage,
- "Désavantage" to R.drawable.ic_disadvantage,
- "Emphase" to R.drawable.ic_emphase,
+ "Avantage" to R.drawable.ic_dice_advantage,
+ "Désavantage" to R.drawable.ic_dice_disadvantage,
+ "Emphase" to R.drawable.ic_dice_emphase,
"Touché par le néant" to R.drawable.icbg_partial_ceremorphosis,
"Amateurisme retrouvé" to R.drawable.icbg_iron_mind,
"Morsure de vampire" to R.drawable.icbg_bite,
diff --git a/app/src/main/res/drawable/ic_class_artificer_24.xml b/app/src/main/res/drawable/ic_class_artificer_24.xml
deleted file mode 100644
index c4b355c..0000000
--- a/app/src/main/res/drawable/ic_class_artificer_24.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_barbarian_24.xml b/app/src/main/res/drawable/ic_class_barbarian_24.xml
deleted file mode 100644
index 4c6f20a..0000000
--- a/app/src/main/res/drawable/ic_class_barbarian_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_bard_24.xml b/app/src/main/res/drawable/ic_class_bard_24.xml
deleted file mode 100644
index 643eb8c..0000000
--- a/app/src/main/res/drawable/ic_class_bard_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_cleric_24.xml b/app/src/main/res/drawable/ic_class_cleric_24.xml
deleted file mode 100644
index 419cc95..0000000
--- a/app/src/main/res/drawable/ic_class_cleric_24.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_druid_24.xml b/app/src/main/res/drawable/ic_class_druid_24.xml
deleted file mode 100644
index ce1396f..0000000
--- a/app/src/main/res/drawable/ic_class_druid_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_fighter_24.xml b/app/src/main/res/drawable/ic_class_fighter_24.xml
deleted file mode 100644
index 927bc0b..0000000
--- a/app/src/main/res/drawable/ic_class_fighter_24.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_monk_24.xml b/app/src/main/res/drawable/ic_class_monk_24.xml
deleted file mode 100644
index 9048587..0000000
--- a/app/src/main/res/drawable/ic_class_monk_24.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_paladin_24.xml b/app/src/main/res/drawable/ic_class_paladin_24.xml
deleted file mode 100644
index 4471ad3..0000000
--- a/app/src/main/res/drawable/ic_class_paladin_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_ranger_24.xml b/app/src/main/res/drawable/ic_class_ranger_24.xml
deleted file mode 100644
index 9728590..0000000
--- a/app/src/main/res/drawable/ic_class_ranger_24.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_rogue_24.xml b/app/src/main/res/drawable/ic_class_rogue_24.xml
deleted file mode 100644
index b73cce7..0000000
--- a/app/src/main/res/drawable/ic_class_rogue_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_sorcerer_24.xml b/app/src/main/res/drawable/ic_class_sorcerer_24.xml
deleted file mode 100644
index a67c999..0000000
--- a/app/src/main/res/drawable/ic_class_sorcerer_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_warlock_24.xml b/app/src/main/res/drawable/ic_class_warlock_24.xml
deleted file mode 100644
index 006c416..0000000
--- a/app/src/main/res/drawable/ic_class_warlock_24.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_class_wizard_24.xml b/app/src/main/res/drawable/ic_class_wizard_24.xml
deleted file mode 100644
index 01166ae..0000000
--- a/app/src/main/res/drawable/ic_class_wizard_24.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_advantage.webp b/app/src/main/res/drawable/ic_dice_advantage.webp
similarity index 100%
rename from app/src/main/res/drawable/ic_advantage.webp
rename to app/src/main/res/drawable/ic_dice_advantage.webp
diff --git a/app/src/main/res/drawable/ic_disadvantage.webp b/app/src/main/res/drawable/ic_dice_disadvantage.webp
similarity index 100%
rename from app/src/main/res/drawable/ic_disadvantage.webp
rename to app/src/main/res/drawable/ic_dice_disadvantage.webp
diff --git a/app/src/main/res/drawable/ic_emphase.webp b/app/src/main/res/drawable/ic_dice_emphase.webp
similarity index 100%
rename from app/src/main/res/drawable/ic_emphase.webp
rename to app/src/main/res/drawable/ic_dice_emphase.webp
diff --git a/app/src/main/res/drawable/icbg_battleaxe_plus_one_unfaded.png b/app/src/main/res/drawable/icbg_battleaxe_plus_one_unfaded.png
deleted file mode 100644
index 0ba659f..0000000
Binary files a/app/src/main/res/drawable/icbg_battleaxe_plus_one_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_battleaxe_plus_one_unfaded.webp b/app/src/main/res/drawable/icbg_battleaxe_plus_one_unfaded.webp
new file mode 100644
index 0000000..d62bbf1
Binary files /dev/null and b/app/src/main/res/drawable/icbg_battleaxe_plus_one_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_book_note_k.webp b/app/src/main/res/drawable/icbg_book_note_k.webp
new file mode 100644
index 0000000..cb1f3c2
Binary files /dev/null and b/app/src/main/res/drawable/icbg_book_note_k.webp differ
diff --git a/app/src/main/res/drawable/icbg_book_parchment_e.webp b/app/src/main/res/drawable/icbg_book_parchment_e.webp
new file mode 100644
index 0000000..2a2b7b1
Binary files /dev/null and b/app/src/main/res/drawable/icbg_book_parchment_e.webp differ
diff --git a/app/src/main/res/drawable/icbg_book_signedtradebisa_unfaded.png b/app/src/main/res/drawable/icbg_book_signedtradebisa_unfaded.png
deleted file mode 100644
index 0b175fc..0000000
Binary files a/app/src/main/res/drawable/icbg_book_signedtradebisa_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_book_signedtradebisa_unfaded.webp b/app/src/main/res/drawable/icbg_book_signedtradebisa_unfaded.webp
new file mode 100644
index 0000000..8cd7faa
Binary files /dev/null and b/app/src/main/res/drawable/icbg_book_signedtradebisa_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_barbarian.png b/app/src/main/res/drawable/icbg_class_barbarian.png
deleted file mode 100644
index d05e84a..0000000
Binary files a/app/src/main/res/drawable/icbg_class_barbarian.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_class_barbarian.webp b/app/src/main/res/drawable/icbg_class_barbarian.webp
new file mode 100644
index 0000000..1d1470e
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_barbarian.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_bard.png b/app/src/main/res/drawable/icbg_class_bard.png
deleted file mode 100644
index ec39063..0000000
Binary files a/app/src/main/res/drawable/icbg_class_bard.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_class_bard.webp b/app/src/main/res/drawable/icbg_class_bard.webp
new file mode 100644
index 0000000..1e1f6ce
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_bard.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_cleric.png b/app/src/main/res/drawable/icbg_class_cleric.png
deleted file mode 100644
index f75aad2..0000000
Binary files a/app/src/main/res/drawable/icbg_class_cleric.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_class_cleric.webp b/app/src/main/res/drawable/icbg_class_cleric.webp
new file mode 100644
index 0000000..6a00c44
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_cleric.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_druid.png b/app/src/main/res/drawable/icbg_class_druid.png
deleted file mode 100644
index 2f0f3a0..0000000
Binary files a/app/src/main/res/drawable/icbg_class_druid.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_class_druid.webp b/app/src/main/res/drawable/icbg_class_druid.webp
new file mode 100644
index 0000000..4f5b1f6
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_druid.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_fighter.webp b/app/src/main/res/drawable/icbg_class_fighter.webp
new file mode 100644
index 0000000..81a0997
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_fighter.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_monk.webp b/app/src/main/res/drawable/icbg_class_monk.webp
new file mode 100644
index 0000000..864804a
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_monk.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_paladin.webp b/app/src/main/res/drawable/icbg_class_paladin.webp
new file mode 100644
index 0000000..4e693ac
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_paladin.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_ranger.png b/app/src/main/res/drawable/icbg_class_ranger.png
deleted file mode 100644
index f7ae6f0..0000000
Binary files a/app/src/main/res/drawable/icbg_class_ranger.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_class_ranger.webp b/app/src/main/res/drawable/icbg_class_ranger.webp
new file mode 100644
index 0000000..5084e21
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_ranger.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_rogue.webp b/app/src/main/res/drawable/icbg_class_rogue.webp
new file mode 100644
index 0000000..0854bcd
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_rogue.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_sorcerer.webp b/app/src/main/res/drawable/icbg_class_sorcerer.webp
new file mode 100644
index 0000000..f67838a
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_sorcerer.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_warlock.png b/app/src/main/res/drawable/icbg_class_warlock.png
deleted file mode 100644
index f69dd85..0000000
Binary files a/app/src/main/res/drawable/icbg_class_warlock.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_class_warlock.webp b/app/src/main/res/drawable/icbg_class_warlock.webp
new file mode 100644
index 0000000..319e8ca
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_warlock.webp differ
diff --git a/app/src/main/res/drawable/icbg_class_wizard.webp b/app/src/main/res/drawable/icbg_class_wizard.webp
new file mode 100644
index 0000000..8ae22ba
Binary files /dev/null and b/app/src/main/res/drawable/icbg_class_wizard.webp differ
diff --git a/app/src/main/res/drawable/icbg_cloak_of_protection_unfaded.png b/app/src/main/res/drawable/icbg_cloak_of_protection_unfaded.png
deleted file mode 100644
index 73ae194..0000000
Binary files a/app/src/main/res/drawable/icbg_cloak_of_protection_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_cloak_of_protection_unfaded.webp b/app/src/main/res/drawable/icbg_cloak_of_protection_unfaded.webp
new file mode 100644
index 0000000..d502ecc
Binary files /dev/null and b/app/src/main/res/drawable/icbg_cloak_of_protection_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_dagger_unfaded.png b/app/src/main/res/drawable/icbg_dagger_unfaded.png
deleted file mode 100644
index bcf4a65..0000000
Binary files a/app/src/main/res/drawable/icbg_dagger_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_dagger_unfaded.webp b/app/src/main/res/drawable/icbg_dagger_unfaded.webp
new file mode 100644
index 0000000..5375d39
Binary files /dev/null and b/app/src/main/res/drawable/icbg_dagger_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_food_goodberry_unfaded.png b/app/src/main/res/drawable/icbg_food_goodberry_unfaded.png
deleted file mode 100644
index ef31429..0000000
Binary files a/app/src/main/res/drawable/icbg_food_goodberry_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_food_goodberry_unfaded.webp b/app/src/main/res/drawable/icbg_food_goodberry_unfaded.webp
new file mode 100644
index 0000000..637374d
Binary files /dev/null and b/app/src/main/res/drawable/icbg_food_goodberry_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_grn_holy_water_unfaded.png b/app/src/main/res/drawable/icbg_grn_holy_water_unfaded.png
deleted file mode 100644
index 4572465..0000000
Binary files a/app/src/main/res/drawable/icbg_grn_holy_water_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_grn_holy_water_unfaded.webp b/app/src/main/res/drawable/icbg_grn_holy_water_unfaded.webp
new file mode 100644
index 0000000..6cbf309
Binary files /dev/null and b/app/src/main/res/drawable/icbg_grn_holy_water_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_leather_armour_rogue_unfaded.png b/app/src/main/res/drawable/icbg_leather_armour_rogue_unfaded.png
deleted file mode 100644
index f89ddb4..0000000
Binary files a/app/src/main/res/drawable/icbg_leather_armour_rogue_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_leather_armour_rogue_unfaded.webp b/app/src/main/res/drawable/icbg_leather_armour_rogue_unfaded.webp
new file mode 100644
index 0000000..4a7d2fe
Binary files /dev/null and b/app/src/main/res/drawable/icbg_leather_armour_rogue_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_magnifying_glass.webp b/app/src/main/res/drawable/icbg_magnifying_glass.webp
new file mode 100644
index 0000000..fb022b1
Binary files /dev/null and b/app/src/main/res/drawable/icbg_magnifying_glass.webp differ
diff --git a/app/src/main/res/drawable/icbg_map_world_a.webp b/app/src/main/res/drawable/icbg_map_world_a.webp
new file mode 100644
index 0000000..2fa8b7d
Binary files /dev/null and b/app/src/main/res/drawable/icbg_map_world_a.webp differ
diff --git a/app/src/main/res/drawable/icbg_pot_potion_of_healing_unfaded.png b/app/src/main/res/drawable/icbg_pot_potion_of_healing_unfaded.png
deleted file mode 100644
index 48a1993..0000000
Binary files a/app/src/main/res/drawable/icbg_pot_potion_of_healing_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_pot_potion_of_healing_unfaded.webp b/app/src/main/res/drawable/icbg_pot_potion_of_healing_unfaded.webp
new file mode 100644
index 0000000..3a6d0da
Binary files /dev/null and b/app/src/main/res/drawable/icbg_pot_potion_of_healing_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_scale_mail_unfaded.png b/app/src/main/res/drawable/icbg_scale_mail_unfaded.png
deleted file mode 100644
index 49bdd82..0000000
Binary files a/app/src/main/res/drawable/icbg_scale_mail_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_scale_mail_unfaded.webp b/app/src/main/res/drawable/icbg_scale_mail_unfaded.webp
new file mode 100644
index 0000000..afe6907
Binary files /dev/null and b/app/src/main/res/drawable/icbg_scale_mail_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_scroll_of_bless_unfaded.png b/app/src/main/res/drawable/icbg_scroll_of_bless_unfaded.png
deleted file mode 100644
index fc37ada..0000000
Binary files a/app/src/main/res/drawable/icbg_scroll_of_bless_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_scroll_of_bless_unfaded.webp b/app/src/main/res/drawable/icbg_scroll_of_bless_unfaded.webp
new file mode 100644
index 0000000..61c5830
Binary files /dev/null and b/app/src/main/res/drawable/icbg_scroll_of_bless_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_skull_b_unfaded.webp b/app/src/main/res/drawable/icbg_skull_b_unfaded.webp
new file mode 100644
index 0000000..decd27c
Binary files /dev/null and b/app/src/main/res/drawable/icbg_skull_b_unfaded.webp differ
diff --git a/app/src/main/res/drawable/icbg_studded_shield_unfaded.png b/app/src/main/res/drawable/icbg_studded_shield_unfaded.png
deleted file mode 100644
index 9a32e09..0000000
Binary files a/app/src/main/res/drawable/icbg_studded_shield_unfaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icbg_studded_shield_unfaded.webp b/app/src/main/res/drawable/icbg_studded_shield_unfaded.webp
new file mode 100644
index 0000000..ab84e9c
Binary files /dev/null and b/app/src/main/res/drawable/icbg_studded_shield_unfaded.webp differ