Skip to content

Commit

Permalink
🔀️ Merge branch 'ladislas/feature/content-review-gamepads'
Browse files Browse the repository at this point in the history
  • Loading branch information
ladislas committed Apr 11, 2024
2 parents 4005779 + 8fab2a8 commit 8f48956
Show file tree
Hide file tree
Showing 38 changed files with 343 additions and 335 deletions.
24 changes: 12 additions & 12 deletions Apps/LekaApp/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -1370,56 +1370,56 @@
}
}
},
"lekaapp.main_view.sidebar.category_label.home": {
"comment": "The title of the category 'Home'",
"lekaapp.main_view.sidebar.category_label.gamepads": {
"comment": "The title of the category 'Gamepads'",
"extractionState": "extracted_with_value",
"localizations": {
"en": {
"stringUnit": {
"state": "new",
"value": "Home"
"value": "Gamepads"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Accueil"
"value": "Manettes"
}
}
}
},
"lekaapp.main_view.sidebar.category_label.news": {
"comment": "The title of the category 'News'",
"lekaapp.main_view.sidebar.category_label.home": {
"comment": "The title of the category 'Home'",
"extractionState": "extracted_with_value",
"localizations": {
"en": {
"stringUnit": {
"state": "new",
"value": "News"
"value": "Home"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Nouveaut\u00e9s"
"value": "Accueil"
}
}
}
},
"lekaapp.main_view.sidebar.category_label.remotes": {
"comment": "The title of the category 'Remotes'",
"lekaapp.main_view.sidebar.category_label.news": {
"comment": "The title of the category 'News'",
"extractionState": "extracted_with_value",
"localizations": {
"en": {
"stringUnit": {
"state": "new",
"value": "Remotes"
"value": "News"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "T\u00e9l\u00e9commandes"
"value": "Nouveaut\u00e9s"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Apps/LekaApp/Sources/Navigation/Navigation+Category.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extension Navigation {
case home
case curriculums
case activities
case remotes
case gamepads
case caregivers
case carereceivers

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import SwiftUI

// MARK: - CategoryRemotesView

struct CategoryRemotesView: View {
struct CategoryGamepadsView: View {
// MARK: Internal

var body: some View {
Expand Down Expand Up @@ -48,7 +48,7 @@ struct CategoryRemotesView: View {

// MARK: Private

private let category: CategoryRemotes = .shared
private let category: CategoryGamepads = .shared

@ObservedObject private var styleManager: StyleManager = .shared
@ObservedObject private var authManagerViewModel: AuthManagerViewModel = .shared
Expand All @@ -59,6 +59,6 @@ struct CategoryRemotesView: View {
NavigationSplitView {
Text("Sidebar")
} detail: {
CategoryRemotesView()
CategoryGamepadsView()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ extension MainView {
self.title = String(l10n.MainView.Sidebar.CategoryLabel.activities.characters)
self.systemImage = "dice"

case .remotes:
self.title = String(l10n.MainView.Sidebar.CategoryLabel.remotes.characters)
case .gamepads:
self.title = String(l10n.MainView.Sidebar.CategoryLabel.gamepads.characters)
self.systemImage = "gamecontroller"

case .caregivers:
Expand Down
2 changes: 1 addition & 1 deletion Apps/LekaApp/Sources/Views/MainView/MainView+l10n.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extension l10n {
static let resources = LocalizedString("lekaapp.main_view.sidebar.category_label.resources", value: "Resources", comment: "The title of the category 'Resources'")
static let curriculums = LocalizedString("lekaapp.main_view.sidebar.category_label.curriculums", value: "Curriculums", comment: "The title of the category 'Curriculums'")
static let activities = LocalizedString("lekaapp.main_view.sidebar.category_label.activities", value: "Activities", comment: "The title of the category 'Activities'")
static let remotes = LocalizedString("lekaapp.main_view.sidebar.category_label.remotes", value: "Remotes", comment: "The title of the category 'Remotes'")
static let gamepads = LocalizedString("lekaapp.main_view.sidebar.category_label.gamepads", value: "Gamepads", comment: "The title of the category 'Gamepads'")
static let stories = LocalizedString("lekaapp.main_view.sidebar.category_label.stories", value: "Stories", comment: "The title of the category 'Stories'")
static let caregivers = LocalizedString("lekaapp.main_view.sidebar.category_label.caregivers", value: "Caregivers", comment: "The title of the category 'Caregivers'")
static let carereceivers = LocalizedString("lekaapp.main_view.sidebar.category_label.carereceivers", value: "Care Receivers", comment: "The title of the category 'Care Receivers'")
Expand Down
6 changes: 3 additions & 3 deletions Apps/LekaApp/Sources/Views/MainView/MainView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct MainView: View {
Section(String(l10n.MainView.Sidebar.sectionContent.characters)) {
CategoryLabel(category: .curriculums)
CategoryLabel(category: .activities)
CategoryLabel(category: .remotes)
CategoryLabel(category: .gamepads)
}

if self.authManagerViewModel.userAuthenticationState == .loggedIn {
Expand Down Expand Up @@ -99,8 +99,8 @@ struct MainView: View {
case .activities:
CategoryActivitiesView()

case .remotes:
CategoryRemotesView()
case .gamepads:
CategoryGamepadsView()

case .caregivers:
CaregiverList()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# Leka - iOS Monorepo
# Copyright APF France handicap
# SPDX-License-Identifier: Apache-2.0

version: 1.0.0

uuid: D91BDA161F8E455CA8A71881F1D2E923
name: gamepad_arrow_pad_big

created_at: "2024-03-04T18:07:12.518998"
last_edited_at: "2024-04-11T10:09:07.867304"
status: published

authors:
- leka

skills:
- sensory_interaction
- gross_motor_skills

tags:
- robot_movements
- robot_colors

hmi:
- tablet_robot

types:
- one_on_one
- group

locales:
- en_US
- fr_FR

l10n:
- locale: fr_FR
details:
icon: gamepad_arrow_pad_big

title: Pavé Fléché Grand Format
subtitle: null

short_description: |
Contrôlez Leka avec le grand pavé fléché pour naviguer dans l'espace.
description: |
La manette grand format avec pavé fléché permet un contrôle intuitif de Leka :
- Dirigez Leka pour explorer l'espace autour avec simplicité grâce aux commandes directionnelles
instructions: |
- Utilisez le grand pavé fléché pour déplacer Leka dans toutes les directions
- Naviguez avec précision en utilisant les flèches pour avancer, reculer, et tourner
- locale: en_US
details:
icon: gamepad_arrow_pad_big

title: Large Arrow Pad
subtitle: null

short_description: |
Control Leka with the large arrow pad to navigate in space
description: |
The large format gamepad with arrow pad allows for intuitive control of Leka:
- Direct Leka to explore the surrounding space with ease using directional commands
instructions: |
- Use the large arrow pad to move Leka in all directions
- Navigate precisely using the arrows to move forward, backward, and turn
exercises_payload:
options:
shuffle_exercises: false
shuffle_groups: false

exercise_groups:
- group:
- instructions:
- locale: fr_FR
value: Appuie sur une des flèches pour téléguider Leka dans la direction
de ton choix
- locale: en_US
value: Press one of the arrows to remotely guide Leka in the direction
of your choice
interface: gamepadArrowPad
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
# Leka - iOS Monorepo
# Copyright APF France handicap
# SPDX-License-Identifier: Apache-2.0

version: 1.0.0

uuid: 5554CD696BB6492594082C5F8F895A85
name: gamepad_arrow_pad_color_pad

created_at: "2024-03-04T18:07:12.519606"
last_edited_at: "2024-04-11T10:09:07.867304"
status: published

authors:
- leka

skills:
- sensory_interaction
- gross_motor_skills

tags:
- robot_movements
- robot_colors

hmi:
- tablet_robot

types:
- one_on_one
- group

locales:
- en_US
- fr_FR

l10n:
- locale: fr_FR
details:
icon: gamepad_arrow_pad_color_pad

title: Pavé Fléché et Pavé de Couleurs
subtitle: null

short_description: |
Contrôlez Leka avec les flèches pour naviguer, changer de couleur ou activer le renforçateur de votre choix
description: |
La manette avec pavé fléché offre des fonctionnalités complètes de contrôle du robot :
- Utilisez le pavé fléché pour diriger le robot dans l'espace, permettant divers mouvements y compris des rotations
- Accédez aux 5 renforçateurs de Leka via des boutons dédiés pour activer les effets souhaités
- Employez le Pavé de Couleurs pour changer dynamiquement les couleurs du robot
instructions: |
- Pour déplacer Leka, utilisez le pavé fléché situé en bas à gauche de l'écran pour permettre à Leka d'avancer, reculer ou tourner sur lui-même
- Pour activer différents renforçateurs, appuyez sur leurs icônes respectives sur le côté gauche de l'écran de l'iPad
- Pour modifier la couleur du robot, activez le pavé de couleurs en bas à droite de l'écran
- locale: en_US
details:
icon: gamepad_arrow_pad_color_pad

title: Arrow Pad and Color Pad
subtitle: null

short_description: |
Control Leka with the arrows to navigate, change color, or trigger the reinforcer of your choice
description: |
The arrow pad controller offers comprehensive control features for the robot:
- Use the arrow pad to direct the robot in space, allowing various movements including rotations
- Access Leka's 5 reinforcers via dedicated buttons to activate the desired effects
- Employ the color pad to dynamically change the robot's colors
instructions: |
- To navigate Leka, use the arrow pad located at the bottom left of the screen to allow Leka to move forward, backward, or spin
- To activate different reinforcers, press their respective icons on the left side of the iPad screen
- To change the color of the robot, activate the color pad at the bottom right of the screen
exercises_payload:
options:
shuffle_exercises: false
shuffle_groups: false

exercise_groups:
- group:
- instructions:
- locale: fr_FR
value: Contrôle Leka avec la télécommande, fais le se déplacer, changer
de couleur ou lance le renforçateur de ton choix
- locale: en_US
value: Control Leka with the remote control, make him move, change color
or throw the reinforcer of your choice
interface: gamepadArrowPadColorPad
Loading

0 comments on commit 8f48956

Please sign in to comment.