xanderlmk · xanderlmk · Jun 15, 2025 · Jun 15, 2025
diff --git a/app/src/main/assets/deck_content.html b/app/src/main/assets/deck_content.html
@@ -9,33 +9,44 @@
     <title>About this deck</title>
     <style>
         body {
-           margin: 0;
-           min-height: 100vh;
-           display: flex;
-           align-items: center;
-           justify-content: center;
-           text-align: center;
-           flex-direction: column;
+            margin: 0;
+            min-height: 100vh;
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            text-align: center;
+            flex-direction: column;
        }
 
-       .katex-render {
-           margin: auto;
-           font-size: 22px;
-           /* Additional styling if needed */
-       }
+        .katex-render {
+            margin: auto;
+            font-size: 22px;
+            /* Additional styling if needed */
+        }
 
-       .card-render {
-           box-sizing: border-box;
-           margin: auto;
-           font-size: 22px;
-           text-align: start;
-           width: 100%;
-           border-style: outset;
-           border-width: 2px;
-           padding: 0px 2px 0px 2px;
-           margin-top: 4px;
-           margin-bottom: 2px;
+        .card-render {
+            box-sizing: border-box;
+            margin: auto;
+            font-size: 22px;
+            text-align: start;
+            width: 100%;
+            border-style: outset;
+            border-width: 2px;
+            padding: 0px 2px 0px 2px;
+            margin-top: 4px;
+            margin-bottom: 2px;
         }
+        #deckTitle {
+            max-width: 95%;
+            word-wrap: break-word;
+            overflow-wrap: break-word;
+        }
+        #description {
+            max-width: 95%;
+            word-wrap: break-word;
+            overflow-wrap: break-word;
+       }
     </style>
 </head>
 <body>

diff --git a/app/src/main/java/com/belmontCrest/cardCrafter/DeepLinkerActivity.kt b/app/src/main/java/com/belmontCrest/cardCrafter/DeepLinkerActivity.kt
@@ -23,13 +23,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.lifecycleScope
 import com.belmontCrest.cardCrafter.model.application.AppViewModelProvider
-import com.belmontCrest.cardCrafter.model.uiModels.PreferencesManager
+import com.belmontCrest.cardCrafter.model.ui.PreferencesManager
 import com.belmontCrest.cardCrafter.supabase.controller.viewModels.DeepLinksViewModel
 import com.belmontCrest.cardCrafter.ui.theme.ColorSchemeClass
 import com.belmontCrest.cardCrafter.ui.theme.FlashcardsTheme
 import com.belmontCrest.cardCrafter.ui.theme.GetUIStyle
 import com.belmontCrest.cardCrafter.ui.theme.boxViewsModifier
-import com.belmontCrest.cardCrafter.uiFunctions.SubmitButton
+import com.belmontCrest.cardCrafter.uiFunctions.buttons.SubmitButton
 import kotlinx.coroutines.launch
 import kotlin.getValue
 

diff --git a/app/src/main/java/com/belmontCrest/cardCrafter/MainActivity.kt b/app/src/main/java/com/belmontCrest/cardCrafter/MainActivity.kt
@@ -21,8 +21,8 @@ import com.belmontCrest.cardCrafter.navigation.NavViewModel
 import com.belmontCrest.cardCrafter.navigation.navHosts.AppNavHost
 import com.belmontCrest.cardCrafter.controller.viewModels.cardViewsModels.EditingCardListViewModel
 import com.belmontCrest.cardCrafter.controller.viewModels.deckViewsModels.MainViewModel
-import com.belmontCrest.cardCrafter.model.uiModels.Fields
-import com.belmontCrest.cardCrafter.model.uiModels.PreferencesManager
+import com.belmontCrest.cardCrafter.model.ui.Fields
+import com.belmontCrest.cardCrafter.model.ui.PreferencesManager
 import com.belmontCrest.cardCrafter.supabase.controller.viewModels.SupabaseViewModel
 import com.belmontCrest.cardCrafter.ui.theme.FlashcardsTheme
 import io.github.jan.supabase.annotations.SupabaseInternal

diff --git a/app/src/main/java/com/belmontCrest/cardCrafter/ResetPasswordActivity.kt b/app/src/main/java/com/belmontCrest/cardCrafter/ResetPasswordActivity.kt
@@ -29,15 +29,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.lifecycleScope
 import com.belmontCrest.cardCrafter.model.application.AppViewModelProvider
-import com.belmontCrest.cardCrafter.model.uiModels.PreferencesManager
+import com.belmontCrest.cardCrafter.model.ui.PreferencesManager
 import com.belmontCrest.cardCrafter.supabase.controller.viewModels.DeepLinksViewModel
 import com.belmontCrest.cardCrafter.ui.theme.ColorSchemeClass
 import com.belmontCrest.cardCrafter.ui.theme.FlashcardsTheme
 import com.belmontCrest.cardCrafter.ui.theme.GetUIStyle
 import com.belmontCrest.cardCrafter.ui.theme.scrollableBoxViewModifier
 import com.belmontCrest.cardCrafter.uiFunctions.CustomText
 import com.belmontCrest.cardCrafter.uiFunctions.PasswordTextField
-import com.belmontCrest.cardCrafter.uiFunctions.SubmitButton
+import com.belmontCrest.cardCrafter.uiFunctions.buttons.SubmitButton
 import com.belmontCrest.cardCrafter.uiFunctions.showToastMessage
 import kotlinx.coroutines.launch
 import kotlin.getValue

diff --git a/...src/main/java/com/belmontCrest/cardCrafter/controller/cardHandlers/CTConversionHandler.kt b/...src/main/java/com/belmontCrest/cardCrafter/controller/cardHandlers/CTConversionHandler.kt
@@ -135,97 +135,44 @@ suspend fun redoACard(
          * (the redo card) hence we call this getRedoCard.
          */
         is CT.Basic -> {
-            ct.card = cardDeckVM.getRedoCardType(
-                ct.card.id,
-                index
-            ).also {
-                dueCTs[index] = ct
-            }
+            ct.card = cardDeckVM.getRedoCardType(ct.card.id, index).also { dueCTs[index] = ct }
         }
 
         is CT.Hint -> {
-            ct.card = cardDeckVM.getRedoCardType(
-                ct.card.id,
-                index
-            ).also {
-                dueCTs[index] = ct
-            }
+            ct.card = cardDeckVM.getRedoCardType(ct.card.id, index).also { dueCTs[index] = ct }
         }
 
         is CT.ThreeField -> {
-            ct.card = cardDeckVM.getRedoCardType(
-                ct.card.id,
-                index
-            ).also {
-                dueCTs[index] = ct
-            }
+            ct.card = cardDeckVM.getRedoCardType(ct.card.id, index).also { dueCTs[index] = ct }
         }
 
         is CT.MultiChoice -> {
-            ct.card = cardDeckVM.getRedoCardType(
-                ct.card.id,
-                index
-            ).also {
-                dueCTs[index] = ct
-            }
+            ct.card = cardDeckVM.getRedoCardType(ct.card.id, index).also { dueCTs[index] = ct }
         }
 
         is CT.Notation -> {
-            ct.card = cardDeckVM.getRedoCardType(
-                ct.card.id,
-                index
-            ).also {
-                dueCTs[index] = ct
-            }
+            ct.card = cardDeckVM.getRedoCardType(ct.card.id, index).also { dueCTs[index] = ct }
         }
     }
 }
 
 fun showReviewsLeft(ct: CT): String {
     return when (ct) {
-        is CT.Basic -> {
-            ct.card.reviewsLeft.toString()
-        }
-
-        is CT.Hint -> {
-            ct.card.reviewsLeft.toString()
-        }
-
-        is CT.ThreeField -> {
-            ct.card.reviewsLeft.toString()
-        }
-
-        is CT.MultiChoice -> {
-            ct.card.reviewsLeft.toString()
-        }
-
-        is CT.Notation -> {
-            ct.card.reviewsLeft.toString()
-        }
+        is CT.Basic -> ct.card.reviewsLeft.toString()
+        is CT.Hint -> ct.card.reviewsLeft.toString()
+        is CT.ThreeField -> ct.card.reviewsLeft.toString()
+        is CT.MultiChoice -> ct.card.reviewsLeft.toString()
+        is CT.Notation -> ct.card.reviewsLeft.toString()
     }
 }
 
 fun returnReviewsLeft(ct: CT): Int {
     return when (ct) {
-        is CT.Basic -> {
-            ct.card.reviewsLeft
-        }
-
-        is CT.Hint -> {
-            ct.card.reviewsLeft
-        }
-
-        is CT.ThreeField -> {
-            ct.card.reviewsLeft
-        }
-
-        is CT.MultiChoice -> {
-            ct.card.reviewsLeft
-        }
-
-        is CT.Notation -> {
-            ct.card.reviewsLeft
-        }
+        is CT.Basic -> ct.card.reviewsLeft
+        is CT.Hint -> ct.card.reviewsLeft
+        is CT.ThreeField -> ct.card.reviewsLeft
+        is CT.MultiChoice -> ct.card.reviewsLeft
+        is CT.Notation -> ct.card.reviewsLeft
     }
 }
 

