Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/timetable feature fixes #48

Merged
merged 19 commits into from
Jun 26, 2024
Merged

Feature/timetable feature fixes #48

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e0d46d7
wip new data model (does not build)
Jun 11, 2024
f288219
WIP (build broken again for unknown reasons)
Jun 12, 2024
19ff20e
Merge branch 'main' of github.com:DroidKaigi/conference-app-2024 into…
Jun 12, 2024
55b0945
updated test data
Jun 13, 2024
1f3ea33
Updated layout to handle date grouping properly. Still needs layout a…
Jun 13, 2024
7e7e144
WIP (adding real colors)
Jun 14, 2024
05a550e
Fixed basic colors
Jun 15, 2024
bd6d427
Minor layout fixes
Jun 15, 2024
a864ca1
Update app-ios/Sources/TimetableFeature/TimetableListView.swift
charles-b-stb Jun 16, 2024
b4fdc46
Addressed problems brought up in pull request review.
Jun 16, 2024
3c17479
Merge branch 'feature/timetable-feature-fixes' of github.com:DroidKai…
Jun 16, 2024
a905d7a
Responded to pull request comments
Jun 17, 2024
5221c86
Update app-ios/Sources/TimetableFeature/TimetableListView.swift
charles-b-stb Jun 18, 2024
30ddc0e
responded to pull request comments.
Jun 18, 2024
d130c8e
Merge branch 'feature/timetable-feature-fixes' of github.com:DroidKai…
Jun 18, 2024
d0bd648
pull request fixes.
Jun 20, 2024
14bbe2a
Fixes to address concerns from pull request review.
Jun 23, 2024
d58c73d
Fixed last pull request item.
Jun 23, 2024
fd4482b
Merge branch 'main' into feature/timetable-feature-fixes
charles-b-stb Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app-ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "f8cbec89e72afd3e8305b98d43e58a9e69ba7ccc12f6d0cc55ff743ff5373f8f",
"originHash" : "fc296cbf51ba156d83c222f42852e5fa16b6bcd01ef05b8c01c34d58995a19e3",
"pins" : [
{
"identity" : "abseil-cpp-binary",
Expand Down
38 changes: 38 additions & 0 deletions ...urces/TimetableFeature/Resource/Media.xcassets/Background.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x04",
"green" : "0x20",
"red" : "0x24"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x04",
"green" : "0x20",
"red" : "0x24"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...s/Sources/TimetableFeature/Resource/Media.xcassets/Button.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xBB",
"green" : "0xD6",
"red" : "0xDA"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xBB",
"green" : "0xD6",
"red" : "0xDA"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions app-ios/Sources/TimetableFeature/Resource/Media.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...urces/TimetableFeature/Resource/Media.xcassets/On Primary.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x00",
"green" : "0x38",
"red" : "0x28"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x00",
"green" : "0x38",
"red" : "0x28"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...urces/TimetableFeature/Resource/Media.xcassets/On Surface.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xC5",
"green" : "0xC7",
"red" : "0xC4"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xC5",
"green" : "0xC7",
"red" : "0xC4"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions .../TimetableFeature/Resource/Media.xcassets/Outline Variant.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x40",
"green" : "0x49",
"red" : "0x44"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x40",
"green" : "0x49",
"red" : "0x44"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions .../Sources/TimetableFeature/Resource/Media.xcassets/Outline.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x89",
"green" : "0x93",
"red" : "0x8D"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x89",
"green" : "0x93",
"red" : "0x8D"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions .../Sources/TimetableFeature/Resource/Media.xcassets/Primary.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x61",
"green" : "0xDC",
"red" : "0xB0"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x61",
"green" : "0xDC",
"red" : "0xB0"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...etableFeature/Resource/Media.xcassets/Secondary Container.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x35",
"green" : "0x4B",
"red" : "0x41"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x35",
"green" : "0x4B",
"red" : "0x41"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...imetableFeature/Resource/Media.xcassets/Surface Container.colorset.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x1D",
"green" : "0x20",
"red" : "0x1E"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x1D",
"green" : "0x20",
"red" : "0x1E"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading