Update groupd and deprecated functions

FreshKernel · Dec 9, 2023 · b2b153c · b2b153c
1 parent f00d4f6
commit b2b153c
Show file tree

Hide file tree

Showing 114 changed files with 476 additions and 497 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-jetbrains-compose = "1.5.10"
-kobweb = "0.15.0"
-kotlin = "1.9.20"
+jetbrains-compose = "1.5.11"
+kobweb = "0.15.2"
+kotlin = "1.9.21"
 
 [libraries]
 kobweb-api = { module = "com.varabyte.kobweb:kobweb-api", version.ref = "kobweb" }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,6 +6,6 @@ pluginManagement {
     }
 }
 
-rootProject.name = "alrayada_landing_page"
+rootProject.name = "AlrayadaLandingPage"
 
 include(":site")
diff --git a/site/build.gradle.kts b/site/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
     alias(libs.plugins.kobweb.application)
 }
 
-group = "com.ahmedhnewa.alrayada_landing_page"
+group = "net.freshplatform.alrayada_landing_page"
 version = "1.0-SNAPSHOT"
 
 val webDesc =
@@ -158,3 +158,5 @@ kotlin {
         }
     }
 }
+
+
diff --git a/...in/kotlin/com/ahmedhnewa/alrayada_landing_page/core/services/localization/Localization.kt b/...in/kotlin/com/ahmedhnewa/alrayada_landing_page/core/services/localization/Localization.kt
diff --git a/...otlin/com/ahmedhnewa/alrayada_landing_page/core/services/localization/LocalizationImpl.kt b/...otlin/com/ahmedhnewa/alrayada_landing_page/core/services/localization/LocalizationImpl.kt
diff --git a/site/src/jsMain/kotlin/com/ahmedhnewa/alrayada_landing_page/packages/fontawesome-free.kt b/site/src/jsMain/kotlin/com/ahmedhnewa/alrayada_landing_page/packages/fontawesome-free.kt
diff --git a/...jsMain/kotlin/com/ahmedhnewa/alrayada_landing_page/utils/extensions/ModifierExtensions.kt b/...jsMain/kotlin/com/ahmedhnewa/alrayada_landing_page/utils/extensions/ModifierExtensions.kt
diff --git a/...ahmedhnewa/alrayada_landing_page/MyApp.kt → ...shplatform/alrayada_landing_page/MyApp.kt b/...ahmedhnewa/alrayada_landing_page/MyApp.kt → ...shplatform/alrayada_landing_page/MyApp.kt
@@ -1,10 +1,7 @@
-package com.ahmedhnewa.alrayada_landing_page
+package net.freshplatform.alrayada_landing_page
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import com.ahmedhnewa.alrayada_landing_page.core.data.StringRes
-import com.ahmedhnewa.alrayada_landing_page.core.services.localization.getStringResource
-import com.ahmedhnewa.alrayada_landing_page.utils.updateDocument
 import com.varabyte.kobweb.compose.css.Overflow
 import com.varabyte.kobweb.compose.ui.Modifier
 import com.varabyte.kobweb.compose.ui.modifiers.*
@@ -17,7 +14,10 @@ import com.varabyte.kobweb.silk.components.style.common.SmoothColorStyle
 import com.varabyte.kobweb.silk.components.style.toModifier
 import com.varabyte.kobweb.silk.init.InitSilk
 import com.varabyte.kobweb.silk.init.InitSilkContext
-import com.varabyte.kobweb.silk.init.registerBaseStyle
+import com.varabyte.kobweb.silk.init.registerStyleBase
+import net.freshplatform.alrayada_landing_page.core.data.StringRes
+import net.freshplatform.alrayada_landing_page.core.services.localization.getStringResource
+import net.freshplatform.alrayada_landing_page.utils.updateDocument
 import org.jetbrains.compose.web.css.deg
 import org.jetbrains.compose.web.css.px
 import org.jetbrains.compose.web.css.rgba
@@ -36,19 +36,19 @@ fun initSilk(ctx: InitSilkContext) {
                 to { Modifier.rotate(360.deg) }
             }
         )
