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

hugo/feature/Move Avatar to AccountKit #706

Merged
merged 5 commits into from
Feb 22, 2024
Merged

hugo/feature/Move Avatar to AccountKit #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ab3d35
:construction_worker: (CI): Add avatars YAML file pre commit hook
HPezz Feb 22, 2024
2de6a9d
:bento: (AccountKit): Add avatars assets
HPezz Feb 22, 2024
cc674c2
:sparkles: (AccountKit): Add Avatar decoder
HPezz Feb 22, 2024
3e5c81e
:recycle: (LekaApp): Get avatars from AccountKit
HPezz Feb 22, 2024
c01d958
:truck: (AccountKit): Rename weather avatars
ladislas Feb 22, 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
13 changes: 13 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@ repos:
additional_dependencies: ["pygments"]
files: '.*\.xcstrings'

- id: check_yaml_definitions_avatars
name: Check avatars.yml
description: |
This hook checks avatars.yml for:
- non unique ids
- jtd schema validation
- filename and image consistency
It also formats the file
entry: python3 Tools/Hooks/check_yaml_definitions_avatars.py
language: python
additional_dependencies: ["ruamel.yaml"]
files: avatars.yml

- id: check_yaml_definitions_professions
name: Check professions.yml
description: |
Expand Down
241 changes: 0 additions & 241 deletions Apps/LekaApp/Sources/_NEWCodeBase/Data/AvatarsData.swift
View file
Open in desktop

This file was deleted.

14 changes: 8 additions & 6 deletions Apps/LekaApp/Sources/_NEWCodeBase/Views/AvatarPicker/AvatarPicker+AvatarCellLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,29 @@
// Copyright APF France handicap
// SPDX-License-Identifier: Apache-2.0

import AccountKit
import DesignKit
import SwiftUI

extension AvatarPicker {
struct AvatarCellLabel: View {
// MARK: Internal

let image: String
let image: UIImage
@Binding var isSelected: Bool

var body: some View {
Image(self.image, bundle: Bundle(for: DesignKitResources.self))
Image(uiImage: self.image)
.resizable()
.aspectRatio(contentMode: .fit)
.background(DesignKitAsset.Colors.blueGray.swiftUIColor)
.clipShape(Circle())
.frame(maxWidth: 125, maxHeight: 125)
.frame(maxWidth: 130, maxHeight: 130)
.animation(.default, value: self.isSelected)
.overlay(
Circle()
.stroke(self.styleManager.accentColor!,
lineWidth: self.isSelected ? 7 : 0)
lineWidth: self.isSelected ? 4 : 0)
)
}

Expand All @@ -34,7 +36,7 @@ extension AvatarPicker {

#Preview {
HStack {
AvatarPicker.AvatarCellLabel(image: DesignKitAsset.Avatars.accompanyingBlue.name, isSelected: .constant(false))
AvatarPicker.AvatarCellLabel(image: DesignKitAsset.Avatars.accompanyingBlue.name, isSelected: .constant(true))
AvatarPicker.AvatarCellLabel(image: Avatars.iconToUIImage(icon: Avatars.categories[0].avatars[0]), isSelected: .constant(false))
AvatarPicker.AvatarCellLabel(image: Avatars.iconToUIImage(icon: Avatars.categories[0].avatars[0]), isSelected: .constant(true))
}
}
6 changes: 4 additions & 2 deletions Apps/LekaApp/Sources/_NEWCodeBase/Views/AvatarPicker/AvatarPicker+ButtonLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Copyright APF France handicap
// SPDX-License-Identifier: Apache-2.0

import AccountKit
import DesignKit
import SwiftUI

Expand All @@ -20,9 +21,10 @@ extension AvatarPicker {
.frame(width: 30)
.foregroundStyle(self.styleManager.accentColor!)
} else {
Image(self.image, bundle: Bundle(for: DesignKitResources.self))
Image(uiImage: Avatars.iconToUIImage(icon: self.image))
.resizable()
.aspectRatio(contentMode: .fit)
.background(DesignKitAsset.Colors.blueGray.swiftUIColor)
.clipShape(Circle())
}
}
Expand All @@ -43,6 +45,6 @@ extension AvatarPicker {
HStack {
AvatarPicker.ButtonLabel(image: "")

AvatarPicker.ButtonLabel(image: DesignKitAsset.Avatars.accompanyingBlue.name)
AvatarPicker.ButtonLabel(image: Avatars.categories[0].avatars[0])
}
}
19 changes: 10 additions & 9 deletions Apps/LekaApp/Sources/_NEWCodeBase/Views/AvatarPicker/AvatarPicker+ListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,32 @@
// Copyright APF France handicap
// SPDX-License-Identifier: Apache-2.0

import AccountKit
import DesignKit
import SwiftUI

extension AvatarPicker {
struct ListView: View {
// MARK: Internal

@Binding var selected: String
@Binding var selectedAvatar: String

var body: some View {
List {
ForEach(AvatarSets.allCases, id: \.id) { category in
Section(category.content.category) {
ForEach(Avatars.categories, id: \.self) { category in
Section(category.name) {
ScrollView(.horizontal) {
LazyHGrid(rows: self.rows, spacing: 50) {
ForEach(category.content.images, id: \.self) { item in
ForEach(category.avatars, id: \.self) { icon in
Button {
self.selected = item
self.selectedAvatar = icon
} label: {
AvatarCellLabel(
image: item,
isSelected: .constant(self.selected == item)
image: Avatars.iconToUIImage(icon: icon),
isSelected: .constant(self.selectedAvatar == icon)
)
}
.animation(.easeIn, value: self.selected)
.animation(.easeIn, value: self.selectedAvatar)
}
}
.padding()
Expand All @@ -45,5 +46,5 @@ extension AvatarPicker {
}

#Preview {
AvatarPicker.ListView(selected: .constant(""))
AvatarPicker.ListView(selectedAvatar: .constant(""))
}
Loading
Loading