Skip to content

Commit

Permalink
progress 🙏 (looking for help: someone familiar with apple's HIG)
Browse files Browse the repository at this point in the history
  • Loading branch information
aenriii committed May 31, 2024
1 parent b851f0e commit ab9e8ce
Show file tree
Hide file tree
Showing 21 changed files with 159 additions and 57 deletions.
8 changes: 0 additions & 8 deletions .idea/artifacts/client_desktop_0_0_1.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/artifacts/genesisApi_desktop_0_0_1.xml

This file was deleted.

29 changes: 0 additions & 29 deletions .idea/gradle.xml

This file was deleted.

1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ compose-thirdparty-webview = { group = "io.github.kevinnzou", name = "compose-we

[plugins]
android-application = { id = "com.android.application", version.ref = "android" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-compose-plugin = { id = "org.jetbrains.compose", version.ref = "compose" }
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ include(":genesis:genesisApi")
include(":uninit:common")
include(":uninit:common-compose")
include(":uninit:consumable")
include(":uninit:ui")
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package uninit.common.compose.components

import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.ui.Modifier

@Composable
fun ApplicationTextField(
name: String,
initialValue: String = "",
onChange: (String) -> Unit,
modifier: Modifier = Modifier,
) {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package uninit.common.color.pallete

import uninit.common.color.RGBA

sealed class HumanInterfaceGuidelines(
val id: String,
val systemGray: RGBA,
val systemGray2: RGBA,
val systemGray3: RGBA,
val systemGray4: RGBA,
val systemGray5: RGBA,
val systemGray6: RGBA,
val red: RGBA,
val orange: RGBA,
val yellow: RGBA,
val green: RGBA,
val mint: RGBA,
val teal: RGBA,
val cyan: RGBA,
val blue: RGBA,
val indigo: RGBA,
val purple: RGBA,
val pink: RGBA,
val brown: RGBA,
val gray: RGBA,
)
88 changes: 88 additions & 0 deletions uninit/ui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
@Suppress("DSL_SCOPE_VIOLATION")
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlinx.serialization)
`maven-publish`
}

kotlin {

androidTarget {
publishLibraryVariants("release")
}
jvm("desktop")
iosArm64().binaries.framework {
baseName = "uninitUi"
}

sourceSets {
val commonMain by getting {
dependencies {
api(libs.compose.runtime)
api(libs.compose.foundation)
api(libs.compose.material3)
api(project(":uninit:common"))
implementation(libs.serialization.json)
implementation(libs.kotlinx.coroutines.core)
}
resources.srcDirs("resources")
}

val commonTest by getting {
dependencies {
implementation(kotlin("test"))
}
}
val jvmMain by creating {
dependencies {
implementation(libs.jvm.gson)
}
dependsOn(commonMain)
}
val desktopMain by getting {
dependsOn(jvmMain)
}
val androidMain by getting {
dependsOn(jvmMain)
}
}
}

android {
compileSdk = (findProperty("android.compileSdk") as String).toInt()
namespace = "uninit.common"

sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")

defaultConfig {
minSdk = (findProperty("android.minSdk") as String).toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlin {
jvmToolchain(17)
}
}

publishing {
@Suppress("UNCHECKED_CAST")
(extra["maven-repository"] as (PublishingExtension.() -> Unit)?)?.invoke(this)

publications {
create<MavenPublication>("uninit.ui") {
groupId = "uninit"
artifactId = "ui"
version = project.version.toString()
from(components["kotlin"])
}
}
}



true
5 changes: 5 additions & 0 deletions uninit/ui/src/commonMain/kotlin/uninit/ui/UIKit.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package uninit.ui

interface UIKit {

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uninit.common.compose.theme
package uninit.ui.theme

import androidx.compose.ui.graphics.Color
import kotlinx.serialization.*
Expand All @@ -10,7 +10,7 @@ import kotlinx.serialization.descriptors.nullable
import kotlinx.serialization.encoding.*
import uninit.common.collections.Three
import uninit.common.collections.Two
import uninit.common.compose.theme.catppuccin.CatppuccinMochaPink
import uninit.ui.theme.catppuccin.CatppuccinMochaPink

/**
* Loosely based off of the Catppucin Style Guide
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uninit.common.compose.theme
package uninit.ui.theme

import androidx.compose.ui.graphics.Color
import uninit.common.color.RGBA
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uninit.common.compose.theme
package uninit.ui.theme

import androidx.compose.runtime.compositionLocalOf

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package uninit.common.compose.theme
package uninit.ui.theme

import uninit.common.compose.theme.catppuccin.*
import uninit.ui.theme.catppuccin.*

sealed class ThemeRegistry {
private val map: MutableMap<String, ApplicationTheme> = mutableMapOf()
Expand Down Expand Up @@ -128,6 +129,7 @@ sealed class ThemeRegistry {
companion object : ThemeRegistry() {
init {
insertBuiltins()
appendPlatformBuiltins()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TODO
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package uninit.common.compose.theme.catppuccin
package uninit.ui.theme.catppuccin

import uninit.common.collections.three
import uninit.common.collections.two
import uninit.common.color.pallete.Catppuccin
import uninit.common.compose.theme.ApplicationTheme
import uninit.common.compose.theme.color
import uninit.ui.theme.ApplicationTheme
import uninit.ui.theme.color

internal fun catppuccin(flavor: String, variant: String? = null) = lazy {
val flavor = when (flavor.lowercase()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uninit.common.compose.theme.catppuccin
package uninit.ui.theme.catppuccin

val CatppuccinFrappeLavender by catppuccin("Frappe", "Lavender")
val CatppuccinFrappeBlue by catppuccin("Frappe", "Blue")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uninit.common.compose.theme.catppuccin
package uninit.ui.theme.catppuccin

val CatppuccinLatteLavender by catppuccin("Latte", "Lavender")
val CatppuccinLatteBlue by catppuccin("Latte", "Blue")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

package uninit.common.compose.theme.catppuccin
package uninit.ui.theme.catppuccin

val CatppuccinMacchiatoLavender by catppuccin("Macchiato", "Lavender")
val CatppuccinMacchiatoBlue by catppuccin("Macchiato", "Blue")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uninit.common.compose.theme.catppuccin
package uninit.ui.theme.catppuccin

val CatppuccinMochaLavender by catppuccin("Mocha", "Lavender")
val CatppuccinMochaBlue by catppuccin("Mocha", "Blue")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

actual fun ThemeRegistry.appendPlatformBuiltins() {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package uninit.ui.theme

actual fun ThemeRegistry.appendPlatformBuiltins() {
}

0 comments on commit ab9e8ce

Please sign in to comment.