-        registerBaseStyle("body") {
+        registerStyleBase("body") {
             Modifier.fontFamily(
                 "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
                 "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "sans-serif"
             )
         }
-        registerBaseStyle(".visible") {
+        registerStyleBase(".visible") {
             Modifier
                 .height(300.px)
                 .fillMaxWidth()
                 .backgroundColor(rgba(128, 128, 128, 0.5))
         }
-        registerBaseStyle(".hidden") {
+        registerStyleBase(".hidden") {
             Modifier
                 .height(0.px)
                 .width(0.px)

diff --git a/...rayada_landing_page/components/AppLogo.kt → ...rayada_landing_page/components/AppLogo.kt b/...rayada_landing_page/components/AppLogo.kt → ...rayada_landing_page/components/AppLogo.kt
@@ -1,10 +1,10 @@
-package com.ahmedhnewa.alrayada_landing_page.components
+package net.freshplatform.alrayada_landing_page.components
 
 import androidx.compose.runtime.Composable
-import com.ahmedhnewa.alrayada_landing_page.components.core.MyImage
-import com.ahmedhnewa.alrayada_landing_page.core.data.StringRes
-import com.ahmedhnewa.alrayada_landing_page.core.services.localization.stringResource
-import com.ahmedhnewa.alrayada_landing_page.utils.constants.PublicRes
+import net.freshplatform.alrayada_landing_page.components.core.MyImage
+import net.freshplatform.alrayada_landing_page.core.data.StringRes
+import net.freshplatform.alrayada_landing_page.core.services.localization.stringResource
+import net.freshplatform.alrayada_landing_page.utils.constants.PublicRes
 import com.varabyte.kobweb.compose.ui.Modifier
 import com.varabyte.kobweb.compose.ui.modifiers.maxSize
 import org.jetbrains.compose.web.css.px

diff --git a/...anding_page/components/BackToTopButton.kt → ...anding_page/components/BackToTopButton.kt b/...anding_page/components/BackToTopButton.kt → ...anding_page/components/BackToTopButton.kt
@@ -1,9 +1,9 @@
-package com.ahmedhnewa.alrayada_landing_page.components
+package net.freshplatform.alrayada_landing_page.components
 
 import androidx.compose.runtime.*
-import com.ahmedhnewa.alrayada_landing_page.components.fa.FaArrowUp
-import com.ahmedhnewa.alrayada_landing_page.components.fa.IconSize
-import com.ahmedhnewa.alrayada_landing_page.models.ThemeColors
+import net.freshplatform.alrayada_landing_page.components.fa.FaArrowUp
+import net.freshplatform.alrayada_landing_page.components.fa.IconSize
+import net.freshplatform.alrayada_landing_page.models.ThemeColors
 import com.varabyte.kobweb.compose.css.CSSTransition
 import com.varabyte.kobweb.compose.css.Cursor
 import com.varabyte.kobweb.compose.css.FontWeight

diff --git a/...landing_page/components/CheckIndicator.kt → ...landing_page/components/CheckIndicator.kt b/...landing_page/components/CheckIndicator.kt → ...landing_page/components/CheckIndicator.kt
@@ -1,9 +1,9 @@
-package com.ahmedhnewa.alrayada_landing_page.components
+package net.freshplatform.alrayada_landing_page.components
 
 import androidx.compose.runtime.Composable
-import com.ahmedhnewa.alrayada_landing_page.components.fa.FaCheck
-import com.ahmedhnewa.alrayada_landing_page.components.fa.IconSize
-import com.ahmedhnewa.alrayada_landing_page.models.ThemeColors
+import net.freshplatform.alrayada_landing_page.components.fa.FaCheck
+import net.freshplatform.alrayada_landing_page.components.fa.IconSize
+import net.freshplatform.alrayada_landing_page.models.ThemeColors
 import com.varabyte.kobweb.compose.css.CSSTransition
 import com.varabyte.kobweb.compose.foundation.layout.Box
 import com.varabyte.kobweb.compose.ui.Modifier

diff --git a/...e/components/CircularProgressIndicator.kt → ...e/components/CircularProgressIndicator.kt b/...e/components/CircularProgressIndicator.kt → ...e/components/CircularProgressIndicator.kt
@@ -1,7 +1,7 @@
-package com.ahmedhnewa.alrayada_landing_page.components
+package net.freshplatform.alrayada_landing_page.components
 
 import androidx.compose.runtime.Composable
-import com.ahmedhnewa.alrayada_landing_page.models.ThemeColors
+import net.freshplatform.alrayada_landing_page.models.ThemeColors
 import com.varabyte.kobweb.compose.css.AnimationIterationCount
 import com.varabyte.kobweb.compose.css.CSSAnimation
 import com.varabyte.kobweb.compose.ui.Modifier

diff --git a/...ada_landing_page/components/LineStroke.kt → ...ada_landing_page/components/LineStroke.kt b/...ada_landing_page/components/LineStroke.kt → ...ada_landing_page/components/LineStroke.kt
@@ -1,7 +1,7 @@
-package com.ahmedhnewa.alrayada_landing_page.components
+package net.freshplatform.alrayada_landing_page.components
 
 import androidx.compose.runtime.Composable
-import com.ahmedhnewa.alrayada_landing_page.models.ThemeColors
+import net.freshplatform.alrayada_landing_page.models.ThemeColors
 import com.varabyte.kobweb.compose.foundation.layout.Box
 import com.varabyte.kobweb.compose.ui.Modifier
 import com.varabyte.kobweb.compose.ui.modifiers.backgroundColor

diff --git a/...landing_page/components/NavigationIcon.kt → ...landing_page/components/NavigationIcon.kt b/...landing_page/components/NavigationIcon.kt → ...landing_page/components/NavigationIcon.kt
@@ -1,10 +1,10 @@
-package com.ahmedhnewa.alrayada_landing_page.components
+package net.freshplatform.alrayada_landing_page.components
 
 import androidx.compose.runtime.Composable
-import com.ahmedhnewa.alrayada_landing_page.components.fa.FaCircle
-import com.ahmedhnewa.alrayada_landing_page.components.fa.IconSize
-import com.ahmedhnewa.alrayada_landing_page.components.fa.IconStyle
-import com.ahmedhnewa.alrayada_landing_page.models.ThemeColors
+import net.freshplatform.alrayada_landing_page.components.fa.FaCircle
+import net.freshplatform.alrayada_landing_page.components.fa.IconSize
+import net.freshplatform.alrayada_landing_page.components.fa.IconStyle
+import net.freshplatform.alrayada_landing_page.models.ThemeColors
 import com.varabyte.kobweb.compose.css.CSSTransition
 import com.varabyte.kobweb.compose.css.Cursor
 import com.varabyte.kobweb.compose.ui.Modifier

diff --git a/...a_landing_page/components/SectionTitle.kt → ...a_landing_page/components/SectionTitle.kt b/...a_landing_page/components/SectionTitle.kt → ...a_landing_page/components/SectionTitle.kt
@@ -1,11 +1,11 @@
-package com.ahmedhnewa.alrayada_landing_page.components
+package net.freshplatform.alrayada_landing_page.components
 
 import androidx.compose.runtime.*
-import com.ahmedhnewa.alrayada_landing_page.core.services.localization.stringResource
-import com.ahmedhnewa.alrayada_landing_page.models.HomePageSections
-import com.ahmedhnewa.alrayada_landing_page.models.ThemeColors
-import com.ahmedhnewa.alrayada_landing_page.utils.ObserveViewportEntered
-import com.ahmedhnewa.alrayada_landing_page.utils.constants.Constants
+import net.freshplatform.alrayada_landing_page.core.services.localization.stringResource
+import net.freshplatform.alrayada_landing_page.models.HomePageSections
+import net.freshplatform.alrayada_landing_page.models.ThemeColors
+import net.freshplatform.alrayada_landing_page.utils.ObserveViewportEntered
+import net.freshplatform.alrayada_landing_page.utils.constants.Constants
 import com.varabyte.kobweb.compose.css.CSSTransition
 import com.varabyte.kobweb.compose.css.FontWeight
 import com.varabyte.kobweb.compose.css.TextAlign

diff --git a/...da_landing_page/components/core/Button.kt → ...da_landing_page/components/core/Button.kt b/...da_landing_page/components/core/Button.kt → ...da_landing_page/components/core/Button.kt
@@ -1,7 +1,7 @@
-package com.ahmedhnewa.alrayada_landing_page.components.core
+package net.freshplatform.alrayada_landing_page.components.core
 
 import androidx.compose.runtime.Composable
-import com.ahmedhnewa.alrayada_landing_page.styles.MainButtonStyle
+import net.freshplatform.alrayada_landing_page.styles.MainButtonStyle
 import com.varabyte.kobweb.compose.ui.Modifier
 import com.varabyte.kobweb.compose.ui.modifiers.title
 import com.varabyte.kobweb.compose.ui.toAttrs

diff --git a/...da_landing_page/components/core/Center.kt → ...da_landing_page/components/core/Center.kt b/...da_landing_page/components/core/Center.kt → ...da_landing_page/components/core/Center.kt
@@ -1,4 +1,4 @@
-package com.ahmedhnewa.alrayada_landing_page.components.core
+package net.freshplatform.alrayada_landing_page.components.core
 
 import androidx.compose.runtime.Composable
 import com.varabyte.kobweb.compose.foundation.layout.Box

diff --git a/...a_landing_page/components/core/MyImage.kt → ...a_landing_page/components/core/MyImage.kt b/...a_landing_page/components/core/MyImage.kt → ...a_landing_page/components/core/MyImage.kt
@@ -1,4 +1,4 @@
-package com.ahmedhnewa.alrayada_landing_page.components.core
+package net.freshplatform.alrayada_landing_page.components.core
 
 import androidx.compose.runtime.Composable
 import com.varabyte.kobweb.compose.ui.Modifier

diff --git a/...alrayada_landing_page/components/fa/Fa.kt → ...alrayada_landing_page/components/fa/Fa.kt b/...alrayada_landing_page/components/fa/Fa.kt → ...alrayada_landing_page/components/fa/Fa.kt
@@ -1,4 +1,4 @@
-package com.ahmedhnewa.alrayada_landing_page.components.fa
+package net.freshplatform.alrayada_landing_page.components.fa
 
 import androidx.compose.runtime.Composable
 import com.varabyte.kobweb.compose.ui.Modifier

diff --git a/...ada_landing_page/components/fa/FaIcons.kt → ...ada_landing_page/components/fa/FaIcons.kt b/...ada_landing_page/components/fa/FaIcons.kt → ...ada_landing_page/components/fa/FaIcons.kt
@@ -1,4 +1,4 @@
-package com.ahmedhnewa.alrayada_landing_page.components.fa
+package net.freshplatform.alrayada_landing_page.components.fa
 
 import androidx.compose.runtime.Composable
 import com.varabyte.kobweb.compose.ui.Modifier

diff --git a/...anding_page/components/stars/RatingBar.kt → ...anding_page/components/stars/RatingBar.kt b/...anding_page/components/stars/RatingBar.kt → ...anding_page/components/stars/RatingBar.kt
@@ -1,4 +1,4 @@
-package com.ahmedhnewa.alrayada_landing_page.components.stars
+package net.freshplatform.alrayada_landing_page.components.stars
 
 import androidx.compose.runtime.Composable
 import com.varabyte.kobweb.compose.foundation.layout.Row

diff --git a/...landing_page/components/stars/StarIcon.kt → ...landing_page/components/stars/StarIcon.kt b/...landing_page/components/stars/StarIcon.kt → ...landing_page/components/stars/StarIcon.kt
@@ -1,10 +1,10 @@
-package com.ahmedhnewa.alrayada_landing_page.components.stars
+package net.freshplatform.alrayada_landing_page.components.stars
 
 import androidx.compose.runtime.Composable
-import com.ahmedhnewa.alrayada_landing_page.components.fa.FaStar
-import com.ahmedhnewa.alrayada_landing_page.components.fa.FaStarHalfStroke
-import com.ahmedhnewa.alrayada_landing_page.components.fa.IconSize
-import com.ahmedhnewa.alrayada_landing_page.components.fa.IconStyle
+import net.freshplatform.alrayada_landing_page.components.fa.FaStar
+import net.freshplatform.alrayada_landing_page.components.fa.FaStarHalfStroke
+import net.freshplatform.alrayada_landing_page.components.fa.IconSize
+import net.freshplatform.alrayada_landing_page.components.fa.IconStyle
 import com.varabyte.kobweb.compose.ui.Modifier
 import com.varabyte.kobweb.compose.ui.modifiers.color
 import org.jetbrains.compose.web.css.Color

diff --git a/...ayada_landing_page/core/data/StringRes.kt → ...ayada_landing_page/core/data/StringRes.kt b/...ayada_landing_page/core/data/StringRes.kt → ...ayada_landing_page/core/data/StringRes.kt
@@ -1,4 +1,4 @@
-package com.ahmedhnewa.alrayada_landing_page.core.data
+package net.freshplatform.alrayada_landing_page.core.data
 
 enum class StringRes(
     val en: String = "",

diff --git a/...ada_landing_page/core/router/AppRouter.kt → ...ada_landing_page/core/router/AppRouter.kt b/...ada_landing_page/core/router/AppRouter.kt → ...ada_landing_page/core/router/AppRouter.kt
@@ -1,4 +1,4 @@
-package com.ahmedhnewa.alrayada_landing_page.core.router
+package net.freshplatform.alrayada_landing_page.core.router
 
 object AppRouter {
     // Unfortunately we can't use those in the pages routeOverride, even though it's a constant in compile time

diff --git a/...vices/localization/ComposeLocalization.kt → ...vices/localization/ComposeLocalization.kt b/...vices/localization/ComposeLocalization.kt → ...vices/localization/ComposeLocalization.kt
@@ -1,9 +1,9 @@
-package com.ahmedhnewa.alrayada_landing_page.core.services.localization
+package net.freshplatform.alrayada_landing_page.core.services.localization
 
 import androidx.compose.runtime.Composable
-import com.ahmedhnewa.alrayada_landing_page.core.data.StringRes
-import com.ahmedhnewa.alrayada_landing_page.core.services.localization.Local.Arabic
-import com.ahmedhnewa.alrayada_landing_page.core.services.localization.Local.English
+import net.freshplatform.alrayada_landing_page.core.data.StringRes
+import net.freshplatform.alrayada_landing_page.core.services.localization.Local.Arabic
+import net.freshplatform.alrayada_landing_page.core.services.localization.Local.English
 import kotlinx.browser.document
 import kotlinx.browser.window
 import org.w3c.dom.HTMLElement

diff --git a/..._page/core/services/localization/Local.kt → ..._page/core/services/localization/Local.kt b/..._page/core/services/localization/Local.kt → ..._page/core/services/localization/Local.kt
@@ -1,4 +1,4 @@
-package com.ahmedhnewa.alrayada_landing_page.core.services.localization
+package net.freshplatform.alrayada_landing_page.core.services.localization
 
 import org.jetbrains.compose.web.attributes.DirType
 

diff --git a/...kotlin/net/freshplatform/alrayada_landing_page/core/services/localization/Localization.kt b/...kotlin/net/freshplatform/alrayada_landing_page/core/services/localization/Localization.kt
@@ -0,0 +1,7 @@
+package net.freshplatform.alrayada_landing_page.core.services.localization
+
+import net.freshplatform.alrayada_landing_page.core.data.StringRes
+
+interface Localization {
+    fun getLocalizedString(resValue: StringRes, locale: Local): String
+}
diff --git a/...in/net/freshplatform/alrayada_landing_page/core/services/localization/LocalizationImpl.kt b/...in/net/freshplatform/alrayada_landing_page/core/services/localization/LocalizationImpl.kt
@@ -0,0 +1,15 @@
+package net.freshplatform.alrayada_landing_page.core.services.localization
+
+import net.freshplatform.alrayada_landing_page.core.data.StringRes
+import net.freshplatform.alrayada_landing_page.core.services.localization.Local.Arabic
+import net.freshplatform.alrayada_landing_page.core.services.localization.Local.English
+
+class LocalizationImpl : Localization {
+    override fun getLocalizedString(resValue: StringRes, locale: Local): String {
+        return when (locale) {
+            English -> resValue.en
+            Arabic -> resValue.ar
+            else -> resValue.en
+        }
+    }
+}
diff --git a/...vices/localization/LocalizationService.kt → ...vices/localization/LocalizationService.kt b/...vices/localization/LocalizationService.kt → ...vices/localization/LocalizationService.kt
@@ -1,6 +1,6 @@
-package com.ahmedhnewa.alrayada_landing_page.core.services.localization
+package net.freshplatform.alrayada_landing_page.core.services.localization
 
-import com.ahmedhnewa.alrayada_landing_page.core.data.StringRes
+import net.freshplatform.alrayada_landing_page.core.data.StringRes
 
 class LocalizationService : Localization {
     private val service = LocalizationImpl()