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.

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

mathieu/refactor/Transfer UI Resources to DesignKit #394

Merged
merged 16 commits into from
Oct 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7a5e0eb
:bento: (DesignKit): Move LekaApp Avatars assets to designKit
macteuts Oct 26, 2023
5839741
:bento: (DesignKit): Move all remaining relevant assets to designKit
macteuts Oct 27, 2023
3eb458a
:bento: (LekaApp): Populate Data collections with DesignKit assets
macteuts Oct 27, 2023
c9fa77e
:bento: (LekaApp): Populate Data collections with DesignKit assets
macteuts Oct 27, 2023
da40edc
:recycle: (LekaApp): Refactor CompanyViewModel to use DesignKit
macteuts Oct 27, 2023
e0ee2cb
:recycle: (LekaApp): Curriculums, Activities, Commands to SFSymbols
macteuts Oct 27, 2023
a486099
:recycle: (LekaApp): Notification Badge to SFSymbols
macteuts Oct 27, 2023
cd75570
:recycle: (LekaApp): Source Clouds and Reinforcers from DesignKit
macteuts Oct 27, 2023
18be2b7
:recycle: (LekaApp): Profiles and Robot images from DesignKit
macteuts Oct 27, 2023
101c590
:recycle: (LekaApp): Get reinforcers from their index in DesignKit
macteuts Oct 27, 2023
f50289b
:recycle: (LekaApp): Source all proprietary colors from DesignKit
macteuts Oct 27, 2023
7c396e6
:recycle: (LekaApp): Source all proprietary colors from DesignKit
ladislas Oct 29, 2023
23c5c50
:clown_face: (LekaApp): Extract lekaCompany data from CompanyViewModel
macteuts Oct 27, 2023
111b551
:bento: (LekaApp): Re-add AccentColor for system components
macteuts Oct 27, 2023
c944712
:bug: (LekaApp): Add DesignKit missing Bundle on images
macteuts Oct 27, 2023
81802cf
:lipstick: (LekaApp): Reduce sidebar items icons fontWeight to light
macteuts Oct 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Copyright 2023 APF France handicap
// SPDX-License-Identifier: Apache-2.0

import DesignKit
import SwiftUI

struct EndOfRoundView: View {
Expand Down Expand Up @@ -88,14 +89,14 @@ struct EndOfRoundView: View {
case .fail:
return Text("fail_bottom_message")
+ Text("(0%)")
.foregroundColor(Color("bravoHighlights"))
.foregroundColor(DesignKitAsset.Colors.bravoHighlights.swiftUIColor)
+ Text(".")
case .medium, .success:
return Text("success_bottom_message")
+ Text(
"success_bottom_result \(gameEngine.goodAnswers) \(gameEngine.currentActivity.stepsAmount) \(gameEngine.percentOfSuccess)"
)
.foregroundColor(Color("bravoHighlights"))
.foregroundColor(DesignKitAsset.Colors.bravoHighlights.swiftUIColor)
+ Text("!")
default:
return Text("")
Expand All @@ -119,7 +120,7 @@ struct EndOfRoundView: View {
value: textOpacity
)
makeBottomMessage(result: result)
.foregroundColor(Color("lekaDarkGray"))
.foregroundColor(DesignKitAsset.Colors.lekaDarkGray.swiftUIColor)
.offset(y: textOffset)
.opacity(textOpacity)
.animation(
Expand Down
2 changes: 2 additions & 0 deletions Apps/LekaActivityUIExplorer/Sources/OldUI/Needed/Styles.swift
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ struct ActivityAnswer_ButtonStyle: ButtonStyle {
}
}

// .buttonStyle(ActivityAnswer_ButtonStyle(isEnabled: gameEngine.currentMediaHasBeenPlayedOnce))

// MARK: - Play Sound Button Style (Gameplay)
struct PlaySound_ButtonStyle: ButtonStyle {

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading