wbrawner/PeopleInSpace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reformat & rearrange the project

Browse source
This commit is contained in:
Ali Khaleqi Yekta 2021-06-20 14:02:24 +04:30 committed by John O'Reilly
parent 7bc2918873
commit 1a339ae623
40 changed files with 396 additions and 397 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
.github/workflows/android.yml vendored
View file

@ -1,6 +1,6 @@
name: Android CI
on: [push, pull_request]
on: [ push, pull_request ]
jobs:
build:
@ -8,28 +8,28 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v1
- name: set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build android app
run: ./gradlew assembleDebug
- name: Run Unit Tests
run: ./gradlew test
- name: Build web app
run: ./gradlew :web:assemble
- name: Build iOS shared code
run: ./gradlew :common:compileKotlinIOS
- name: Build macOS shared code
run: ./gradlew :common:compileKotlinMacOS
- uses: actions/checkout@v1
- name: set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build android app
run: ./gradlew assembleDebug
- name: Run Unit Tests
run: ./gradlew test
- name: Build web app
run: ./gradlew :web:assemble
- name: Build iOS shared code
run: ./gradlew :common:compileKotlinIOS
- name: Build macOS shared code
run: ./gradlew :common:compileKotlinMacOS
# If main branch update, deploy to gh-pages
- name: Deploy
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: web/build/distributions # The folder the action should deploy.
CLEAN: true # Automatically remove deleted files from the deploy branch
# If main branch update, deploy to gh-pages
- name: Deploy
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: web/build/distributions # The folder the action should deploy.
CLEAN: true # Automatically remove deleted files from the deploy branch

8
app/build.gradle.kts
View file

@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("com.android.application")
kotlin("android")
@ -45,7 +47,7 @@ android {
}
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
freeCompilerArgs = listOf(
@ -58,7 +60,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
}
dependencies {
with(Deps){
with(Deps) {
implementation(material)
implementation(lifecycleRuntimeKtx)
implementation(lifecycleViewmodelKtx)
@ -95,4 +97,4 @@ dependencies {
}
implementation(project(":common"))
}
}

8
backend/build.gradle.kts
View file

@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("kotlin-platform-jvm")
application
@ -6,13 +8,13 @@ plugins {
}
dependencies {
with (Deps){
with(Deps) {
implementation(Deps.Serialization.core) // JVM dependency
implementation(kotlinCoroutinesCore)
implementation(logback)
}
with(Deps.Ktor){
with(Deps.Ktor) {
implementation(serverCore)
implementation(serverNetty)
implementation(serialization)
@ -22,7 +24,7 @@ dependencies {
implementation(project(":common"))
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}

2
build.gradle.kts
View file

@ -26,4 +26,4 @@ allprojects {
maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers/")
maven(url = "https://jitpack.io")
}
}
}

8
buildSrc/build.gradle.kts
View file

@ -1,7 +1,7 @@
repositories {
jcenter()
}
plugins {
`kotlin-dsl`
}
repositories {
jcenter()
}

20
common/build.gradle.kts
View file

@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("multiplatform")
id("kotlinx-serialization")
@ -37,7 +39,6 @@ android {
}
}
kotlin {
val sdkName: String? = System.getenv("SDK_NAME")
@ -72,27 +73,27 @@ kotlin {
sourceSets {
sourceSets["commonMain"].dependencies {
// Coroutines
implementation(Deps.kotlinCoroutinesCore) {
isForce = true
}
with(Deps.Ktor){
with(Deps.Ktor) {
implementation(clientCore)
implementation(clientJson)
implementation(clientLogging)
implementation(clientSerialization)
}
// Kotlinx Serialization
implementation(Deps.Serialization.core)
with(Deps.Serialization) {
implementation(core)
}
with(Deps.SqlDelight){
with(Deps.SqlDelight) {
implementation(runtime)
implementation(coroutineExtensions)
}
with(Deps.Koin){
with(Deps.Koin) {
api(core)
api(test)
}
@ -140,7 +141,7 @@ kotlin {
}
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "1.8"
}
@ -159,5 +160,4 @@ multiplatformSwiftPackage {
targetPlatforms {
iOS { v("13") }
}
}
}

3
common/src/commonMain/kotlin/com/surrus/common/repository/PeopleInSpaceRepository.kt
View file

@ -11,9 +11,6 @@ import com.surrus.common.remote.IssPosition
import com.surrus.common.remote.PeopleInSpaceApi
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flowOf
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import kotlin.coroutines.CoroutineContext

12
compose-desktop/src/main/kotlin/main.kt
View file

@ -71,7 +71,11 @@ fun main() = Window {
}
@Composable
fun PersonList(people: List<Assignment>, selectedPerson: String, personSelected: (person: Assignment) -> Unit) {
fun PersonList(
people: List<Assignment>,
selectedPerson: String,
personSelected: (person: Assignment) -> Unit
) {
LazyColumn {
items(people) { person ->
@ -81,7 +85,11 @@ fun PersonList(people: List<Assignment>, selectedPerson: String, personSelected:
}
@Composable
fun PersonView(person: Assignment, selectedPerson: String, personSelected: (person: Assignment) -> Unit) {
fun PersonView(
person: Assignment,
selectedPerson: String,
personSelected: (person: Assignment) -> Unit
) {
Row(
modifier = Modifier.fillMaxWidth().clickable(onClick = { personSelected(person) })
.padding(8.dp),

6
compose-web/build.gradle.kts
View file

@ -1,4 +1,3 @@
plugins {
kotlin("multiplatform")
id("org.jetbrains.compose") version "0.5.0-build225"
@ -12,14 +11,12 @@ repositories {
}
kotlin {
js(IR) {
browser()
binaries.executable()
}
sourceSets {
val jsMain by getting {
dependencies {
implementation(compose.web.widgets)
@ -36,5 +33,4 @@ compose.desktop {
application {
mainClass = ""
}
}
}

4
compose-web/src/jsMain/kotlin/Main.kt
View file

@ -44,7 +44,7 @@ fun main() {
style {
display(DisplayStyle.Flex)
alignItems(AlignItems.Center)
}
}
}
) {
@ -55,7 +55,7 @@ fun main() {
style {
width(48.px)
property("padding-right", 16.px)
}
}
}
)

2
gradle.properties
View file

@ -19,5 +19,5 @@ android.useAndroidX=true
android.enableJetifier=false
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# XCode
xcodeproj=./ios/PeopleInSpaceSwiftUI

116
ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/Assets.xcassets/AppIcon.appiconset/Contents.json
View file

@ -1,98 +1,98 @@
{
"images" : [
"images": [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
"idiom": "iphone",
"size": "20x20",
"scale": "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
"idiom": "iphone",
"size": "20x20",
"scale": "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
"idiom": "iphone",
"size": "29x29",
"scale": "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
"idiom": "iphone",
"size": "29x29",
"scale": "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
"idiom": "iphone",
"size": "40x40",
"scale": "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
"idiom": "iphone",
"size": "40x40",
"scale": "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
"idiom": "iphone",
"size": "60x60",
"scale": "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
"idiom": "iphone",
"size": "60x60",
"scale": "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
"idiom": "ipad",
"size": "20x20",
"scale": "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
"idiom": "ipad",
"size": "20x20",
"scale": "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
"idiom": "ipad",
"size": "29x29",
"scale": "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
"idiom": "ipad",
"size": "29x29",
"scale": "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
"idiom": "ipad",
"size": "40x40",
"scale": "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
"idiom": "ipad",
"size": "40x40",
"scale": "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
"idiom": "ipad",
"size": "76x76",
"scale": "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
"idiom": "ipad",
"size": "76x76",
"scale": "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
"idiom": "ipad",
"size": "83.5x83.5",
"scale": "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
"idiom": "ios-marketing",
"size": "1024x1024",
"scale": "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

6
ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/Assets.xcassets/Contents.json
View file

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

6
ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/Preview Content/Preview Assets.xcassets/Contents.json
View file

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

68
macOS/PeopleInSpace/PeopleInSpace/Assets.xcassets/AppIcon.appiconset/Contents.json
View file

@ -1,58 +1,58 @@
{
"images" : [
"images": [
{
"idiom" : "mac",
"size" : "16x16",
"scale" : "1x"
"idiom": "mac",
"size": "16x16",
"scale": "1x"
},
{
"idiom" : "mac",
"size" : "16x16",
"scale" : "2x"
"idiom": "mac",
"size": "16x16",
"scale": "2x"
},
{
"idiom" : "mac",
"size" : "32x32",
"scale" : "1x"
"idiom": "mac",
"size": "32x32",
"scale": "1x"
},
{
"idiom" : "mac",
"size" : "32x32",
"scale" : "2x"
"idiom": "mac",
"size": "32x32",
"scale": "2x"
},
{
"idiom" : "mac",
"size" : "128x128",
"scale" : "1x"
"idiom": "mac",
"size": "128x128",
"scale": "1x"
},
{
"idiom" : "mac",
"size" : "128x128",
"scale" : "2x"
"idiom": "mac",
"size": "128x128",
"scale": "2x"
},
{
"idiom" : "mac",
"size" : "256x256",
"scale" : "1x"
"idiom": "mac",
"size": "256x256",
"scale": "1x"
},
{
"idiom" : "mac",
"size" : "256x256",
"scale" : "2x"
"idiom": "mac",
"size": "256x256",
"scale": "2x"
},
{
"idiom" : "mac",
"size" : "512x512",
"scale" : "1x"
"idiom": "mac",
"size": "512x512",
"scale": "1x"
},
{
"idiom" : "mac",
"size" : "512x512",
"scale" : "2x"
"idiom": "mac",
"size": "512x512",
"scale": "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

6
macOS/PeopleInSpace/PeopleInSpace/Assets.xcassets/Contents.json
View file

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

6
macOS/PeopleInSpace/PeopleInSpace/Preview Content/Preview Assets.xcassets/Contents.json
View file

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

1
settings.gradle.kts
View file

@ -4,7 +4,6 @@ pluginManagement {
mavenCentral()
maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev")
}
}
rootProject.name = "PeopleInSpace"

110
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json
View file

@ -1,81 +1,81 @@
{
"images" : [
"images": [
{
"size" : "24x24",
"idiom" : "watch",
"scale" : "2x",
"role" : "notificationCenter",
"subtype" : "38mm"
"size": "24x24",
"idiom": "watch",
"scale": "2x",
"role": "notificationCenter",
"subtype": "38mm"
},
{
"size" : "27.5x27.5",
"idiom" : "watch",
"scale" : "2x",
"role" : "notificationCenter",
"subtype" : "42mm"
"size": "27.5x27.5",
"idiom": "watch",
"scale": "2x",
"role": "notificationCenter",
"subtype": "42mm"
},
{
"size" : "29x29",
"idiom" : "watch",
"role" : "companionSettings",
"scale" : "2x"
"size": "29x29",
"idiom": "watch",
"role": "companionSettings",
"scale": "2x"
},
{
"size" : "29x29",
"idiom" : "watch",
"role" : "companionSettings",
"scale" : "3x"
"size": "29x29",
"idiom": "watch",
"role": "companionSettings",
"scale": "3x"
},
{
"size" : "40x40",
"idiom" : "watch",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "38mm"
"size": "40x40",
"idiom": "watch",
"scale": "2x",
"role": "appLauncher",
"subtype": "38mm"
},
{
"size" : "44x44",
"idiom" : "watch",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "40mm"
"size": "44x44",
"idiom": "watch",
"scale": "2x",
"role": "appLauncher",
"subtype": "40mm"
},
{
"size" : "50x50",
"idiom" : "watch",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "44mm"
"size": "50x50",
"idiom": "watch",
"scale": "2x",
"role": "appLauncher",
"subtype": "44mm"
},
{
"size" : "86x86",
"idiom" : "watch",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "38mm"
"size": "86x86",
"idiom": "watch",
"scale": "2x",
"role": "quickLook",
"subtype": "38mm"
},
{
"size" : "98x98",
"idiom" : "watch",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "42mm"
"size": "98x98",
"idiom": "watch",
"scale": "2x",
"role": "quickLook",
"subtype": "42mm"
},
{
"size" : "108x108",
"idiom" : "watch",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "44mm"
"size": "108x108",
"idiom": "watch",
"scale": "2x",
"role": "quickLook",
"subtype": "44mm"
},
{
"idiom" : "watch-marketing",
"size" : "1024x1024",
"scale" : "1x"
"idiom": "watch-marketing",
"size": "1024x1024",
"scale": "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

6
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit App/Assets.xcassets/Contents.json
View file

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

32
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json vendored
View file

@ -1,28 +1,28 @@
{
"images" : [
"images": [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
"idiom": "watch",
"scale": "2x",
"screen-width": "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
"idiom": "watch",
"scale": "2x",
"screen-width": ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
"idiom": "watch",
"scale": "2x",
"screen-width": ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
"idiom": "watch",
"scale": "2x",
"screen-width": ">183"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

56
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Contents.json
View file

@ -1,48 +1,48 @@
{
"assets" : [
"assets": [
{
"idiom" : "watch",
"filename" : "Circular.imageset",
"role" : "circular"
"idiom": "watch",
"filename": "Circular.imageset",
"role": "circular"
},
{
"idiom" : "watch",
"filename" : "Extra Large.imageset",
"role" : "extra-large"
"idiom": "watch",
"filename": "Extra Large.imageset",
"role": "extra-large"
},
{
"idiom" : "watch",
"filename" : "Graphic Bezel.imageset",
"role" : "graphic-bezel"
"idiom": "watch",
"filename": "Graphic Bezel.imageset",
"role": "graphic-bezel"
},
{
"idiom" : "watch",
"filename" : "Graphic Circular.imageset",
"role" : "graphic-circular"
"idiom": "watch",
"filename": "Graphic Circular.imageset",
"role": "graphic-circular"
},
{
"idiom" : "watch",
"filename" : "Graphic Corner.imageset",
"role" : "graphic-corner"
"idiom": "watch",
"filename": "Graphic Corner.imageset",
"role": "graphic-corner"
},
{
"idiom" : "watch",
"filename" : "Graphic Large Rectangular.imageset",
"role" : "graphic-large-rectangular"
"idiom": "watch",
"filename": "Graphic Large Rectangular.imageset",
"role": "graphic-large-rectangular"
},
{
"idiom" : "watch",
"filename" : "Modular.imageset",
"role" : "modular"
"idiom": "watch",
"filename": "Modular.imageset",
"role": "modular"
},
{
"idiom" : "watch",
"filename" : "Utilitarian.imageset",
"role" : "utilitarian"
"idiom": "watch",
"filename": "Utilitarian.imageset",
"role": "utilitarian"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

32
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json vendored
View file

@ -1,28 +1,28 @@
{
"images" : [
"images": [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
"idiom": "watch",
"scale": "2x",
"screen-width": "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
"idiom": "watch",
"scale": "2x",
"screen-width": ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
"idiom": "watch",
"scale": "2x",
"screen-width": ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
"idiom": "watch",
"scale": "2x",
"screen-width": ">183"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

32
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json vendored
View file

@ -1,28 +1,28 @@
{
"images" : [
"images": [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
"idiom": "watch",
"scale": "2x",
"screen-width": "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
"idiom": "watch",
"scale": "2x",
"screen-width": ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
"idiom": "watch",
"scale": "2x",
"screen-width": ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
"idiom": "watch",
"scale": "2x",
"screen-width": ">183"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

32
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json vendored
View file

@ -1,28 +1,28 @@
{
"images" : [
"images": [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
"idiom": "watch",
"scale": "2x",
"screen-width": "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
"idiom": "watch",
"scale": "2x",
"screen-width": ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
"idiom": "watch",
"scale": "2x",
"screen-width": ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
"idiom": "watch",
"scale": "2x",
"screen-width": ">183"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

32
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json vendored
View file

@ -1,28 +1,28 @@
{
"images" : [
"images": [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
"idiom": "watch",
"scale": "2x",
"screen-width": "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
"idiom": "watch",
"scale": "2x",
"screen-width": ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
"idiom": "watch",
"scale": "2x",
"screen-width": ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
"idiom": "watch",
"scale": "2x",
"screen-width": ">183"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

32
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json vendored
View file

@ -1,28 +1,28 @@
{
"images" : [
"images": [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
"idiom": "watch",
"scale": "2x",
"screen-width": "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
"idiom": "watch",
"scale": "2x",
"screen-width": ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
"idiom": "watch",
"scale": "2x",
"screen-width": ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
"idiom": "watch",
"scale": "2x",
"screen-width": ">183"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

32
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json vendored
View file

@ -1,28 +1,28 @@
{
"images" : [
"images": [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
"idiom": "watch",
"scale": "2x",
"screen-width": "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
"idiom": "watch",
"scale": "2x",
"screen-width": ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
"idiom": "watch",
"scale": "2x",
"screen-width": ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
"idiom": "watch",
"scale": "2x",
"screen-width": ">183"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

32
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json vendored
View file

@ -1,28 +1,28 @@
{
"images" : [
"images": [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
"idiom": "watch",
"scale": "2x",
"screen-width": "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
"idiom": "watch",
"scale": "2x",
"screen-width": ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
"idiom": "watch",
"scale": "2x",
"screen-width": ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
"idiom": "watch",
"scale": "2x",
"screen-width": ">183"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

6
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Assets.xcassets/Contents.json
View file

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

6
watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/Preview Content/Preview Assets.xcassets/Contents.json
View file

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}

1
web/build.gradle.kts
View file

@ -23,7 +23,6 @@ dependencies {
implementation(project(":common"))
}
kotlin {
js(IR) {
browser()

6
web/src/main/kotlin/App.kt
View file

@ -1,9 +1,5 @@
import com.surrus.common.remote.IssPosition
import components.IssLocationMap
import components.PeopleList
import components.PersonDetails
import components.Space
import components.Typography
import components.*
import components.materialui.AppBar
import components.materialui.Card
import components.materialui.Grid

2
web/src/main/kotlin/components/materialui/AppBar.kt
View file

@ -3,7 +3,7 @@
package components.materialui
import react.*
import react.RClass
@JsName("AppBar")
external val AppBar: RClass<dynamic>

2
web/src/main/kotlin/components/materialui/Avatar.kt
View file

@ -3,7 +3,7 @@
package components.materialui
import react.*
import react.RClass
@JsName("Avatar")
external val Avatar: RClass<dynamic>

2
web/src/main/kotlin/components/materialui/Card.kt
View file

@ -3,7 +3,7 @@
package components.materialui
import react.*
import react.RClass
@JsName("Card")
external val Card: RClass<dynamic>

2
web/src/main/kotlin/components/materialui/List.kt
View file

@ -3,7 +3,7 @@
package components.materialui
import react.*
import react.RClass
@JsName("List")
external val List: RClass<dynamic>

2
web/src/main/kotlin/components/materialui/Toolbar.kt
View file

@ -3,7 +3,7 @@
package components.materialui
import react.*
import react.RClass
@JsName("Toolbar")
external val Toolbar: RClass<dynamic>

2
web/src/main/kotlin/components/pigeonmaps/PigeonMaps.kt
View file

@ -3,7 +3,7 @@
package components.pigeonmaps
import react.*
import react.RClass
@JsName("Map")
external val Map: RClass<dynamic>

2
web/src/main/resources/index.html
View file

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>People In Space</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
</head>
<body>
<div id="root"></div>