diff --git a/app/src/main/java/com/belmontCrest/cardCrafter/controller/cardHandlers/CardTypeHandler.kt b/app/src/main/java/com/belmontCrest/cardCrafter/controller/cardHandlers/CardTypeHandler.kt
@@ -6,7 +6,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import com.belmontCrest.cardCrafter.localDatabase.tables.CT
-import com.belmontCrest.cardCrafter.model.uiModels.Fields
+import com.belmontCrest.cardCrafter.model.ui.Fields
 import com.belmontCrest.cardCrafter.navigation.NavViewModel
 import com.belmontCrest.cardCrafter.views.cardViews.editCardViews.EditBasicCard
 import com.belmontCrest.cardCrafter.views.cardViews.editCardViews.EditHintCard

diff --git a/.../main/java/com/belmontCrest/cardCrafter/controller/cardHandlers/CardUpdateErrorHandler.kt b/.../main/java/com/belmontCrest/cardCrafter/controller/cardHandlers/CardUpdateErrorHandler.kt
@@ -2,7 +2,7 @@ package com.belmontCrest.cardCrafter.controller.cardHandlers
 
 import android.database.sqlite.SQLiteConstraintException
 import android.database.sqlite.SQLiteException
-import com.belmontCrest.cardCrafter.model.uiModels.CardUpdateError
+import com.belmontCrest.cardCrafter.model.ui.CardUpdateError
 import kotlinx.coroutines.TimeoutCancellationException
 import java.io.IOException
 

diff --git a/app/src/main/java/com/belmontCrest/cardCrafter/controller/cardHandlers/CardUpdaterHandler.kt b/app/src/main/java/com/belmontCrest/cardCrafter/controller/cardHandlers/CardUpdaterHandler.kt
@@ -4,7 +4,7 @@ import com.belmontCrest.cardCrafter.controller.viewModels.cardViewsModels.CardDe
 import com.belmontCrest.cardCrafter.localDatabase.tables.Card
 import com.belmontCrest.cardCrafter.localDatabase.tables.Deck
 import com.belmontCrest.cardCrafter.localDatabase.tables.SavedCard
-import com.belmontCrest.cardCrafter.model.uiModels.CardState
+import com.belmontCrest.cardCrafter.model.ui.CardState
 import java.util.Calendar
 import java.util.Date