Compare commits

..

No commits in common. 'master' and 'V2' have entirely different histories.
master ... V2

@ -10,11 +10,12 @@ steps:
- name: build - name: build
image: swift:latest image: swift:latest
commands: commands:
- cd Sources/Model - cd Sources/allin/allin
- swift build - swift build
- name: test - name: test
image: swift:latest image: swift:latest
commands: commands:
- cd Sources/Model - cd Sources/allin/allinTests
- swift test - swift test
depends_on: [build]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 354 KiB

@ -1,91 +1,3 @@
<div align="center"> # Swift
<img src="Documentation/Images/Banner-AllIn.png" /> Client IOS
---
&nbsp; ![Swift](https://img.shields.io/badge/Swift-F05138.svg?style=for-the-badge&logo=Swift&logoColor=white)
&nbsp; ![iOS](https://img.shields.io/badge/iOS-000000.svg?style=for-the-badge&logo=Apple&logoColor=white)
---
[Présentation](#apple---all-in) | [Répartition du dépôt](#répartition-du-gitlab) | [Structures](#structures) | [Technologies](#technologies) | [Outils](#outils) | [Wiki](https://codefirst.iut.uca.fr/git/AllDev/Gestion_de_projet/wiki)
</div>
### Apple - ALL IN!
**Contexte** : Application Swift et SwiftUI pour le projet universitaire de troisième année (B.U.T Informatique de Clermont-Ferrand) intitulé *All In*.
</br>
**Description** : Ce dépôt contient l'ensemble du code pour la partie client iOS de l'application *ALL IN*.
</br>
# Répartition du dépot
[**Sources**](Sources) : **Code de l'application**
[**Documentation**](Documentation) : **Documentation de l'application**
# Structures
- MVVM
<div align = center>
<img src="https://codefirst.iut.uca.fr/git/AllDev/Gestion_de_projet/raw/branch/master/Documentation/Diagrammes/AllInMVVM.png" width="600" />
</div>
# Fonctionnement
- ### Comment lancer le projet ?
:information_source: *Assurez-vous d'avoir un Mac à disposition*
Tout d'abord si ce n'est pas fait cloner le dépôt de la branche **master/main**, pour cela copier le lien URL du dépôt git :
<div align = center>
![Comment cloner](Documentation/Images/HowToClone.png)
</div>
Sur votre Mac, ouvrez l'IDE **Xcode** (disponible via l'App Store), puis cloner le dépôt en utilisant l'URL copiée précédemment :
<div align = center>
<img src="Documentation/Images/WelcomeToXcode.png" width="500" >
</div>
Vous serez alors redirigé par l'IDE et pourrez lancer l'application sur l'appareil de votre choix :
<div align = center>
<img src="Documentation/Images/LaunchApp.png" width="900" >
</div>
*Si vous souhaitez lancer l'application sur votre appareil personnel, il sera nécessaire de renseigner votre compte iCloud dans l'IDE !*
# Technologies
<img src="" />
Pour réaliser l'interface visuelle, nous avons opté pour **SwiftUI** du fait qu'elle permet de réaliser des interfaces utilisateurs complexes de manière élégante. Le framework est récent, mis à jour régulièrement, et facile à prendre en main pour le développement.
# Outils
Pour la partie API, nous avons utilisé plusieurs outils :
- UserDefaults
Pour stocker le token localement, nous utilisons l'outil fourni par SwiftUI qui est UserDefaults, afin de réaliser une authentification automatique lorsque le client ouvre l'application, en récupérant son token lors de la précédente connexion.
<div align="center">
© AllDev - Apple
</div>

@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Workspace <Workspace
version = "1.0"> version = "1.0">
<FileRef
location = "group:StubLib">
</FileRef>
<FileRef <FileRef
location = "group:Api"> location = "group:Api">
</FileRef> </FileRef>
<FileRef <FileRef
location = "group:AllInApp/AllInApp.xcodeproj"> location = "group:AllInApp/AllInApp.xcodeproj">
</FileRef> </FileRef>
<FileRef
location = "group:StubLib">
</FileRef>
<FileRef
location = "group:ViewModel">
</FileRef>
<FileRef <FileRef
location = "group:DependencyInjection/DependencyInjection.xcodeproj"> location = "group:DependencyInjection/DependencyInjection.xcodeproj">
</FileRef> </FileRef>

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array/>
</dict>
</plist>

@ -8,12 +8,12 @@
import SwiftUI import SwiftUI
import DependencyInjection import DependencyInjection
import Model import Model
import ViewModel
@main @main
struct AllInApp: App { struct AllInApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
@Environment(\.scenePhase) var phase
let DI = DependencyInjection.shared let DI = DependencyInjection.shared
init() { init() {
@ -23,17 +23,6 @@ struct AllInApp: App {
var body: some Scene { var body: some Scene {
WindowGroup { WindowGroup {
ContentView() ContentView()
.onAppear {
AppStateContainer.shared.notificationState.scheduleNotifications()
}
.onChange(of: phase) { newPhase in
switch newPhase {
case .background, .inactive:
UIApplication.shared.shortcutItems = QuickAction.allShortcutItems
default:
break
}
}
} }
} }
} }

@ -0,0 +1,41 @@
//
// AppDelegate.swift
// AllIn
//
// Created by Emre on 17/12/2023.
//
import UIKit
class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
return true
}
func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
}
func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
}
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
}

@ -12,10 +12,9 @@ class AppStateContainer: ObservableObject {
static let shared = AppStateContainer() static let shared = AppStateContainer()
let loggedState: LoggedState = LoggedState() let loggedState: LoggedState = LoggedState()
var onlineStatus: OnlineStatus = OnlineStatus() var onlineStatus: OnlineStatus = OnlineStatus()
var notificationState: NotificationService = NotificationService() var user: User?
@Published var user: User?
@AppStorage("authenticationRefresh", store: UserDefaults(suiteName: "group.alldev.AllIn")!) var authenticationRefresh: String? @AppStorage("authenticationRefresh") var authenticationRefresh: String?
} }
class LoggedState: ObservableObject { class LoggedState: ObservableObject {

@ -1,38 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF8",
"green" : "0x99",
"red" : "0x23"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF8",
"green" : "0x99",
"red" : "0x23"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

@ -20,7 +20,7 @@
} }
], ],
"color" : { "color" : {
"color-space" : "display-p3", "color-space" : "srgb",
"components" : { "components" : {
"alpha" : "1.000", "alpha" : "1.000",
"blue" : "0x45", "blue" : "0x45",

@ -1,38 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x24",
"green" : "0x24",
"red" : "0x24"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x24",
"green" : "0x24",
"red" : "0x24"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

@ -1,38 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x8A",
"green" : "0x2B",
"red" : "0xFE"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x8A",
"green" : "0x2B",
"red" : "0xFE"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

@ -1,38 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xA8",
"green" : "0x49",
"red" : "0xC2"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xA8",
"green" : "0x49",
"red" : "0xC2"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

@ -1,38 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xC5",
"green" : "0x66",
"red" : "0x8A"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xC5",
"green" : "0x66",
"red" : "0x8A"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Vector (3).png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,38 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x3C",
"green" : "0x3C",
"red" : "0x3C"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0xFF",
"red" : "0xFF"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

@ -1,38 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0xE8",
"red" : "0xD1"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0xE8",
"red" : "0xD1"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "allCoinBlack.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Group 107 (1).png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 681 B

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Vector.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 986 B

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "blueFlame.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Group 179.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 832 B

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Group 210.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Exclude (1).png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "GiftEarn.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Gift.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "globe.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Group 280.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Mask group (3).png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 MiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "PinkAllCoin.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 693 B

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "PinkBadge.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1008 B

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "pinkFlame.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "UserPink.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 843 B

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "Trophy.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 975 B

@ -8,12 +8,11 @@
import SwiftUI import SwiftUI
struct AllcoinsCapsule: View { struct AllcoinsCapsule: View {
var gains: Int
var body: some View { var body: some View {
Text("Vous remportez") Text("Vous remportez")
.foregroundColor(.white) .foregroundColor(.white)
HStack{ HStack{
Text(gains.description) Text("2340")
.textStyle(weight: .bold, color: .white, size: 60) .textStyle(weight: .bold, color: .white, size: 60)
Image("allcoinWhiteIcon") Image("allcoinWhiteIcon")
.resizable() .resizable()
@ -31,6 +30,6 @@ struct AllcoinsCapsule: View {
struct AllcoinsCapsule_Previews: PreviewProvider { struct AllcoinsCapsule_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
AllcoinsCapsule(gains: 100) AllcoinsCapsule()
} }
} }

@ -8,23 +8,17 @@
import SwiftUI import SwiftUI
struct AllcoinsCounter: View { struct AllcoinsCounter: View {
var backgroundColor: Color = .white
var foregroundColor: Color = AllInColors.primaryColor
@ObservedObject var appStateContainer = AppStateContainer.shared
var body: some View { var body: some View {
HStack(alignment: .center) { HStack(alignment: .center) {
Text(String(appStateContainer.user!.nbCoins))
.contentTransition(.numericText())
.fontWeight(.black)
.foregroundColor(foregroundColor)
Image("allcoinIcon") Image("allcoinIcon")
.resizable() .resizable()
.frame(width: 17, height: 17, alignment: .leading) .frame(width: 17, height: 17, alignment: .leading)
Text(String(AppStateContainer.shared.user?.nbCoins ?? 0))
.fontWeight(.black)
.foregroundColor(AllInColors.primaryColor)
} }
.frame(width: 90, height: 40) .frame(width: 90, height: 40)
.background(backgroundColor) .background(Color.white)
.cornerRadius(9999, corners: [.topLeft, .bottomLeft]) .cornerRadius(9999, corners: [.topLeft, .bottomLeft])
} }

@ -6,35 +6,24 @@
// //
import SwiftUI import SwiftUI
import Model
struct BetCard: View { struct BetCard: View {
var bet: Bet
@State var showDetails: Bool = false
@State var showParticipate: Bool = false
var body: some View { var body: some View {
VStack(spacing: 0) { VStack(spacing: 0){
VStack(alignment: .leading,spacing: 2){ VStack(alignment: .leading,spacing: 2){
HStack{ HStack{
Spacer() Spacer()
Text("bet_proposed_by_format \(bet.author.capitalized)") Text("proposé par Lucas").font(.system(size: 10)).foregroundColor(AllInColors.grey800Color)
.font(.system(size: 10))
.foregroundColor(AllInColors.grey800Color)
} }
Text(bet.theme) Text("Etudes").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
.font(.system(size: 15)) Text("Emre va réussir son TP de CI/CD mercredi?").font(.system(size: 20)).fontWeight(.bold)
.foregroundColor(AllInColors.grey800Color)
Text(bet.phrase)
.font(.system(size: 20))
.fontWeight(.bold)
HStack{ HStack{
Text("bet_starting") Text("Commence le").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
.font(.system(size: 15)) TextCapsule()
.foregroundColor(AllInColors.grey800Color) TextCapsule()
TextCapsule(date: bet.endRegisterDate)
Spacer() Spacer()
} }
} }
.frame(width: .infinity) .frame(width: .infinity)
@ -44,17 +33,36 @@ struct BetCard: View {
VStack(alignment: .leading,spacing: 2){ VStack(alignment: .leading,spacing: 2){
HStack{ HStack{
Spacer() Spacer()
UsersPreview(users: []) UsersPreview()
Text("bet_players_waiting_format \(bet.invited.count.description)") Text(" 4 joueurs en attente").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color).fontWeight(.medium)
.font(.system(size: 15))
.foregroundColor(AllInColors.grey800Color)
.fontWeight(.medium)
Spacer() Spacer()
}.padding(0)
Button {
} label: {
Text("Participer")
.font(.system(size: 30))
.fontWeight(.bold)
.frame(maxWidth: .infinity).padding(10)
.multilineTextAlignment(.center)
.overlay {
AllInColors.primaryGradient.frame(width: 170)
.mask(
Text("Participer")
.font(.system(size: 30))
.fontWeight(.bold)
.frame(maxWidth: .infinity).padding(10)
)
}
} }
.padding(0) .accentColor(AllInColors.componentBackgroundColor)
ParticipateButton(isOpen: $showDetails, isParticapatedOpen: $showParticipate, bet: bet) .buttonStyle(.borderedProminent).cornerRadius(4.0)
.padding(.top, 5) .overlay(
RoundedRectangle(cornerRadius: 12).stroke(AllInColors.delimiterGrey, lineWidth: 1)
).padding([.top],5)
} }
.frame(width: .infinity) .frame(width: .infinity)
.padding(.all,8) .padding(.all,8)
@ -62,25 +70,12 @@ struct BetCard: View {
.cornerRadius(20, corners: [.bottomLeft,.bottomRight]) .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
.border(width: 1, edges: [.top], color: AllInColors.delimiterGrey) .border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
} }
.onTapGesture {
showDetails.toggle()
}
.fullScreenCover(isPresented: $showDetails) {
DetailsView(isModalPresented: $showDetails, isModalParticipated: $showParticipate, id: bet.id)
}
} }
} }
struct BetCard_Previews: PreviewProvider { struct BetCard_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
BetCard(bet: BinaryBet(theme: "Football - Finale de la Ligue des Champions", BetCard()
phrase: "Le gagnant de la finale sera l'équipe avec le plus de tirs au but.", .preferredColorScheme(.dark)
endRegisterDate: Date().addingTimeInterval(86400),
endBetDate: Date().addingTimeInterval(172800),
isPrivate: false,
status: .inProgress,
invited: [],
author: "Imri"))
.preferredColorScheme(.dark)
} }
} }

@ -1,47 +0,0 @@
//
// BetLineLoading.swift
// AllIn
//
// Created by Lucas Delanier on 19/01/2024.
//
import SwiftUI
import Model
struct BetLineLoading: View {
@State var showInfos: Bool = false
var bet: BetDetail
var value: CGFloat {
let totalParticipations = bet.participations.count
let numberOfYes = bet.participations.filter { $0.answer.uppercased() == "YES" }.count
let numberOfNo = bet.participations.filter { $0.answer.uppercased() == "NO" }.count
if(numberOfNo == 0 && numberOfYes == 0){
return 0.5
}
return totalParticipations > 0 ? CGFloat(numberOfYes) / CGFloat(totalParticipations) : 0.0
}
var yesParticipations: [Participation] {
bet.participations.filter { $0.answer.uppercased() == "YES" }
}
var noParticipations: [Participation] {
bet.participations.filter { $0.answer.uppercased() == "NO" }
}
var body: some View {
switch bet.bet {
case is BinaryBet:
BinaryBetLine(bet: bet)
case is CustomBet:
CustomBetLine(bet: bet)
default:
BinaryBetLine(bet: bet)
}
}
}

@ -1,168 +0,0 @@
//
// BinaryBetLine.swift
// AllIn
//
// Created by Lucas Delanier on 10/06/2024.
//
import SwiftUI
import Model
struct BinaryBetLine: View {
@State var showInfos: Bool = false
var bet: BetDetail
var value: CGFloat {
let totalParticipations = bet.participations.count
let numberOfYes = bet.participations.filter { $0.answer.uppercased() == "YES" }.count
let numberOfNo = bet.participations.filter { $0.answer.uppercased() == "NO" }.count
if(numberOfNo == 0 && numberOfYes == 0){
return 0.5
}
return totalParticipations > 0 ? CGFloat(numberOfYes) / CGFloat(totalParticipations) : 0.0
}
var yesParticipations: [Participation] {
bet.participations.filter { $0.answer.uppercased() == "YES" }
}
var noParticipations: [Participation] {
bet.participations.filter { $0.answer.uppercased() == "NO" }
}
var body: some View {
VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 5) {
Text("OUI")
.font(.system(size: 25))
.fontWeight(.bold)
.foregroundColor(AllInColors.blue200)
Spacer()
Text("NON")
.font(.system(size: 25))
.fontWeight(.bold)
.foregroundColor(AllInColors.pink100)
}
GeometryReader { geometry in
ZStack(alignment: .leading) {
HStack{
Spacer()
Rectangle()
.frame(width: min(CGFloat(1-self.value) * geometry.size.width, geometry.size.width-20), height: 17)
.foregroundStyle(AllInColors.PinkBetGradiant).cornerRadius(999)
}
HStack(spacing: 0) {
Rectangle()
.frame(width: min(CGFloat(self.value) * geometry.size.width, geometry.size.width-20), height: 17)
.foregroundStyle(AllInColors.BlueBetGradiant)
.cornerRadius(999)
Image("loadingHeartIcon")
.resizable()
.frame(width: 29, height: 32)
.padding(.leading, -10)
}
}
.padding(.bottom, 5)
}
.frame(height: 40)
HStack {
Spacer()
Text("bet_status_details_drawer")
.textStyle(weight: .medium, color: AllInColors.primaryTextColor, size: 10)
Image(showInfos ? "chevronUpIcon" : "chevronDownIcon")
.resizable()
.frame(width: 10, height: 7)
.scaledToFill()
}
.onTapGesture {
withAnimation {
showInfos.toggle()
}
}
.padding(.bottom, 5)
.padding(.trailing, 5)
if showInfos {
VStack(spacing: 1) {
HStack(spacing: 5) {
Image("blueAllCoinIcon")
.resizable()
.frame(width:12, height: 12)
Text(yesParticipations.reduce(0, {x,y in x + y.stake}).description)
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(AllInColors.blue200)
Spacer()
Text(noParticipations.reduce(0, {x,y in x + y.stake}).description)
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(AllInColors.pink100)
Image("pinkAllCoinIcon")
.resizable()
.frame(width: 12, height: 12)
}
HStack(spacing: 5){
Image("bluePersonIcon")
.resizable()
.frame(width: 12, height: 12)
Text(yesParticipations.count.description)
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(AllInColors.blue200)
Spacer()
Text(noParticipations.count.description)
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(AllInColors.pink100)
Image("pinkPersonIcon")
.resizable()
.frame(width: 12, height: 12)
}
HStack(spacing: 5){
Image("blueBadgeIcon")
.resizable()
.frame(width: 12, height: 12)
Text(yesParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(AllInColors.blue200)
Spacer()
Text(noParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(AllInColors.pink100)
Image("pinkBadgeIcon")
.resizable()
.frame(width: 12, height: 12)
}
HStack(spacing: 5){
Image("blueTrophyIcon")
.resizable()
.frame(width: 12, height: 12)
Text("1.2")
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(AllInColors.blue200)
Spacer()
Text("1.2")
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(AllInColors.pink100)
Image("pinkTrophyIcon")
.resizable()
.frame(width:12, height: 12)
}
}
}
}
}
}

@ -6,39 +6,22 @@
// //
import SwiftUI import SwiftUI
import Model
struct ChoiceCapsule: View { struct ChoiceCapsule: View {
let filter: BetFilter
@State var pressed = false
@ObservedObject var viewModel: BetViewModel
var label: String { @State var pressed = false
switch filter {
case .isPublic:
return String(localized: "bet_public")
case .isInvitation:
return String(localized: "bet_invitation")
case .inProgress:
return String(localized: "bet_current")
case .isFinished:
return String(localized: "bet_finished")
default:
return "NaN"
}
}
var body: some View { var body: some View {
Group { Group {
if(pressed) { if(pressed) {
Text(label) Text("En cours")
.textStyle(weight: .semibold, color: .white, size: 15) .textStyle(weight: .semibold, color: .white, size: 15)
.padding([.leading,.trailing],13.8) .padding([.leading,.trailing],13.8)
.padding([.top,.bottom], 7) .padding([.top,.bottom], 7)
.background(AllInColors.lightPurpleColor) .background(AllInColors.lightPurpleColor)
.clipShape(Capsule()) .clipShape(Capsule())
} else { } else {
Text(label) Text("En cours")
.textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15) .textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15)
.padding([.leading,.trailing], 15) .padding([.leading,.trailing], 15)
.padding([.top,.bottom], 7) .padding([.top,.bottom], 7)
@ -52,12 +35,13 @@ struct ChoiceCapsule: View {
} }
.onTapGesture() { .onTapGesture() {
pressed.toggle() pressed.toggle()
if(pressed) {
viewModel.filters.insert(filter)
} else {
viewModel.filters.remove(filter)
}
} }
} }
} }
struct ChoiceCapsule_Previews: PreviewProvider {
static var previews: some View {
ChoiceCapsule()
}
}

@ -1,43 +0,0 @@
//
// ChoiceFinalAnswerCell.swift
// AllIn
//
// Created by Lucas Delanier on 29/01/2024.
//
import Foundation
import SwiftUI
import Model
struct ChoiceFinalAnswerCell: View {
var selected = false
var answer: AnswerDetail
var rawColor = AllInColors.blueAccentColor
var body: some View {
ZStack {
HStack {
Spacer()
Text(answer.response)
.textStyle(weight: .bold, color: selected ? .white : rawColor, size: 40)
.padding(.vertical, 10)
Spacer()
}
HStack {
Spacer()
OddCapsule(
backgroundColor: selected ? .white : AllInColors.purpleAccentColor,
foregroundColor: selected ? AllInColors.purpleAccentColor : .white,
odd: answer.odds
)
.padding(.trailing, 20)
.scaleEffect(0.9)
}
}
.background(selected ? AllInColors.purpleAccentColor : .white)
.cornerRadius(17)
.scaleEffect(selected ? 1.02 : 1)
.animation(.easeInOut(duration: 0.3), value: selected)
}
}

@ -1,141 +0,0 @@
//
// CustomBetLine.swift
// AllIn
//
// Created by Lucas Delanier on 10/06/2024.
//
import SwiftUI
import Model
struct CustomBetLine: View {
@State var showInfos: [String: Bool] = [:]
var bet: BetDetail
var participationsForAnswer: [String: [Participation]] {
Dictionary(grouping: bet.participations, by: { $0.answer.uppercased() })
}
var sortedAnswers: [AnswerDetail] {
bet.answers.sorted { $0.totalParticipants > $1.totalParticipants }
}
func getTextStyle(for answer: AnswerDetail) -> Font.Weight {
return answer == sortedAnswers.first ? .bold : .light
}
func getColor(for answer: AnswerDetail) -> Color {
return answer == sortedAnswers.first ? AllInColors.pinkAccentColor : AllInColors.blueAccentColor
}
func getGradiant(for answer: AnswerDetail) -> LinearGradient {
return answer == sortedAnswers.first ? AllInColors.PinkBetGradiant : AllInColors.BlueBetLineGradiant
}
func getFlameImage(for answer: AnswerDetail) -> String {
return answer == sortedAnswers.first ? "pinkFlameIcon" : "blueFlameIcon"
}
var body: some View {
VStack(alignment: .leading, spacing: 0) {
ForEach(sortedAnswers, id: \.response) { answer in
let participations = participationsForAnswer[answer.response.uppercased()] ?? []
let totalParticipations = bet.participations.count
let percentage = totalParticipations > 0 ? CGFloat(participations.count) / CGFloat(totalParticipations) : 0.0
VStack {
HStack {
Text(answer.response)
.font(.system(size: 15))
.fontWeight(getTextStyle(for: answer))
.foregroundColor(getColor(for: answer))
Spacer()
}
GeometryReader { geometry in
ZStack(alignment: .leading) {
HStack(spacing: 0) {
Rectangle()
.frame(width: min(percentage * geometry.size.width, geometry.size.width-20), height: 17)
.foregroundStyle(getGradiant(for: answer))
.cornerRadius(999, corners: [.topLeft, .bottomLeft])
Image(getFlameImage(for: answer))
.resizable()
.frame(width: 29, height: 32)
.padding(.leading, -6)
Text("\(Int(percentage * 100))%")
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundStyle(getColor(for: answer))
.padding(.leading, 2)
}
}
.padding(.bottom, 5)
}
.frame(height: 40)
HStack {
Spacer()
Text("bet_status_details_drawer")
.textStyle(weight: .medium, color: AllInColors.primaryTextColor, size: 10)
Image(showInfos[answer.response] ?? false ? "chevronUpIcon" : "chevronDownIcon")
.resizable()
.frame(width: 10, height: 7)
.scaledToFill()
}
.onTapGesture {
withAnimation {
showInfos[answer.response, default: false].toggle()
}
}
.padding(.trailing, 5)
if showInfos[answer.response] ?? false {
HStack{
VStack(alignment: .leading,spacing: 1) {
HStack(spacing: 5) {
Image(answer == sortedAnswers.first ? "pinkAllCoinIcon" : "blueAllCoinIcon")
.resizable()
.frame(width: 12, height: 12)
Text(participations.reduce(0, { x, y in x + y.stake }).description)
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(getColor(for: answer))
}
HStack(spacing: 5) {
Image(answer == sortedAnswers.first ? "pinkPersonIcon" : "bluePersonIcon")
.resizable()
.frame(width: 12, height: 12)
Text(participations.count.description)
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(getColor(for: answer))
}
HStack(spacing: 5) {
Image(answer == sortedAnswers.first ? "pinkBadgeIcon" : "blueBadgeIcon")
.resizable()
.frame(width: 12, height: 12)
Text(participations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(getColor(for: answer))
}
HStack(spacing: 5) {
Image(answer == sortedAnswers.first ? "pinkTrophyIcon" : "blueTrophyIcon")
.resizable()
.frame(width: 12, height: 12)
Text(String(format: "%.2f", answer.odds))
.font(.system(size: 15))
.fontWeight(.bold)
.foregroundColor(getColor(for: answer))
}
}
Spacer()
}
}
}
}
}
}
}

@ -1,66 +0,0 @@
//
// DropDownMenu.swift
// AllIn
//
// Created by Emre on 19/10/2023.
//
import SwiftUI
import Model
struct DropDownAnswerMenu: View {
@State var expand = false
@Binding var selectedAnswer: AnswerDetail
var answers: [AnswerDetail]
var body: some View {
VStack(spacing: 0, content: {
Button(action: { withTransaction(Transaction(animation: nil)) { self.expand.toggle() } }) {
HStack{
Text(selectedAnswer.response)
.textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
Text("\(selectedAnswer.odds, specifier: "%.2f")")
.textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
Spacer()
Image(expand ? "chevronUpIcon" : "chevronDownIcon").resizable().frame(width: 15, height: 10).scaledToFill()
}
.padding([.leading, .trailing], 15)
.frame(height: 43)
}
if expand {
Rectangle()
.frame(height: 1)
.foregroundColor(AllInColors.delimiterGrey)
.padding(.bottom, 18)
VStack(spacing: 0) {
ForEach(answers) { (answer: AnswerDetail) in
if answer != selectedAnswer {
Button(action: {
self.selectedAnswer = answer
self.expand.toggle()}
) {
HStack{
Text(answer.response)
.textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
Text("\(answer.odds, specifier: "%.2f")")
.textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
Spacer()
}
}
.padding(.bottom, 15)
}
}
}
.padding([.leading, .trailing], 15)
}
})
.background(AllInColors.componentBackgroundColor)
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8, style: .continuous)
.stroke(AllInColors.veryLightPurpleColor, lineWidth: 0.4)
)
}
}

@ -6,21 +6,27 @@
// //
import SwiftUI import SwiftUI
import Model
struct DropDownFriends: View { struct DropDownFriends: View {
@Binding var selectedItems: Set<String> @State private var selectedItems: Set<Int> = []
@State var expand = false @State var expand = false
var friends: [User] let friends: [(Int, Int, String, String)] = [
(0, 541, "David", "defaultUserImage"),
(1, 541, "David", "defaultUserImage"),
(2, 541, "David", "defaultUserImage"),
(3, 541, "David", "defaultUserImage"),
(4, 541, "David", "defaultUserImage"),
(5, 541, "David", "defaultUserImage")
]
var body: some View { var body: some View {
VStack(spacing: 0, content: { VStack(spacing: 0, content: {
Button(action: { self.expand.toggle() }) { Button(action: { self.expand.toggle() }) {
HStack(spacing: 3){ HStack(spacing: 3){
Text(friends.count.description) Text("41")
.textStyle(weight: .bold, color: AllInColors.primaryTextColor, size: 15) .textStyle(weight: .bold, color: AllInColors.primaryTextColor, size: 15)
Text("bet_creation_friends_available_format") Text("amis disponibles")
.textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15) .textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15)
Spacer() Spacer()
@ -36,33 +42,33 @@ struct DropDownFriends: View {
.foregroundColor(AllInColors.delimiterGrey) .foregroundColor(AllInColors.delimiterGrey)
ScrollView(.vertical) { ScrollView(.vertical) {
VStack(spacing: 0) { VStack(spacing: 0) {
ForEach(friends, id: \.self) { (friend: User) in ForEach(0..<friends.count, id: \.self) { item in
HStack { HStack {
Circle() Circle()
.fill(selectedItems.contains(friend.id) ? AllInColors.lightPurpleColor : Color.clear) .fill(selectedItems.contains(friends[item].0) ? AllInColors.lightPurpleColor : Color.clear)
.overlay( .overlay(
Circle() Circle()
.stroke(selectedItems.contains(friend.id) ? Color.clear : AllInColors.skyBlueColor, lineWidth: 1) .stroke(selectedItems.contains(friends[item].0) ? Color.clear : AllInColors.skyBlueColor, lineWidth: 1)
) )
.frame(width: 15, height: 15) .frame(width: 15, height: 15)
.padding(.trailing, 5) .padding(.trailing, 5)
UserInfo(username: friend.username, value: friend.nbCoins) UserInfo()
.contentShape(Rectangle()) .contentShape(Rectangle())
} }
.padding([.leading, .trailing], 15) .padding([.leading, .trailing], 15)
.padding([.top, .bottom], 5) .padding([.top, .bottom], 5)
.overlay( .overlay(
selectedItems.contains(friend.id) ? selectedItems.contains(friends[item].0) ?
Rectangle() Rectangle()
.fill(AllInColors.lightPurpleColor.opacity(0.13)) .fill(AllInColors.lightPurpleColor.opacity(0.13))
: nil : nil
) )
.opacity(1.0) .opacity(1.0)
.onTapGesture { .onTapGesture {
if selectedItems.contains(friend.id) { if selectedItems.contains(friends[item].0) {
selectedItems.remove(friend.id) selectedItems.remove(friends[item].0)
} else { } else {
selectedItems.insert(friend.id) selectedItems.insert(friends[item].0)
} }
} }
Rectangle() Rectangle()
@ -84,3 +90,9 @@ struct DropDownFriends: View {
) )
} }
} }
struct DropDownFriends_Previews: PreviewProvider {
static var previews: some View {
DropDownFriends()
}
}

@ -1,27 +0,0 @@
//
// EmptyInfo.swift
// AllIn
//
// Created by Lucas Delanier on 29/05/2024.
//
import SwiftUI
struct EmptyInfo: View {
let emoji: String
let title: String
let explain: String
var body: some View {
VStack{
Text(emoji).font(.system(size: 120))
Text(title).textStyle(weight: .bold, color: AllInColors.primaryTextColor , size: 15)
explain.isEmpty ? nil : Text(explain).textStyle(weight: .light, color: .gray, size: 12)
}.opacity(0.55).padding(.horizontal, 20).multilineTextAlignment(.center)
}
}
struct EmptyInfo_Previews: PreviewProvider {
static var previews: some View {
EmptyInfo(emoji:"👥", title: "Vous navez pas encore damis", explain: "Ajoutez les depuis cet écran")
}
}

@ -6,54 +6,38 @@
// //
import SwiftUI import SwiftUI
import Model
struct Friend: View { struct Friend: View {
var user: User var image: String
let isRequest: Bool var pseudo: String
@ObservedObject var viewModel: FriendsViewModel
var StatusValues: (String, Color, Color) {
switch user.friendStatus {
case .friend:
return isRequest ? (String(localized: "generic_decline"), AllInColors.grey400Color, AllInColors.componentBackgroundColor) : (String(localized: "generic_delete"), AllInColors.grey400Color, AllInColors.componentBackgroundColor)
case .notFriend:
return isRequest ? (String(localized: "generic_acccept"), .white, AllInColors.lightPurpleColor) : (String(localized: "generic_add"), .white, AllInColors.lightPurpleColor)
case .requested:
return (String(localized: "friends_request_sent"), AllInColors.grey400Color, AllInColors.componentBackgroundColor)
default:
return ("NaN", AllInColors.grey400Color, AllInColors.componentBackgroundColor)
}
}
var body: some View { var body: some View {
HStack{ HStack{
UserPicture(picture: user.image,username: user.username, size: 45) AsyncImage(url: URL(string: image))
Text(user.username) .frame(width: 50, height: 50)
.cornerRadius(180)
.scaledToFit()
Text(pseudo)
.fontWeight(.medium) .fontWeight(.medium)
.padding(.leading, 5) .padding(.leading, 5)
.font(.system(size: 18)) .font(.system(size: 18))
.lineLimit(1) .lineLimit(1)
Spacer() Spacer()
Button(StatusValues.0) { Button("Supprimer") {}
viewModel.toggleFriendStatus(for: user, isRequest: isRequest) .frame(width: 90, height: 30)
} .foregroundColor(AllInColors.grey400Color)
.minimumScaleFactor(0.3) .font(.system(size: 14))
.lineLimit(2) .background(AllInColors.componentBackgroundColor)
.frame(width: 90, height: 30) .cornerRadius(5)
.foregroundColor(StatusValues.1)
.font(.system(size: 14))
.background(StatusValues.2)
.cornerRadius(5)
if(isRequest){
Button{
viewModel.declineRequest(username: user.username)
}label: {
Image(systemName: "xmark").foregroundColor(.gray)
}.padding([.leading], 25)
}
} }
.padding([.trailing,.leading], 25) .padding([.trailing,.leading], 25)
} }
} }
struct Friend_Previews: PreviewProvider {
static var previews: some View {
Friend(image: "https://picsum.photos/536/354", pseudo: "Lucas")
}
}

@ -6,27 +6,19 @@
// //
import SwiftUI import SwiftUI
import DependencyInjection
struct Menu: View { struct Menu: View {
@Inject var authService: IAuthService
let parameters: [(String, String, String, String)] = [
("videoGameImage", String(localized: "drawer_create_a_bet"), String(localized: "drawer_create_a_bet_subtitle"), "CreationBet"),
("globeImage", String(localized: "drawer_public_bets"), String(localized: "drawer_public_bets_subtitle"), "Bet"),
("moneyImage", String(localized: "drawer_current_bets"), String(localized: "drawer_current_bets_subtitle"), "Current"),
("eyesImage", String(localized: "drawer_bet_history"), String(localized: "drawer_bet_history_subtitle"),"Historic"),
("friendsImage", String(localized: "drawer_friends"), String(localized: "drawer_friends_subtitle"), "Friends"),
("rankingImage", String(localized: "drawer_ranking"), String(localized: "drawer_ranking_subtitle"), "Ranking"),
]
var body: some View { var body: some View {
VStack(alignment: .leading, spacing: 10) { VStack(alignment: .leading, spacing: 10) {
HStack() { HStack() {
Spacer() Spacer()
VStack(){ VStack(){
UserPicture(picture: AppStateContainer.shared.user?.image, username: (AppStateContainer.shared.user?.username)!,size: 100) Image("defaultUserImage")
.resizable()
.scaledToFit()
.frame(width: 100, height: 100)
.cornerRadius(180)
Text(AppStateContainer.shared.user?.username.capitalized ?? "") Text(AppStateContainer.shared.user?.username.capitalized ?? "")
.fontWeight(.medium) .fontWeight(.medium)
.font(.system(size: 17)) .font(.system(size: 17))
@ -39,31 +31,31 @@ struct Menu: View {
HStack(spacing: 30) { HStack(spacing: 30) {
Spacer() Spacer()
VStack(){ VStack(){
Text(AppStateContainer.shared.user?.bestWin ?? 0, format: .number) Text("114")
.fontWeight(.heavy) .fontWeight(.heavy)
.font(.system(size: 15)) .font(.system(size: 15))
.foregroundColor(.white) .foregroundColor(.white)
Text(String(localized: "drawer_bets")) Text("Bets")
.fontWeight(.regular) .fontWeight(.regular)
.font(.system(size: 12)) .font(.system(size: 12))
.foregroundColor(AllInColors.grey600Color) .foregroundColor(AllInColors.grey600Color)
} }
VStack(){ VStack(){
Text(AppStateContainer.shared.user!.bestWin, format: .number) Text("343")
.fontWeight(.heavy) .fontWeight(.heavy)
.font(.system(size: 15)) .font(.system(size: 15))
.foregroundColor(.white) .foregroundColor(.white)
Text(String(localized: "drawer_best_win")) Text("Meilleur gain")
.fontWeight(.regular) .fontWeight(.regular)
.font(.system(size: 12)) .font(.system(size: 12))
.foregroundColor(AllInColors.grey600Color) .foregroundColor(AllInColors.grey600Color)
} }
VStack(){ VStack(){
Text(AppStateContainer.shared.user!.nbFriends, format: .number) Text("5")
.fontWeight(.heavy) .fontWeight(.heavy)
.font(.system(size: 15)) .font(.system(size: 15))
.foregroundColor(.white) .foregroundColor(.white)
Text(String(localized: "drawer_nb_friends")) Text("Amis")
.fontWeight(.regular) .fontWeight(.regular)
.font(.system(size: 12)) .font(.system(size: 12))
.foregroundColor(AllInColors.grey600Color) .foregroundColor(AllInColors.grey600Color)
@ -72,40 +64,44 @@ struct Menu: View {
} }
.padding(.bottom, 15) .padding(.bottom, 15)
ForEach(0..<parameters.count, id: \.self) { index in NavigationLink(destination: MainView(page: "CreationBet").navigationBarBackButtonHidden(true))
NavigationLink(destination: MainView(page: parameters[index].3).navigationBarBackButtonHidden(true)) { {
ParameterMenu(image: parameters[index].0, title: parameters[index].1, description: parameters[index].2) ParameterMenu(image: "videoGameImage", title: "CREER UN BET", description: "Créez un nouveau BET et faites participer vos amis.")
.padding([.leading, .trailing], 13) .padding([.leading,.trailing], 13)
}
} }
HStack { NavigationLink(destination: MainView(page: "Ranking").navigationBarBackButtonHidden(true))
Spacer() {
Button { ParameterMenu(image: "eyesImage", title: "HISTORIQUE DES BETS", description: "Consultez vos paris en cours et terminés.")
authService.logout() .padding([.leading,.trailing], 13)
} label: {
Text("generic_logout")
.foregroundColor(.white)
}
Spacer()
} }
Spacer() NavigationLink(destination: MainView(page: "Friends").navigationBarBackButtonHidden(true))
NavigationLink(destination: MainView(page: "Profile")
.navigationBarBackButtonHidden(true))
{ {
Image("gearIcon") ParameterMenu(image: "friendsImage", title: "AMIS", description: "Défiez vos porches en les ajoutant en amis.")
.resizable() .padding([.leading,.trailing], 13)
.frame(width: 30, height: 30)
.padding([.leading,.bottom], 20)
} }
NavigationLink(destination: MainView(page: "Bet").navigationBarBackButtonHidden(true))
{
ParameterMenu(image: "moneyImage", title: "BET EN COURS", description: "Gérez vos bets et récompensez les gagnants.")
.padding([.leading,.trailing], 13)
}
NavigationLink(destination: MainView(page: "Ranking").navigationBarBackButtonHidden(true))
{
ParameterMenu(image: "rankingImage", title: "CLASSEMENT", description: "Consultez votre classement parmis vos amis.")
.padding([.leading,.trailing], 13)
}
Spacer()
Image("gearIcon")
.resizable()
.frame(width: 30, height: 30)
.padding([.leading,.bottom], 20)
} }
.frame(maxWidth: .infinity,alignment: .leading) .frame(maxWidth: .infinity,alignment: .leading)
.background(AllInColors.primaryColor) .background(AllInColors.primaryColor)
.edgesIgnoringSafeArea(.bottom) .edgesIgnoringSafeArea(.bottom)
.onAppear {
authService.refreshAuthentication()
}
} }
} }

@ -1,33 +0,0 @@
//
// OddCapsule.swift
// AllIn
//
// Created by Lucas Delanier on 03/02/2024.
//
import Foundation
import SwiftUI
struct OddCapsule: View {
var backgroundColor: Color = AllInColors.purpleAccentColor
var foregroundColor: Color = AllInColors.whiteColor
var odd: Float = 0.0
var body: some View {
HStack(alignment: .center) {
Text("x\(odd, specifier: "%.2f")")
.fontWeight(.bold)
.foregroundColor(foregroundColor)
}
.padding(.horizontal, 10)
.padding(.vertical,5)
.background(backgroundColor)
.cornerRadius(9999)
}
}
struct OddCapsule_Previews: PreviewProvider {
static var previews: some View {
OddCapsule()
}
}

@ -1,72 +0,0 @@
//
// ParticipateButton.swift
// AllIn
//
// Created by Lucas Delanier on 15/01/2024.
//
import SwiftUI
import Model
struct ParticipateButton: View {
@Binding var isOpen : Bool
@Binding var isParticapatedOpen: Bool
var bet: Bet?
var isDisabled: Bool {
guard bet?.author != AppStateContainer.shared.user?.username else { return true }
if let betType = bet?.status {
switch betType {
case .inProgress:
return false
default:
return true
}
} else {
return true
}
}
var body: some View {
Button {
isOpen = true
isParticapatedOpen = true
} label: {
Text("bet_participate")
.font(.system(size: 27))
.fontWeight(.semibold)
.frame(maxWidth: .infinity).padding(10)
.multilineTextAlignment(.center)
.overlay {
switch isDisabled {
case true:
AllInColors.grey700Color.frame(width: 170)
.mask(
Text("bet_participate")
.font(.system(size: 27))
.fontWeight(.semibold)
.frame(maxWidth: .infinity).padding(10)
)
case false:
AllInColors.primaryGradient.frame(width: 170)
.mask(
Text("bet_participate")
.font(.system(size: 27))
.fontWeight(.semibold)
.frame(maxWidth: .infinity).padding(10)
)
}
}
.accentColor(AllInColors.componentBackgroundColor)
.background(isDisabled ? AllInColors.delimiterGrey.opacity(0.5):AllInColors.whiteColor)
.buttonStyle(.borderedProminent).cornerRadius(4.0)
.overlay(
RoundedRectangle(cornerRadius: 12).stroke(AllInColors.delimiterGrey, lineWidth: 1)
)
}
.disabled(isDisabled)
}
}

@ -1,120 +0,0 @@
//
// ParticipationModal.swift
// AllIn
//
// Created by Lucas Delanier on 16/01/2024.
//
import SwiftUI
import Model
struct ParticipationModal: View {
@Binding var selectedAnswer: AnswerDetail
@Binding var mise: String
var phrase: String
var answers: [AnswerDetail]
var participationAddedCallback: () -> Void
var checkAndSetError: () -> Bool
var possibleGain: Int {
if let stake = Float(mise) {
return Int(round(stake * selectedAnswer.odds))
} else {
return 0
}
}
var body: some View {
GeometryReader { geometry in
VStack(alignment: .leading){
HStack{
Spacer()
Rectangle()
.foregroundStyle(AllInColors.lightGrey300Color)
.frame(maxWidth: 80, maxHeight: 5)
.cornerRadius(999)
Spacer()
}
.padding(10)
HStack{
Text("bet_status_place_your_bets")
.font(.system(size: 18))
.foregroundColor(AllInColors.primaryTextColor)
.fontWeight(.semibold)
Spacer()
AllcoinsCounter(backgroundColor: AllInColors.lightPurpleColor, foregroundColor: .white)
}
.padding(.leading, 15)
VStack(alignment: .leading){
Text(phrase)
.font(.system(size: 13))
.foregroundColor(AllInColors.primaryTextColor)
.fontWeight(.light)
DropDownAnswerMenu(selectedAnswer: $selectedAnswer, answers: answers)
TextField("", text: $mise, prompt: Text("generic_stake")
.foregroundColor(AllInColors.lightGrey300Color)
.font(.system(size: 16))
.fontWeight(.bold))
.padding()
.keyboardType(.numberPad)
.background(
RoundedRectangle(cornerRadius: 9)
.fill(AllInColors.lightGrey200Color)
.frame(height: 40)
)
.frame(height: 40)
.foregroundColor(.black)
.overlay(
RoundedRectangle(cornerRadius: 8, style: .continuous)
.stroke(AllInColors.delimiterGrey, lineWidth: 1)
)
.padding(.bottom, 5)
}
.padding(15)
Spacer()
VStack{
HStack{
Text("participation_possible_winnings")
.font(.system(size: 13))
.foregroundColor(AllInColors.primaryTextColor)
.fontWeight(.medium)
Spacer()
Text(possibleGain.description)
.font(.system(size: 13))
.foregroundColor(AllInColors.primaryTextColor)
.fontWeight(.bold)
Image("allcoinIcon")
.resizable()
.frame(width: 11, height: 12)
}
.padding(.top, 10)
.padding(.bottom, 0)
Button {
participationAddedCallback()
} label: {
Text("Miser")
.font(.system(size: 23))
.foregroundColor(AllInColors.whiteColor)
.fontWeight(.bold)
.frame(maxWidth: .infinity)
.padding(.vertical, 3)
}
.buttonStyle(.borderedProminent)
.tint(AllInColors.lightPurpleColor)
.disabled(checkAndSetError())
.padding(.bottom, 5)
}
.padding(.horizontal, 10)
.background(AllInColors.whiteColor)
.border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
}
.background(AllInColors.underComponentBackgroundColor)
}
}
}

@ -10,20 +10,37 @@ import SwiftUI
struct RankingRow: View { struct RankingRow: View {
var number: Int var number: Int
var image: String? var image: String
var pseudo: String var pseudo: String
var allCoins: Int var allCoins: Int
var body: some View { var body: some View {
HStack(){ HStack(){
Text(number.description) Text(String(number))
.textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 18) .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 18)
UserInfo(username: pseudo, picture: image, value: allCoins) .padding(.leading, 15)
Image(image)
.resizable()
.scaledToFit()
.frame(width: 40, height: 40)
.cornerRadius(180)
.padding([.bottom,.top], 10)
Text(pseudo)
.fontWeight(.medium)
.font(.system(size: 16))
.lineLimit(1)
Spacer()
Image("allcoinIcon")
.resizable()
.frame(width: 17, height: 17, alignment: .leading)
Text(String(allCoins))
.textStyle(weight: .black, color: AllInColors.lightPurpleColor, size: 16)
.padding(.trailing, 15)
} }
.padding(10)
.padding(.horizontal, 5)
.background(AllInColors.componentBackgroundColor) .background(AllInColors.componentBackgroundColor)
.cornerRadius(8) .cornerRadius(8)
.padding([.leading,.trailing],20)
.frame(maxWidth: 750) .frame(maxWidth: 750)
} }
} }

@ -6,37 +6,33 @@
// //
import SwiftUI import SwiftUI
import Model
struct RecapBetCard: View { struct RecapBetCard: View {
var betResult: BetResultDetail
@GestureState private var longPressTap = false @GestureState private var longPressTap = false
@State private var isPressed = false @State private var isPressed = false
@State var showDetails: Bool = false
@State var showPartipated: Bool = false
var body: some View { var body: some View {
VStack(spacing: 0){ VStack(spacing: 0){
VStack(alignment: .leading,spacing: 2){ VStack(alignment: .leading,spacing: 2){
HStack{ HStack{
Spacer() Spacer()
Text("bet_proposed_by_format \(betResult.bet.author)") Text("proposé par Lucas")
.font(.system(size: 10)) .font(.system(size: 10))
.foregroundColor(AllInColors.grey800Color) .foregroundColor(AllInColors.grey800Color)
} }
Text(betResult.bet.theme) Text("Etudes")
.font(.system(size: 15)) .font(.system(size: 15))
.foregroundColor(AllInColors.grey800Color) .foregroundColor(AllInColors.grey800Color)
Text(betResult.bet.phrase) Text("Emre va réussir son TP de CI/CD mercredi?")
.font(.system(size: 20)) .font(.system(size: 20))
.fontWeight(.bold) .fontWeight(.bold)
HStack{ HStack{
Text("bet_ends") Text("Fini le ")
.font(.system(size: 15)) .font(.system(size: 15))
.foregroundColor(AllInColors.grey800Color) .foregroundColor(AllInColors.grey800Color)
TextCapsule(date: betResult.bet.endBetDate) TextCapsule()
TextCapsule()
Spacer() Spacer()
} }
} }
@ -50,7 +46,7 @@ struct RecapBetCard: View {
Text("Mise") Text("Mise")
.textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15) .textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15)
Spacer() Spacer()
Text(betResult.participation.stake.description) Text("1630")
.textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15) .textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15)
Image("Allcoins") Image("Allcoins")
.resizable() .resizable()
@ -67,13 +63,13 @@ struct RecapBetCard: View {
Text("Gains") Text("Gains")
.textStyle(weight: .medium, color: AllInColors.lightPurpleColor, size: 15) .textStyle(weight: .medium, color: AllInColors.lightPurpleColor, size: 15)
Spacer() Spacer()
Text(betResult.amount.description) Text("1630")
.font(.system(size: 15)) .font(.system(size: 15))
.fontWeight(.medium) .fontWeight(.medium)
.overlay { .overlay {
AllInColors.primaryGradient.frame(width: 50) AllInColors.primaryGradient.frame(width: 50)
.mask( .mask(
Text(betResult.amount.description).font(.system(size: 15)).fontWeight(.medium) Text("1630").font(.system(size: 15)).fontWeight(.medium)
) )
} }
.padding(0) .padding(0)
@ -89,35 +85,37 @@ struct RecapBetCard: View {
HStack{ HStack{
Text("Côte totale").font(.system(size: 15)).fontWeight(.medium) Text("Côte totale").font(.system(size: 15)).fontWeight(.medium)
Spacer() Spacer()
// TODO bind le odd Text("3,46")
Text("1,0")
.textStyle(weight: .bold, color: .white, size: 18) .textStyle(weight: .bold, color: .white, size: 18)
.padding([.leading,.trailing],10) .padding([.leading,.trailing],10)
.padding([.top,.bottom],5) .padding([.top,.bottom],5)
.background(AllInColors.primaryGradient) .background(AllInColors.primaryGradient)
.cornerRadius(8, corners: .allCorners) .cornerRadius(8, corners: .allCorners)
}
.padding([.bottom],10)
} }.padding([.bottom],10)
.frame(width: .infinity)
.padding([.top,.bottom],8)
.padding([.leading,.trailing],15) }.frame(width: .infinity)
.background(AllInColors.underComponentBackgroundColor) .padding([.top,.bottom],8)
.cornerRadius(20, corners: [.bottomLeft,.bottomRight]) .padding([.leading,.trailing],15)
.padding(.bottom,0).border(width: 1, edges: [.top], color: AllInColors.delimiterGrey) .background(AllInColors.underComponentBackgroundColor)
} .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
.scaleEffect(longPressTap ? 0.97 : 1.0) .padding(.bottom,0).border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
.animation(.easeInOut, value: longPressTap) }.scaleEffect(longPressTap ? 0.97 : 1.0)
.onTapGesture { .animation(.easeInOut, value: longPressTap)
showDetails.toggle() .gesture(
}.fullScreenCover(isPresented: $showDetails) { LongPressGesture(minimumDuration: 0.5)
DetailsView(isModalPresented: $showDetails, isModalParticipated: $showPartipated, id: betResult.bet.id) .updating($longPressTap) { value, state, _ in
} state = value
.gesture( }
LongPressGesture(minimumDuration: 0.5) )
.updating($longPressTap) { value, state, _ in }
state = value }
}
) struct RecapBetCard_Previews: PreviewProvider {
static var previews: some View {
RecapBetCard()
.preferredColorScheme(.dark)
} }
} }

@ -1,39 +0,0 @@
//
// ResultBanner.swift
// AllIn
//
// Created by Lucas Delanier on 15/01/2024.
//
import SwiftUI
import Model
struct ResultBanner: View {
var finalAnswer: Participation
var odds: Float
var body: some View {
VStack{
HStack{
Image(systemName: "trophy.fill").resizable().frame(maxWidth: 70, maxHeight: 60).foregroundColor(AllInColors.blueGrey800Color)
Text(finalAnswer.answer).font(.system(size: 70)).fontWeight(.bold).foregroundStyle(AllInColors.blueGrey800Color)
}.frame(height: 80)
HStack(spacing: 20){
HStack{
Image("blueAllCoinIcon").resizable().frame(maxWidth: 12, maxHeight: 12)
Text(finalAnswer.stake.description).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
}
HStack{
Image("bluePersonIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
Text(finalAnswer.username).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
}
HStack{
Image("blueTrophyIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
Text("\(odds, specifier: "%.2f")").font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
}
}
}
.frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/)
.padding(.vertical, 20).background(AllInColors.winBannerBackground)
.border(width: 2, edges: [.top,.bottom], color: AllInColors.blueAccentColor.opacity(0.2))
}
}

@ -1,113 +0,0 @@
//
// BetCard.swift
// AllIn
//
// Created by Lucas on 24/09/2023.
//
import SwiftUI
import Model
struct ReviewCard: View {
@State var showDetails: Bool = false
@State var showPartipated: Bool = false
var bet: Bet
var amount: Int
var isWin: Bool
var body: some View {
VStack(spacing: 0){
VStack(alignment: .leading,spacing: 2){
HStack{
Spacer()
Text("bet_proposed_by_format \(bet.author)")
.font(.system(size: 10))
.foregroundColor(AllInColors.grey800Color)
}
Text(bet.theme).font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
Text(bet.phrase).font(.system(size: 20)).fontWeight(.bold)
HStack{
Text("bet_ends").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
TextCapsule(date: bet.endBetDate)
Spacer()
}
}
.frame(width: .infinity)
.padding(.all,15)
.background(AllInColors.componentBackgroundColor)
.cornerRadius(20, corners: [.topLeft,.topRight]).padding(.bottom,0)
VStack(alignment: .center,spacing:0){
HStack(){
Spacer()
if bet.status == .finished {
Text(amount.description)
.foregroundColor(.white)
.font(.system(size: 25))
.fontWeight(.bold)
Image("allcoinWhiteIcon")
.resizable()
.frame(width: 18, height: 20)
}
switch bet.status {
case .waiting, .inProgress:
Text("bet_status_stake")
.foregroundColor(.white)
.font(.system(size: 25))
.fontWeight(.bold)
case .closing:
Text("bet_status_finished")
.foregroundColor(.white)
.font(.system(size: 25))
.fontWeight(.bold)
case .finished:
Text(isWin ? "Gagnés!" : "Perdus!")
.foregroundColor(.white)
.font(.system(size: 25))
.fontWeight(.bold)
case .cancelled:
Text("cancelled")
.foregroundColor(.white)
.font(.system(size: 25))
.fontWeight(.bold)
}
Spacer()
}
.frame(width: .infinity)
.padding(.all,10)
}
.frame(width: .infinity)
.padding(.all,2)
.background(backgroundColor())
.cornerRadius(20, corners: [.bottomLeft,.bottomRight])
}
.onTapGesture {
showDetails.toggle()
}.fullScreenCover(isPresented: $showDetails) {
DetailsView(isModalPresented: $showDetails, isModalParticipated: $showPartipated, id: bet.id)
}
}
private func backgroundColor() -> some View {
Group {
if bet.status == .finished && isWin {
AllInColors.primaryGradient
} else {
switch bet.status {
case .inProgress, .waiting, .closing:
AllInColors.grey50Color
case .finished:
Color.black
case .cancelled:
Color.red
}
}
}
}
}

@ -8,56 +8,21 @@
import SwiftUI import SwiftUI
struct TextCapsule: View { struct TextCapsule: View {
var date: Date
private var formattedDate: String {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "dd MMM"
return dateFormatter.string(from: date)
}
private var formattedTime: String {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "HH:mm"
return dateFormatter.string(from: date)
}
var body: some View { var body: some View {
HStack { Text("12 sept.").font(.system(size: 15))
Text(formattedDate) .foregroundColor(AllInColors.lightPurpleColor)
.font(.system(size: 15)) .fontWeight(.bold)
.foregroundColor(AllInColors.lightPurpleColor) .padding([.leading,.trailing],10)
.fontWeight(.bold) .padding([.top,.bottom], 5).background(AllInColors.underComponentBackgroundColor)
.padding([.leading, .trailing], 10) .clipShape(Capsule())
.padding([.top, .bottom], 5) .overlay(RoundedRectangle(cornerRadius: 20)
.background(AllInColors.underComponentBackgroundColor) .stroke(AllInColors.delimiterGrey, lineWidth: 1)
.clipShape(Capsule()) )
.overlay(
RoundedRectangle(cornerRadius: 20)
.stroke(AllInColors.delimiterGrey, lineWidth: 1)
)
Text(formattedTime)
.font(.system(size: 15))
.foregroundColor(AllInColors.lightPurpleColor)
.fontWeight(.bold)
.padding([.leading, .trailing], 10)
.padding([.top, .bottom], 5)
.background(AllInColors.underComponentBackgroundColor)
.clipShape(Capsule())
.overlay(
RoundedRectangle(cornerRadius: 20)
.stroke(AllInColors.delimiterGrey, lineWidth: 1)
)
Spacer()
}
} }
} }
struct TextCapsule_Previews: PreviewProvider { struct TextCapsule_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
TextCapsule(date: Date()) TextCapsule()
} }
} }

@ -6,14 +6,8 @@
// //
import SwiftUI import SwiftUI
import Model
struct TrendingBetCard: View { struct TrendingBetCard: View {
var bet: Bet
@State var showDetails: Bool = false
@State var showParticipate: Bool = false
var body: some View { var body: some View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack { HStack {
@ -21,12 +15,12 @@ struct TrendingBetCard: View {
.resizable() .resizable()
.frame(width: 15, height: 15, alignment: .leading) .frame(width: 15, height: 15, alignment: .leading)
Text("bet_popular") Text("Populaire")
.textStyle(weight: .medium, color: AllInColors.pinkAccentColor, size: 17) .textStyle(weight: .medium, color: AllInColors.pinkAccentColor, size: 17)
} }
.padding([.leading, .top], 10) .padding([.leading, .top], 10)
Text(bet.theme) Text("Emre va réussir son TP de CI/CD mercredi?")
.textStyle(weight: .heavy, color: .white, size: 17) .textStyle(weight: .heavy, color: .white, size: 17)
.frame(height: 47) .frame(height: 47)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
@ -39,7 +33,7 @@ struct TrendingBetCard: View {
Text("12") Text("12")
.textStyle(weight: .bold, color: AllInColors.pinkAccentColor, size: 14) .textStyle(weight: .bold, color: AllInColors.pinkAccentColor, size: 14)
Text("bet_players_format") Text("joueurs")
.textStyle(weight: .regular, color: .white, size: 14) .textStyle(weight: .regular, color: .white, size: 14)
.padding([.leading], 2) .padding([.leading], 2)
@ -47,7 +41,7 @@ struct TrendingBetCard: View {
.textStyle(weight: .bold, color: AllInColors.pinkAccentColor, size: 14) .textStyle(weight: .bold, color: AllInColors.pinkAccentColor, size: 14)
.padding([.leading], 10) .padding([.leading], 10)
Text("bet_points_at_stake_format") Text("points misés")
.textStyle(weight: .regular, color: .white, size: 14) .textStyle(weight: .regular, color: .white, size: 14)
.padding([.leading], 2) .padding([.leading], 2)
} }
@ -62,24 +56,11 @@ struct TrendingBetCard: View {
.stroke(AllInColors.primaryGradient, lineWidth: 5) .stroke(AllInColors.primaryGradient, lineWidth: 5)
) )
.clipShape(RoundedRectangle(cornerRadius: 20, style: .continuous)) .clipShape(RoundedRectangle(cornerRadius: 20, style: .continuous))
.onTapGesture {
showDetails.toggle()
}
.fullScreenCover(isPresented: $showDetails) {
DetailsView(isModalPresented: $showDetails, isModalParticipated: $showParticipate, id: bet.id)
}
} }
} }
struct TrendingBetCard_Previews: PreviewProvider { struct TrendingBetCard_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
TrendingBetCard(bet: BinaryBet(theme: "Football - Finale de la Ligue des Champions", TrendingBetCard()
phrase: "Le gagnant de la finale sera l'équipe avec le plus de tirs au but.",
endRegisterDate: Date().addingTimeInterval(86400),
endBetDate: Date().addingTimeInterval(172800),
isPrivate: true,
status: .inProgress,
invited: [],
author: "Imri"))
} }
} }

@ -6,29 +6,27 @@
// //
import SwiftUI import SwiftUI
import Model
struct UserInfo: View { struct UserInfo: View {
var username: String
var picture: String?
var value: Int
var body: some View { var body: some View {
HStack { HStack {
UserPicture(picture: picture, username: username, size: 35) Image("defaultUserImage")
.padding(.trailing, 7) .resizable()
Text(username) .frame(width: 35, height: 35)
.font(.system(size: 15)) Text("David")
.foregroundStyle(AllInColors.primaryTextColor) .textStyle(weight: .bold, color: AllInColors.primaryTextColor, size: 13)
.fontWeight(.semibold)
Spacer() Spacer()
Text(value.description) Image("allcoinIcon")
.font(.system(size: 18))
.foregroundStyle(AllInColors.lightPurpleColor)
.fontWeight(.bold)
.padding(.trailing, 4)
Image("PurpleAllCoin")
.resizable() .resizable()
.frame(width: 15, height: 16) .frame(width: 17, height: 17, alignment: .leading)
Text("541")
.textStyle(weight: .black, color: AllInColors.lightPurpleColor, size: 16)
} }
} }
} }
struct UserInfo_Previews: PreviewProvider {
static var previews: some View {
UserInfo()
}
}

@ -6,19 +6,22 @@
// //
import SwiftUI import SwiftUI
import Model
struct UsersPreview: View { struct UsersPreview: View {
var users: [User]?
var body: some View { var body: some View {
if users != nil { HStack(spacing: -20){
HStack(spacing: -20){ Image("defaultUserImage")
ForEach(users!.prefix(4)) { user in .resizable()
Image("defaultUserImage") .frame(width: 35, height: 35)
.resizable() Image("defaultUserImage")
.frame(width: 35, height: 35) .resizable()
} .frame(width: 35, height: 35)
} Image("defaultUserImage")
.resizable()
.frame(width: 35, height: 35)
Image("defaultUserImage")
.resizable()
.frame(width: 35, height: 35)
} }
} }
} }

@ -6,11 +6,9 @@
// //
import SwiftUI import SwiftUI
import Model
struct WinModal: View { struct WinModal: View {
@Environment(\.dismiss) var dismiss @Environment(\.dismiss) var dismiss
var betResult: BetResultDetail
@State var xOffset: CGFloat = 0 @State var xOffset: CGFloat = 0
var body: some View { var body: some View {
@ -18,9 +16,136 @@ struct WinModal: View {
GeometryReader { geometry in GeometryReader { geometry in
let size = geometry.size.width / 20 let size = geometry.size.width / 20
InfiniteScroller(contentWidth: geometry.size.width) { InfiniteScroller(contentWidth: size * 20) {
VStack(spacing: 20) {
Image("marquee").resizable().scaledToFit() VStack(spacing: 20) {
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing:20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
}
VStack(spacing: 20) {
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing:20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
HStack(spacing: 20){
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
}
}
}
.padding(10)
} }
VStack { VStack {
ZStack(alignment: .topLeading){ ZStack(alignment: .topLeading){
@ -37,15 +162,15 @@ struct WinModal: View {
} }
HStack{ HStack{
Text("FÉLICITATIONS").font(.system(size: 20)).foregroundColor(.white).fontWeight(.semibold).italic() Text("FÉLICITATIONS").font(.system(size: 20)).foregroundColor(.white).fontWeight(.semibold).italic()
Text(AppStateContainer.shared.user?.username ?? "").padding(.top,9).font(.system(size: 33)).fontWeight(.heavy).foregroundColor(.white) Text("PSEUDO!").padding(.top,9).font(.system(size: 33)).fontWeight(.heavy).foregroundColor(.white)
} }
.rotationEffect(.degrees(-4)) .rotationEffect(.degrees(-4))
.padding(.top,40) .padding(.top,40)
Spacer() Spacer()
AllcoinsCapsule(gains: betResult.amount) AllcoinsCapsule()
Spacer() Spacer()
RecapBetCard(betResult: betResult) RecapBetCard()
Spacer() Spacer()
} }
.padding([.all],20) .padding([.all],20)
@ -60,6 +185,12 @@ struct WinModal: View {
} }
} }
struct WinModal_Previews: PreviewProvider {
static var previews: some View {
WinModal()
}
}
struct InfiniteScroller<Content: View>: View { struct InfiniteScroller<Content: View>: View {
var contentWidth: CGFloat var contentWidth: CGFloat
var content: (() -> Content) var content: (() -> Content)
@ -73,8 +204,13 @@ struct InfiniteScroller<Content: View>: View {
content() content()
content() content()
content() content()
content()
content()
content()
content()
content()
} }
.offset(x: xOffset, y: 0).opacity(0.3) .offset(x: xOffset, y: 0)
} }
.disabled(true) .disabled(true)
.onAppear { .onAppear {
@ -85,9 +221,8 @@ struct InfiniteScroller<Content: View>: View {
xOffset = +contentWidth xOffset = +contentWidth
} }
} }
.frame(width: 1300, height: 1300) .frame(width: 1200)
.padding(.leading, -400) .rotationEffect(.degrees(-30))
.rotationEffect(.degrees(30)) .opacity(0.04)
.opacity(0.1)
} }
} }

@ -1,58 +0,0 @@
//
// userPicture.swift
// AllIn
//
// Created by Lucas Delanier on 04/06/2024.
//
import SwiftUI
struct UserPicture: View {
var picture: String?
var username: String
var size: CGFloat
var body: some View {
ZStack {
if let pictureURL = picture {
userImage(url: pictureURL)
} else {
placeholderImage
}
}
}
@MainActor private func userImage(url: String) -> some View {
AsyncCachedImage(url: URL(string: url)) { image in
image
.resizable()
.frame(width: size, height: size)
.clipShape(Circle())
} placeholder: {
placeholderImage
}
}
private var placeholderImage: some View {
Circle()
.foregroundColor(.gray)
.frame(width: size, height: size)
.overlay(
Text(username.prefix(2).uppercased())
.fontWeight(.medium)
.foregroundStyle(.white)
.font(.system(size: fontSize(for: size)))
)
}
private func fontSize(for diameter: CGFloat) -> CGFloat {
let fontScaleFactor: CGFloat = 0.45
return diameter * fontScaleFactor
}
}
struct UserPicture_Previews: PreviewProvider {
static var previews: some View {
UserPicture(picture: nil, username: "Lucas", size: 100)
}
}

@ -7,25 +7,17 @@
import SwiftUI import SwiftUI
import DependencyInjection import DependencyInjection
import Model
struct ContentView: View { struct ContentView: View {
@State private var show = false
@State private var gain = 0
@Inject var authService: IAuthService @Inject var authService: IAuthService
@Inject var manager: Manager
@ObservedObject var loggedState = AppStateContainer.shared.loggedState @ObservedObject var loggedState = AppStateContainer.shared.loggedState
var body: some View { var body: some View {
VStack { VStack {
if loggedState.connectedUser { if loggedState.connectedUser {
NavigationView { NavigationView {
if let name = QuickAction.selectedAction?.userInfo?["name"] as? String { MainView(page: "Bet")
MainView(page: name)
} else {
MainView(page: "Bet")
}
} }
.navigationViewStyle(StackNavigationViewStyle()) .navigationViewStyle(StackNavigationViewStyle())
} else { } else {
@ -38,26 +30,6 @@ struct ContentView: View {
.onAppear { .onAppear {
authService.refreshAuthentication() authService.refreshAuthentication()
} }
.onChange(of: loggedState.connectedUser) { _ in
if loggedState.connectedUser {
manager.getTodayGifts() { status, gained in
if status == 200 {
withAnimation {
show = true
gain = gained
}
}
}
}
}
.overlay(
Group {
if show {
DailyGiftPage(show: $show, gain: $gain)
.transition(.opacity)
}
}
)
} }
} }

@ -1,25 +0,0 @@
//
// Delegates.swift
// AllIn
//
// Created by Emre on 22/02/2024.
//
import UIKit
class AppDelegate: NSObject, UIApplicationDelegate {
func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
if let selectedAction = options.shortcutItem {
QuickAction.selectedAction = selectedAction
}
let sceneConfiguration = UISceneConfiguration(name: "Quick Action Scene", sessionRole: connectingSceneSession.role)
sceneConfiguration.delegateClass = QuickActionSceneDelegate.self
return sceneConfiguration
}
}
class QuickActionSceneDelegate: UIResponder, UIWindowSceneDelegate {
func windowScene(_ windowScene: UIWindowScene, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
QuickAction.selectedAction = shortcutItem
}
}

@ -1,44 +0,0 @@
//
// QuickAction.swift
// AllIn
//
// Created by Emre on 22/02/2024.
//
import UIKit
enum QuickAction {
static var selectedAction: UIApplicationShortcutItem?
static var homeuserInfo: [String : NSSecureCoding] {
["name" : "Bet" as NSSecureCoding]
}
static var createuserInfo: [String : NSSecureCoding] {
["name" : "CreationBet" as NSSecureCoding]
}
static var frienduserInfo: [String : NSSecureCoding] {
["name" : "Friends" as NSSecureCoding]
}
static var rankuserInfo: [String : NSSecureCoding] {
["name" : "Ranking" as NSSecureCoding]
}
static var allShortcutItems: [UIApplicationShortcutItem] = {
var shortcuts: [UIApplicationShortcutItem] = []
if AppStateContainer.shared.loggedState.connectedUser {
shortcuts.append(UIApplicationShortcutItem(type: "home", localizedTitle: "Coins : " + String(AppStateContainer.shared.user?.nbCoins ?? 0), localizedSubtitle: "", icon: UIApplicationShortcutIcon(templateImageName: "allCoinBlackIcon"), userInfo: homeuserInfo))
}
shortcuts.append(contentsOf: [
UIApplicationShortcutItem(type: "create", localizedTitle: "Créer un pari", localizedSubtitle: "", icon: UIApplicationShortcutIcon(systemImageName: "pencil.circle"), userInfo: createuserInfo),
UIApplicationShortcutItem(type: "friend", localizedTitle: "Voir mes amis", localizedSubtitle: "", icon: UIApplicationShortcutIcon(systemImageName: "person.2.square.stack"), userInfo: frienduserInfo),
UIApplicationShortcutItem(type: "ranking", localizedTitle: "Classement", localizedSubtitle: "Où en suis-je ?", icon: UIApplicationShortcutIcon(systemImageName: "rosette"), userInfo: rankuserInfo)
])
return shortcuts
}()
}

@ -29,15 +29,6 @@ struct AllInColors {
static let loginPurpleColor = Color("LoginPurpleColor") static let loginPurpleColor = Color("LoginPurpleColor")
static let whiteColor = Color("WhiteColor") static let whiteColor = Color("WhiteColor")
// Details
static let blue200 = Color("Blue200")
static let purple200 = Color("Purple200")
static let pink200 = Color("Pink200")
static let pink100 = Color("Pink100")
// Profile
static let secondaryTextColor = Color("SecondaryTextColor")
// Others // Others
static let backgroundColor = Color("BackgroundColor") static let backgroundColor = Color("BackgroundColor")
static let darkBlueColor = Color("DarkBlueColor") static let darkBlueColor = Color("DarkBlueColor")
@ -56,8 +47,6 @@ struct AllInColors {
static let lightGrey300Color = Color("LightGrey300Color") static let lightGrey300Color = Color("LightGrey300Color")
static let componentBackgroundColor = Color("ComponentBackgroundColor") static let componentBackgroundColor = Color("ComponentBackgroundColor")
static let underComponentBackgroundColor = Color("UnderComponentBackgroundColor") static let underComponentBackgroundColor = Color("UnderComponentBackgroundColor")
static let winBannerBackground = Color("WinBannerBackground")
static let greyDarkColor = Color("GreyDarkColor")
// Gradients // Gradients
static let primaryGradient = LinearGradient( static let primaryGradient = LinearGradient(
@ -71,22 +60,4 @@ struct AllInColors {
endPoint: .top endPoint: .top
) )
static let BlueBetGradiant = LinearGradient(
gradient: Gradient(colors: [AllInColors.blue200, AllInColors.purple200]),
startPoint: .leading,
endPoint: .trailing
)
static let BlueBetLineGradiant = LinearGradient(
gradient: Gradient(colors: [AllInColors.blue200, AllInColors.blueAccentColor]),
startPoint: .leading,
endPoint: .trailing
)
static let PinkBetGradiant = LinearGradient(
gradient: Gradient(colors: [AllInColors.pink100, AllInColors.pink200]),
startPoint: .leading,
endPoint: .trailing
)
} }

@ -8,5 +8,5 @@
import Foundation import Foundation
struct Config { struct Config {
static let allInApi = "https://codefirst.iut.uca.fr/containers/AllDev-api/" static let allInApi = "https://codefirst.iut.uca.fr/containers/AllDev-api"
} }

@ -1,194 +0,0 @@
/*
Localizable.strings
AllInApp
Created by Emre on 15/05/2024.
*/
/// Core
"generic_username" = "Username";
"generic_email" = "Email";
"generic_password" = "Password";
"generic_login" = "Login";
"generic_logout" = "Logout";
"generic_already_have_account" = "Already have an account ?";
"generic_register" = "Register";
"generic_validate" = "Validate";
"generic_ok" = "OK";
"generic_error" = "Error";
"generic_in_waiting" = "In waiting";
"generic_search" = "Search";
"generic_add" = "Add";
"generic_acccept"="Accept";
"generic_decline"="Decline";
"generic_delete" = "Delete";
"generic_stake" = "Stake";
"network_error_text" = "Make sure to be properly connected to the network then try again.";
/// Bet type
"bet_type_binary" = "Yes / No";
"bet_type_match" = "Sport match";
"bet_type_custom" = "Custom answers";
/// Field error
"field_error_mandatory" = "This field is mandatory.";
"field_error_not_identical" = "The fields are not identical.";
"field_error_bad_email" = "Please enter a valid email.";
/// Drawer
"drawer_bets" = "Bets";
"drawer_best_win" = "Best win";
"drawer_nb_friends" = "Friends";
"drawer_friends" = "FRIENDS";
"drawer_friends_subtitle" = "Challenge your folks by adding them as friends.";
"drawer_public_bets" = "PARTICIPATE";
"drawer_public_bets_subtitle" = "Browse the most popular bets of the moment.";
"drawer_create_a_bet" = "NEW BET";
"drawer_create_a_bet_subtitle" = "Create a net bet and get your friends participating.";
"drawer_bet_history" = "HISTORY";
"drawer_bet_history_subtitle" = "View your current and finished bets.";
"drawer_current_bets" = "MY PARTICIPATIONS";
"drawer_current_bets_subtitle" = "Manage your bets and reward the winners.";
"drawer_ranking" = "RANKING";
"drawer_ranking_subtitle" = "Check your ranking among your friends.";
/// Welcome Page
"welcome_title" = "Welcome to,";
"welcome_subtitle" = "Collect your Allcoins and come bet with your friend to prove who\'s best.";
"welcome_join" = "Join";
/// Register Page
"register_hello" = "Hello,";
"register_hello %@" = "Hello %@,";
"register_title" = "We need this!";
"register_subtitle" = "Don\'t worry it\'s fast.";
"register_error_title" = "Error saving";
"register_error_content" = "Registration failed. Try Again.";
"register_confirm_password" = "Confirm password";
"register_already_used" = "Email or nickname already used.";
/// Login Page
"login_title" = "Welcome back !";
"login_subtitle" = "We missed you.";
"login_error_title" = "Connection error";
"login_error_content" = "Failed to login. Please try again.";
"login_no_account" = "Don't have an account ?";
"login_forgot_password" = "Forgot password ?";
"login_bad_credentials" = "Incorrect login or password.";
/// Bet Creation Page
"bet_creation_theme_tooltip" = "Usually a common name describing the overall theme of the bet for reference..";
"bet_creation_phrase_tooltip" = "Generally the question the participants will answer to.";
"bet_creation_register_tooltip" = "After this date, nobody will be able to register anymore.";
"bet_creation_bet_end_tooltip" = "After this date, the result will be announced.";
"bet_creation_privacy_tooltip" = "Determines who will be able to see the bet.";
"bet_creation_question" = "Question";
"bet_creation_answer" = "Answer";
"bet_creation_publish" = "Publish the bet";
"bet_creation_theme" = "Theme";
"bet_creation_theme_placeholder" = "Studies, sports, party…";
"bet_creation_bet_phrase" = "Bet phrase";
"bet_creation_bet_phrase_placeholder" = "Will David be missing this Monday in class ?";
"bet_creation_end_registration_date" = "Registration end date";
"bet_creation_end_bet_date" = "Bet end date";
"bet_creation_bet_privacy" = "Bet privacy";
"bet_creation_friends_available_format" = "friends available";
"bet_creation_public_bottom_text_1" = "Your BET will be visible by all the users.";
"bet_creation_public_bottom_text_2" = "Everyone will be able to join the BET.";
"bet_creation_private_bottom_text_1" = "Your BET will only be visible by your friends.";
"bet_creation_private_bottom_text_2" = "Only your friends will be able to join the BET.";
"bet_creation_bottom_text_3" = "You can invite friends at any moment during the registration period.";
"bet_creation_yes_no_bottom_text_1" = "The participants will have to respond with either YES or NO.";
"bet_creation_yes_no_bottom_text_2" = "No other answer will be accepted.";
"bet_creation_custom_bottom_text_1" = "You are going to fill in the different answers available in this bet.";
"bet_creation_custom_bottom_text_2" = "Be careful to be clear and avoid any uncertainties";
"bet_creation_error" = "Error while creating the bet.";
"bet_creation_success_message" = "Bet created !";
"bet_creation_response_title" = "Response title";
"bet_creation_max_answers %lld" = "%lld more max.";
"bet_creation_error_past_date" = "The registration end date must be later than the current date.";
"bet_creation_error_date_order" = "The betting end date must be later than the registration end date.";
/// Bet page
"bet_popular" = "Popular";
"bet_public" = "Public";
"bet_private" = "Private";
"bet_invitation" = "Invitation";
"bet_current" = "Current";
"bet_finished" = "Finished";
"bet_starting" = "Starting on";
"bet_started" = "Started on";
"bet_ends" = "Ends on";
"bet_ended" = "Ended on";
"bet_participate" = "Participate";
"bet_proposed_by_format %@" = "Proposed by %@";
"bet_proposed_by_format" = "Proposed by";
"bet_players_waiting_format %@" = "%@ players waiting";
"bet_players_format" = "players";
"bet_points_at_stake_format" = "points at stake";
/// Bet status
"bet_status_finished" = "Finished !";
"bet_status_in_progress" = "In progress…";
"bet_status_waiting" = "Waiting…";
"bet_status_unavailable" = "Status unavailable";
"bet_status_cancelled" = "Cancelled";
"bet_status_place_your_bets" = "Place your bets";
"bet_status_participants_list" = "Participants";
"bet_status_details_drawer" = "Details";
"participation_possible_winnings" = "Possible winnings";
"bet_status_stake" = "Gambled";
/// Bet history
"bet_history_current_title" = "Current";
"bet_history_title" = "History";
/// Bet confirmation
"bet_confirmation_text" = "This bet has now ended. You may now distribute the winnings by selecting the right answer.";
"bet_confirmation_choose_response" = "Please select the final answer :";
/// Ranking
"ranking_title" = "Ranking";
/// Friends
"friends_title" = "Friends";
"friends_request_sent" = "Request sent";
"friends_request"= "Friends Request";
/// Daily reward
"daily_reward_title" = "Daily reward";
"daily_reward_subtitle" = "Your daily reward is unlocked every day at 00:00 UTC and allows you to get between 10 and 150 Allcoins.";
/// Notification
"notification_title_end_bet_date" = "Who will be the winners?";
"notification_subtitle_end_bet_date %@" = "The %@ bet has reached its deadline. Go to the app to enter the winning answer.";
/// Empty Views
"empty_ranking_title" = "It's a bit empty around here";
"empty_ranking_explain" = "Add some friends to display them in the leaderboard";
"empty_bets_title"= "No bet matches your search";
"empty_friends_title" = "You don't have any friends yet";
"empty_friends_explain" = "Add them from this screen";
/// Error Messages
"error_title" = "Error: Failed to Load Content.";
"error_message" = "The content you are trying to load could not be retrieved. Please check your internet connection and try again";

@ -1,194 +0,0 @@
/*
Localizable.strings
AllInApp
Created by Emre on 15/05/2024.
*/
/// Core
"generic_username" = "Pseudo";
"generic_email" = "Email";
"generic_password" = "Mot de passe";
"generic_login" = "Se connecter";
"generic_logout" = "Déconnexion";
"generic_already_have_account" = "Tu as déjà un compte ?";
"generic_register" = "S'inscrire";
"generic_validate" = "Valider";
"generic_ok" = "OK";
"generic_error" = "Erreur";
"generic_in_waiting" = "En attente";
"generic_search" = "Rechercher";
"generic_add" = "Ajouter";
"generic_acccept"="Accepter";
"generic_decline"="Decliner";
"generic_delete" = "Supprimer";
"generic_stake" = "Mise";
"network_error_text" = "Assurez-vous d\'être bien connecté au réseau puis réessayez.";
/// Bet type
"bet_type_binary" = "Oui / Non";
"bet_type_match" = "Match sportif";
"bet_type_custom" = "Réponses personnalisées";
/// Field error
"field_error_mandatory" = "Ce champ est obligatoire.";
"field_error_not_identical" = "Les champs ne sont pas identiques.";
"field_error_bad_email" = "Veuillez saisir un email valide.";
/// Drawer
"drawer_bets" = "Bets";
"drawer_best_win" = "Meilleur gain";
"drawer_nb_friends" = "Amis";
"drawer_friends" = "AMIS";
"drawer_friends_subtitle" = "Défiez vos proches en les ajoutant en amis.";
"drawer_public_bets" = "PARTICIPER";
"drawer_public_bets_subtitle" = "Parcourez les bets les plus populaires du moment.";
"drawer_create_a_bet" = "NOUVEAU BET";
"drawer_create_a_bet_subtitle" = "Créez un nouveau bet et faites participer vos amis.";
"drawer_bet_history" = "HISTORIQUE";
"drawer_bet_history_subtitle" = "Consultez vos paris en cours et terminés.";
"drawer_current_bets" = "MES PARTICIPATIONS";
"drawer_current_bets_subtitle" = "Gérez vos bets et récompensez les gagnants.";
"drawer_ranking" = "CLASSEMENT";
"drawer_ranking_subtitle" = "Consultez votre classement parmis vos amis.";
/// Welcome Page
"welcome_title" = "Bienvenue sur,";
"welcome_subtitle" = "Récupère tes Allcoins et viens parier avec tes amis pour prouver qui est le meilleur.";
"welcome_join" = "Rejoindre";
/// Register Page
"register_hello" = "Bonjour";
"register_hello %@" = "Bonjour %@,";
"register_title" = "On a besoins de ça!";
"register_subtitle" = "Promis c\'est rapide.";
"register_error_title" = "Erreur lors de l'enregistrement";
"register_error_content" = "L'enregistrement a échoué. Veuillez réessayer.";
"register_confirm_password" = "Confirmation du mot de passe";
"register_already_used" = "Email ou pseudo déjà utilisé.";
/// Login Page
"login_title" = "Te revoilà !";
"login_subtitle" = "Bon retour parmis nous tu nous as manqué !";
"login_error_title" = "Erreur de connexion";
"login_error_content" = "La connexion a échoué. Veuillez réessayer.";
"login_no_account" = "Pas encore inscrit ?";
"login_forgot_password" = "Mot de passe oublié ?";
"login_bad_credentials" = "Login ou mot de passe incorrects.";
/// Bet Creation Page
"bet_creation_theme_tooltip" = "Généralement un nom commun décrivant le thème global du pari pour servir de référence.";
"bet_creation_phrase_tooltip" = "Généralement la question à laquelle les participants devront répondre.";
"bet_creation_register_tooltip" = "Après cette date, plus personne ne pourra s\'inscrire.";
"bet_creation_bet_end_tooltip" = "Après cette date, les résultats seront annoncés.";
"bet_creation_privacy_tooltip" = "Détermine qui pourra voir le bet.";
"bet_creation_question" = "Question";
"bet_creation_answer" = "Réponse";
"bet_creation_publish" = "Publier le bet";
"bet_creation_theme" = "Thème";
"bet_creation_theme_placeholder" = "Études, sport, soirée…";
"bet_creation_bet_phrase" = "Phrase du BET";
"bet_creation_bet_phrase_placeholder" = "David sera-il absent lundi matin en cours ?";
"bet_creation_end_registration_date" = "Date de fin des inscriptions";
"bet_creation_end_bet_date" = "Date de fin du BET";
"bet_creation_bet_privacy" = "Confidentialité du bet";
"bet_creation_friends_available_format" = "amis disponibles";
"bet_creation_public_bottom_text_1" = "Votre BET sera visible par tous les utilisateurs.";
"bet_creation_public_bottom_text_2" = "Tout le monde pourra rejoindre le BET.";
"bet_creation_private_bottom_text_1" = "Votre BET sera visible uniquement par vos amis.";
"bet_creation_private_bottom_text_2" = "Seulement vos amis pourront rejoindre le BET.";
"bet_creation_bottom_text_3" = "Vous pourrez inviter des amis à tout moment pendant la période dinscription.";
"bet_creation_yes_no_bottom_text_1" = "Les utilisateurs devront répondre au pari avec OUI ou NON.";
"bet_creation_yes_no_bottom_text_2" = "Aucune autre réponse ne sera acceptée.";
"bet_creation_custom_bottom_text_1" = "Vous allez renseigner les différentes réponses disponibles dans ce pari.";
"bet_creation_custom_bottom_text_2" = "Faites attention a etre claire et éviter toutes incertitudes";
"bet_creation_error" = "Erreur lors de la création du bet.";
"bet_creation_success_message" = "Bet créé !";
"bet_creation_response_title" = "Intitulé de réponse";
"bet_creation_max_answers %lld" = "encore %lld max.";
"bet_creation_error_past_date" = "La date de fin des inscriptions doit être ultérieure à la date actuelle.";
"bet_creation_error_date_order" = "La date de fin des paris doit être ultérieure à la date de fin des inscriptions.";
/// Bet page
"bet_popular" = "Populaire";
"bet_public" = "Public";
"bet_private" = "Privé";
"bet_invitation" = "Invitation";
"bet_current" = "En cours";
"bet_finished" = "Terminés";
"bet_starting" = "Commence le";
"bet_started" = "A commencé le";
"bet_ends" = "Prend fin le";
"bet_ended" = "A pris fin le";
"bet_participate" = "Participer";
"bet_proposed_by_format %@" = "Proposé par %@";
"bet_proposed_by_format" = "Proposé par";
"bet_players_waiting_format %@" = "%@ joueurs en attente";
"bet_players_format" = "joueurs";
"bet_points_at_stake_format" = "points en jeu";
/// Bet status
"bet_status_finished" = "Terminé !";
"bet_status_in_progress" = "En cours…";
"bet_status_waiting" = "En attente…";
"bet_status_unavailable" = "Statut indisponible";
"bet_status_cancelled" = "Annulé";
"bet_status_place_your_bets" = "Faites vos paris";
"bet_status_participants_list" = "Liste des participants";
"bet_status_details_drawer" = "Détails";
"participation_possible_winnings" = "Gains possibles";
"bet_status_stake" = "Pariés";
/// Bet history
"bet_history_current_title" = "En cours";
"bet_history_title" = "Historique";
/// Bet confirmation
"bet_confirmation_text" = "Ce bet est arrivé à la date de fin. Vous devez à présent distribuer les gains en validant le pari gagnant.";
"bet_confirmation_choose_response" = "Veuillez choisir la réponse finale :";
/// Ranking
"ranking_title" = "Classement";
/// Friends
"friends_title" = "Amis";
"friends_request_sent" = "Requête envoyée";
"friends_request"= "Requêtes d'amis";
/// Daily reward
"daily_reward_title" = "Récompense quotidienne";
"daily_reward_subtitle" = "Votre récompense quotidienne est débloquée tous les jours à 00:00 UTC et vous permets dobtenir entre 10 et 150 Allcoins.";
/// Notification
"notification_title_end_bet_date" = "Qui seront les vainqueurs ?";
"notification_subtitle_end_bet_date %@" = "Le pari %@ a atteint sa date limite. Rendez-vous dans l'application pour renseigner la réponse gagnante.";
/// Empty Views
"empty_ranking_title" = "Cest un peu vide par ici";
"empty_ranking_explain" = "Ajoutez des amis pour les afficher dans le classement";
"empty_bets_title"= "Aucun Bet ne correspond à votre recherche";
"empty_friends_title" = "Vous navez pas encore damis";
"empty_friends_explain" = "Ajoutez les depuis cet écran";
/// Error Messages
"error_title" = "Erreur : Échec du chargement du contenu.";
"error_message" = "Le contenu que vous essayez de charger n'a pas pu être récupéré. Veuillez vérifier votre connexion internet et réessayer.";

@ -7,14 +7,14 @@
import Foundation import Foundation
import Model import Model
import ViewModel
import DependencyInjection import DependencyInjection
import Api import Api
import StubLib import StubLib
import WidgetKit
class AuthService: IAuthService { class AuthService: IAuthService {
public func login(login: String, password: String, completion: @escaping (Int) -> ()) { public func login(login: String, password: String, completion : @escaping (Int)-> ()) {
let url = URL(string: Config.allInApi + "users/login")! let url = URL(string: Config.allInApi + "users/login")!
var request = URLRequest(url: url) var request = URLRequest(url: url)
@ -26,37 +26,33 @@ class AuthService: IAuthService {
"password": password, "password": password,
] ]
if let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []) { if let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []){
URLSession.shared.uploadTask(with: request, from: jsonData) { data, response, error in URLSession.shared.uploadTask(with: request, from: jsonData) { data, response, error in
print("ALLIN: Process LOGIN") print ("ALLIN : Process LOGIN")
if let httpResponse = response as? HTTPURLResponse { if let httpResponse = response as? HTTPURLResponse {
if httpResponse.statusCode == 200 { if httpResponse.statusCode == 200 {
if let data = data, if let data = data,
let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any], let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
let token = json["token"] as? String { let token = json["token"] as? String {
AppStateContainer.shared.authenticationRefresh = token AppStateContainer.shared.authenticationRefresh = token;
self.initializeUser(withToken: token) { status in self.initializeUser(withToken: token) { status in
print(status)
if status != 200 { if status != 200 {
completion(status) completion(status)
AppStateContainer.shared.authenticationRefresh = nil AppStateContainer.shared.authenticationRefresh = nil;
} else { } else {
self.initManagerVM(token: token) self.initManagerVM(token: token)
completion(httpResponse.statusCode)
} }
} }
} }
} else {
completion(httpResponse.statusCode)
} }
completion(httpResponse.statusCode)
} }
}.resume() }.resume()
} }
} }
func register(username: String, email: String, password: String, completion : @escaping (Int)-> ()) { func register(username: String, email: String, password: String, completion : @escaping (Int)-> ()) {
let url = URL(string: Config.allInApi + "users/register")! let url = URL(string: Config.allInApi + "/users/register")!
var request = URLRequest(url: url) var request = URLRequest(url: url)
request.httpMethod = "POST" request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type") request.setValue("application/json", forHTTPHeaderField: "Content-Type")
@ -64,14 +60,14 @@ class AuthService: IAuthService {
let json = [ let json = [
"email": email.lowercased(), "email": email.lowercased(),
"username": username.lowercased(), "username": username.lowercased(),
"password": password "password": password,
"nbCoins": "0"
] ]
if let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []){ if let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []){
URLSession.shared.uploadTask(with: request, from: jsonData) { data, response, error in URLSession.shared.uploadTask(with: request, from: jsonData) { data, response, error in
print ("ALLIN : Process REGISTER") print ("ALLIN : Process REGISTER")
if let httpResponse = response as? HTTPURLResponse { if let httpResponse = response as? HTTPURLResponse {
print(httpResponse.statusCode)
if httpResponse.statusCode == 201 { if httpResponse.statusCode == 201 {
if let data = data, if let data = data,
let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any], let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
@ -83,13 +79,11 @@ class AuthService: IAuthService {
AppStateContainer.shared.authenticationRefresh = nil; AppStateContainer.shared.authenticationRefresh = nil;
} else { } else {
self.initManagerVM(token: token) self.initManagerVM(token: token)
completion(httpResponse.statusCode)
} }
} }
} }
} else {
completion(httpResponse.statusCode)
} }
completion(httpResponse.statusCode)
} }
}.resume() }.resume()
} }
@ -100,7 +94,7 @@ class AuthService: IAuthService {
guard let token = AppStateContainer.shared.authenticationRefresh else { guard let token = AppStateContainer.shared.authenticationRefresh else {
return return
} }
let url = URL(string: Config.allInApi + "users/token")! let url = URL(string: Config.allInApi + "users/token")!
var request = URLRequest(url: url) var request = URLRequest(url: url)
request.httpMethod = "GET" request.httpMethod = "GET"
@ -110,11 +104,13 @@ class AuthService: IAuthService {
URLSession.shared.dataTask(with: request) { data, response, error in URLSession.shared.dataTask(with: request) { data, response, error in
if let data = data, if let data = data,
let httpResponse = response as? HTTPURLResponse { let httpResponse = response as? HTTPURLResponse {
if httpResponse.statusCode == 200, let user = try? JSONDecoder().decode(User.self, from: data) { if httpResponse.statusCode == 200 {
AppStateContainer.shared.user = user if let userJson = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
AppStateContainer.shared.loggedState.connectedUser = true let user = User.mapUser(from: userJson) {
WidgetCenter.shared.reloadAllTimelines() AppStateContainer.shared.user = user
self.initManagerVM(token: token) AppStateContainer.shared.loggedState.connectedUser = true
self.initManagerVM(token: token)
}
} else { } else {
AppStateContainer.shared.authenticationRefresh = nil AppStateContainer.shared.authenticationRefresh = nil
} }
@ -123,10 +119,8 @@ class AuthService: IAuthService {
} }
private func initializeUser(withToken token: String, completion: @escaping (Int) -> ()) { private func initializeUser(withToken token: String, completion: @escaping (Int) -> ()) {
let url = URL(string: Config.allInApi + "users/token")! let url = URL(string: Config.allInApi + "users/token")!
var request = URLRequest(url: url) var request = URLRequest(url: url)
request.httpMethod = "GET" request.httpMethod = "GET"
request.setValue("application/json", forHTTPHeaderField: "Content-Type") request.setValue("application/json", forHTTPHeaderField: "Content-Type")
request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization") request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
@ -134,10 +128,12 @@ class AuthService: IAuthService {
URLSession.shared.dataTask(with: request) { data, response, error in URLSession.shared.dataTask(with: request) { data, response, error in
if let data = data, if let data = data,
let httpResponse = response as? HTTPURLResponse { let httpResponse = response as? HTTPURLResponse {
if httpResponse.statusCode == 200, let user = try? JSONDecoder().decode(User.self, from: data) { if httpResponse.statusCode == 200 {
AppStateContainer.shared.user = user if let userJson = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
WidgetCenter.shared.reloadAllTimelines() let user = User.mapUser(from: userJson) {
completion(httpResponse.statusCode) completion(httpResponse.statusCode)
AppStateContainer.shared.user = user
}
} else { } else {
completion(httpResponse.statusCode) completion(httpResponse.statusCode)
} }
@ -148,14 +144,7 @@ class AuthService: IAuthService {
} }
private func initManagerVM(token: String) { private func initManagerVM(token: String) {
DependencyInjection.shared.addSingleton(Manager.self, Manager(withBetDataManager: BetApiManager(withUserToken: token, andApiUrl: Config.allInApi), withUserDataManager: UserApiManager(withUserToken: token, andApiUrl: Config.allInApi))) DependencyInjection.shared.addSingleton(ManagerVM.self, ManagerVM(withModel: Manager(withBetDataManager: BetStubManager(), withUserDataManager: UserApiManager(withUserToken: token))))
}
public func logout() {
AppStateContainer.shared.authenticationRefresh = nil
AppStateContainer.shared.loggedState.connectedUser = false
AppStateContainer.shared.notificationState.removeAllNotifications()
WidgetCenter.shared.reloadAllTimelines()
} }
} }

@ -11,5 +11,4 @@ protocol IAuthService {
func login(login: String, password: String, completion : @escaping (Int)-> ()) func login(login: String, password: String, completion : @escaping (Int)-> ())
func register(username: String, email: String, password: String, completion : @escaping (Int)-> ()) func register(username: String, email: String, password: String, completion : @escaping (Int)-> ())
func refreshAuthentication() func refreshAuthentication()
func logout()
} }

@ -1,50 +0,0 @@
//
// NotificationService.swift
// AllIn
//
// Created by Emre on 22/02/2024.
//
import UserNotifications
struct NotificationItem {
var title: String
var content: String
var interval: TimeInterval
}
class NotificationService: ObservableObject {
@Published var notifications: [NotificationItem] = []
func scheduleNotifications() {
UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
if granted {
print("Permission for notifications granted.")
} else {
print("Permission for notifications denied.")
}
}
}
func loadNotifications() {
for notification in notifications {
scheduleNotification(with: notification)
}
}
func removeAllNotifications() {
UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
}
func scheduleNotification(with item: NotificationItem) {
let content = UNMutableNotificationContent()
content.title = item.title
content.body = item.content
let trigger = UNTimeIntervalNotificationTrigger(timeInterval: item.interval, repeats: false)
let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: trigger)
UNUserNotificationCenter.current().add(request)
}
}

@ -1,71 +0,0 @@
//
// asyncCachedImage.swift
// AllIn
//
// Created by Lucas Delanier on 06/06/2024.
//
import SwiftUI
@MainActor
struct AsyncCachedImage<ImageView: View, PlaceholderView: View>: View {
// Input dependencies
var url: URL?
@ViewBuilder var content: (Image) -> ImageView
@ViewBuilder var placeholder: () -> PlaceholderView
// Downloaded image
@State var image: UIImage? = nil
init(
url: URL?,
@ViewBuilder content: @escaping (Image) -> ImageView,
@ViewBuilder placeholder: @escaping () -> PlaceholderView
) {
self.url = url
self.content = content
self.placeholder = placeholder
}
var body: some View {
VStack {
if let uiImage = image {
content(Image(uiImage: uiImage))
} else {
placeholder()
.onAppear {
Task {
image = await downloadPhoto()
}
}
}
}
}
// Downloads if the image is not cached already
// Otherwise returns from the cache
private func downloadPhoto() async -> UIImage? {
do {
guard let url else { return nil }
// Check if the image is cached already
if let cachedResponse = URLCache.shared.cachedResponse(for: .init(url: url)) {
return UIImage(data: cachedResponse.data)
} else {
let (data, response) = try await URLSession.shared.data(from: url)
// Save returned image data into the cache
URLCache.shared.storeCachedResponse(.init(response: response, data: data), for: .init(url: url))
guard let image = UIImage(data: data) else {
return nil
}
return image
}
} catch {
print("Error downloading: \(error)")
return nil
}
}
}

@ -1,27 +0,0 @@
//
// BetEndingValidationViewModel.swift
// AllIn
//
// Created by Emre on 07/02/2024.
//
import Foundation
import DependencyInjection
import Model
class BetEndingValidationViewModel: ObservableObject {
var id: String
@Inject var manager: Manager
@Published var selectedAnswer : String?
init(id: String) {
self.id = id
}
func post() {
if let answer = selectedAnswer {
manager.addResponse(withIdBet: id, andResponse: answer)
}
}
}

@ -7,68 +7,29 @@
import Foundation import Foundation
import DependencyInjection import DependencyInjection
import Model import ViewModel
import Combine
class BetViewModel: ObservableObject { class BetViewModel: ObservableObject {
@Inject var manager: Manager @Inject var manager: ManagerVM
@Inject var authService: IAuthService
@Published var popularBet: Bet?
@Published private(set) var bets: [Bet] = []
@Published var betsOver: [BetDetail] = []
@Published var betsWon: [BetResultDetail] = []
@Published var showingSheetOver: Bool = false
@Published var showingSheetWon: Bool = false
@Published var filters: Set<BetFilter> = [] {
didSet {
getItems()
}
}
init() { init() {
getItems() getItems()
getPopularBet()
getBetsOver()
getBetsWon()
} }
func getItems() { func getItems() {
manager.getBets(withIndex: 0, withCount: 20, filters: Array(filters)) { bets in
DispatchQueue.main.async {
self.bets = bets
}
}
} }
func getBetsOver() { func deleteItem(indexSet: IndexSet) {
manager.getBetsOver() { bets in
DispatchQueue.main.async {
self.betsOver = bets
if !self.betsOver.isEmpty {
self.showingSheetOver = true
}
}
}
} }
func getBetsWon() { func moveltem(from: IndexSet, to: Int) {
manager.getBetsWon() { bets in
DispatchQueue.main.async {
self.betsWon = bets
if !self.betsWon.isEmpty {
self.showingSheetWon = true
self.authService.refreshAuthentication()
}
}
}
} }
func getPopularBet() { func addItem(title: String) {
manager.getPopularBet() { bet in
DispatchQueue.main.async {
self.popularBet = bet
}
}
} }
} }

@ -8,134 +8,71 @@
import Foundation import Foundation
import SwiftUI import SwiftUI
import DependencyInjection import DependencyInjection
import Model import ViewModel
class CreationBetViewModel: ObservableObject { class CreationBetViewModel: ObservableObject {
@Inject var manager: Manager @Inject var manager: ManagerVM
@Published var theme: String = "" @Published var theme: String = ""
@Published var description: String = "" @Published var description: String = ""
@Published var isPrivate = false { @Published var isPublic = true
didSet {
invited.removeAll()
}
}
@Published var endRegisterDate = Date() @Published var endRegisterDate = Date()
@Published var endBetDate = Date() @Published var endBetDate = Date()
@Published var betAdded = false @Published var betAdded = false
@Published var selectedTypeBet = 0 {
didSet {
values.removeAll()
groupedItems.removeAll()
response = ""
}
}
@Published var values: [String] = []
@Published var invited: Set<String> = []
@Published var themeFieldError: String? @Published var themeFieldError: String?
@Published var descriptionFieldError: String? @Published var descriptionFieldError: String?
@Published var endRegisterDateFieldError: String? @Published var endRegisterDateFieldError: String?
@Published var endBetDateFieldError: String? @Published var endBetDateFieldError: String?
@Published var responsesFieldError: String?
@Published var errorMessage: String?
@Published var showErrorMessage = false
@Published var friends: [User] = []
let options: [(Int, String, String)] = [
(0, "questionMarkIcon", String(localized: "bet_type_binary")),
(1, "footballIcon", String(localized: "bet_type_match")),
(2, "paintbrushIcon", String(localized: "bet_type_custom"))
]
@Published var response = ""
@Published var groupedItems: [[String]] = [[String]] ()
init() {
getFriends()
}
func getFriends() {
manager.getFriends() { friends in
DispatchQueue.main.async {
self.friends = friends
}
}
}
func create() { func create() {
guard checkAndSetError(forTheme: true, forDescription: true, forEndRegisterDate: true, forEndBetDate: true, forResponse: true) else { guard checkAndSetError(forTheme: true, forDescription: true, forEndRegisterDate: true, forEndBetDate: true) else {
return return
} }
resetAllFieldErrors() resetAllFieldErrors()
if let user = AppStateContainer.shared.user { if let user = AppStateContainer.shared.user {
manager.addBet(bet: toBet(theme: theme, description: description, endRegister: endRegisterDate, endBet: endBetDate, isPrivate: isPrivate, status: .inProgress, creator: user.username, invited: Array(invited), type: selectedTypeBet)) { statusCode in manager.addBet(theme: theme, description: description, endRegister: endRegisterDate, endBet: endBetDate, isPublic: isPublic, creator: user)
print(statusCode)
switch statusCode {
case 201:
self.betAdded = true
let notificationItem = NotificationItem(title: String(localized: "notification_title_end_bet_date"), content: String(localized: "notification_subtitle_end_bet_date \(self.theme)"), interval: self.endBetDate.timeIntervalSinceNow)
AppStateContainer.shared.notificationState.scheduleNotification(with: notificationItem)
default:
self.setErrorMessage(errorMessage: String(localized: "network_error_text"))
}
}
} }
betAdded = true
} }
func checkAndSetError(forTheme checkTheme: Bool, forDescription checkDescription: Bool, forEndRegisterDate checkEndRegisterDate: Bool, forEndBetDate checkEndBetDate: Bool, forResponse checkResponse: Bool) -> Bool { func checkAndSetError(forTheme checkTheme: Bool, forDescription checkDescription: Bool, forEndRegisterDate checkEndRegisterDate: Bool, forEndBetDate checkEndBetDate: Bool) -> Bool {
var newThemeFieldError: String? var newThemeFieldError: String?
var newDescriptionFieldError: String? var newDescriptionFieldError: String?
var newEndRegisterDateFieldError: String? var newEndRegisterDateFieldError: String?
var newEndBetDateFieldError: String? var newEndBetDateFieldError: String?
var newResponsesFieldError: String?
var hasError = false var hasError = false
// Theme // Theme
if checkTheme, theme.isEmpty { if checkTheme, theme.isEmpty {
newThemeFieldError = String(localized: "field_error_mandatory") newThemeFieldError = "Veuillez saisir le thème."
hasError = true hasError = true
} }
// Description // Description
if checkDescription, description.isEmpty { if checkDescription, description.isEmpty {
newDescriptionFieldError = String(localized: "field_error_mandatory") newDescriptionFieldError = "Veuillez saisir la description."
hasError = true hasError = true
} }
// End Register Date // End Register Date
if checkEndRegisterDate, endRegisterDate < Date() { if checkEndRegisterDate, endRegisterDate < Date() {
newEndRegisterDateFieldError = String(localized: "bet_creation_error_past_date") newEndRegisterDateFieldError = "La date de fin des inscriptions doit être ultérieure à la date actuelle."
hasError = true hasError = true
} }
// End Bet Date // End Bet Date
if checkEndBetDate, endBetDate < endRegisterDate { if checkEndBetDate, endBetDate < endRegisterDate {
newEndBetDateFieldError = String(localized: "bet_creation_error_date_order") newEndBetDateFieldError = "La date de fin des paris doit être ultérieure à la date de fin des inscriptions."
hasError = true hasError = true
} }
if checkResponse, selectedTypeBet == 2 {
if values.count < 2 {
newResponsesFieldError = "Il doit y'avoir 2 réponses minimum"
hasError = true
} else {
let uniqueValues = Set(values)
if uniqueValues.count != values.count {
newResponsesFieldError = "Les réponses doivent être uniques"
hasError = true
}
}
}
if !hasError { if !hasError {
// No error // No error
return true return true
@ -146,7 +83,6 @@ class CreationBetViewModel: ObservableObject {
descriptionFieldError = newDescriptionFieldError descriptionFieldError = newDescriptionFieldError
endRegisterDateFieldError = newEndRegisterDateFieldError endRegisterDateFieldError = newEndRegisterDateFieldError
endBetDateFieldError = newEndBetDateFieldError endBetDateFieldError = newEndBetDateFieldError
responsesFieldError = newResponsesFieldError
} }
return false return false
} }
@ -157,29 +93,6 @@ class CreationBetViewModel: ObservableObject {
descriptionFieldError = nil descriptionFieldError = nil
endRegisterDateFieldError = nil endRegisterDateFieldError = nil
endBetDateFieldError = nil endBetDateFieldError = nil
responsesFieldError = nil
}
}
func setErrorMessage(errorMessage: String) {
self.showErrorMessage = true
self.errorMessage = errorMessage
}
func toBet(theme: String, description: String, endRegister: Date, endBet: Date, isPrivate: Bool, status: BetStatus, creator: String, invited: [String], type: Int) -> Bet {
switch type {
case 0:
return BinaryBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
case 1:
return MatchBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator, nameTeam1: "", nameTeam2: "")
case 2:
var bet = CustomBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
for answer in values {
bet.addCustomResponse(answer)
}
return bet
default:
return BinaryBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
} }
} }
} }

@ -1,30 +0,0 @@
//
// CurrentBetViewModel.swift
// AllIn
//
// Created by Emre on 31/01/2024.
//
import Foundation
import DependencyInjection
import Model
class CurrentBetViewModel: ObservableObject {
@Inject var manager: Manager
@Published private(set) var bets: [BetDetail] = []
init() {
getItems()
}
func getItems() {
manager.getCurrentBets(withIndex: 0, withCount: 20) { bets in
DispatchQueue.main.async {
self.bets = bets
}
}
}
}

@ -1,77 +0,0 @@
//
// DetailsViewModel.swift
// AllIn
//
// Created by Emre on 16/01/2024.
//
import Foundation
import SwiftUI
import DependencyInjection
import Model
import WidgetKit
class DetailsViewModel: ObservableObject {
@Inject var manager: Manager
var id: String
@Published var selectedAnswer = AnswerDetail(response: "", totalStakes: 0, totalParticipants: 0, highestStake: 0, odds: 0)
@Published var mise: String = ""
@Published var betDetail: BetDetail?
init(id: String) {
self.id = id
getItem(withId: id)
}
func getItem(withId id: String) {
let semaphore = DispatchSemaphore(value: 0)
manager.getBet(withId: id) { bet in
self.betDetail = bet
if let firstAnswer = bet.answers.first {
self.selectedAnswer = firstAnswer
}
semaphore.signal()
}
let result = semaphore.wait(timeout: DispatchTime.now() + .seconds(2))
if result == .timedOut {
print("The request has exceeded the deadline")
return
}
}
func addParticipate() {
if let stake = Int(mise) {
manager.addParticipation(withId: id, withAnswer: selectedAnswer.response, andStake: stake) { statusCode in
switch statusCode {
case 201:
AppStateContainer.shared.user?.nbCoins -= stake
WidgetCenter.shared.reloadAllTimelines()
self.getItem(withId: self.id)
default:
break
}
}
}
mise = ""
if let firstAnswer = betDetail!.answers.first {
self.selectedAnswer = firstAnswer
}
}
func checkAndSetError() -> Bool {
if let stake = Int(mise) {
if stake <= AppStateContainer.shared.user?.nbCoins ?? 0 && stake > 0 {
return false
} else {
return true
}
} else {
return true
}
}
}

@ -7,107 +7,29 @@
import Foundation import Foundation
import DependencyInjection import DependencyInjection
import Model import ViewModel
class FriendsViewModel: ObservableObject { class FriendsViewModel: ObservableObject {
@Inject var manager: Manager @Inject var manager: ManagerVM
@Published private(set) var users: [User] = []
@Published private(set) var requests: [User] = []
@Published var text: String = "" {
didSet {
if text.isEmpty {
getItems()
} else {
search()
}
}
}
init() { init() {
getItems() getItems()
getRequests()
}
func getItems() {
manager.getFriends() { friends in
DispatchQueue.main.async {
self.users = friends
}
}
} }
func getRequests() { func getItems ( ) {
manager.getRequests() { friends in
DispatchQueue.main.async {
self.requests = friends
}
}
} }
func search() { func deleteItem(indexSet: IndexSet) {
guard text.allSatisfy({ $0.isLetter || $0.isNumber }) else {
return
}
manager.getUsers(withName: text) { users in
self.users = users
}
} }
func toggleFriendStatus(for user: User, isRequest: Bool) { func moveltem(from: IndexSet, to: Int) {
let targetList = isRequest ? requests : users
guard let index = targetList.firstIndex(where: { $0.username == user.username }) else { return }
var updatedUser = targetList[index]
if isRequest {
if updatedUser.friendStatus == .requested {
updatedUser.friendStatus = .notFriend
deleteItem(username: user.username)
} else {
updatedUser.friendStatus = .friend
addItem(username: user.username)
}
requests.remove(at: index)
} else {
switch updatedUser.friendStatus {
case .friend:
updatedUser.friendStatus = .notFriend
deleteItem(username: user.username)
case .notFriend:
updatedUser.friendStatus = .requested
addItem(username: user.username)
case .requested:
updatedUser.friendStatus = .notFriend
deleteItem(username: user.username)
default:
break
}
users[index] = updatedUser
}
} }
func declineRequest(username: String){ func addItem(title: String) {
guard let index = requests.firstIndex(where: { $0.username == username }) else { return }
manager.removeFriend(withUsername: username) { statusCode in
}
requests.remove(at: index)
}
func deleteItem(username: String) {
manager.removeFriend(withUsername: username) { statusCode in
}
}
func addItem(username: String) {
manager.addFriend(withUsername: username) { statusCode in
}
} }
} }

@ -1,27 +0,0 @@
//
// HistoricBetViewModel.swift
// AllIn
//
// Created by Emre on 16/01/2024.
//
import Foundation
import DependencyInjection
import Model
class HistoricBetViewModel: ObservableObject {
@Inject var manager: Manager
@Published private(set) var bets: [BetResultDetail] = []
init() {
getItems()
}
func getItems() {
manager.getHistoricBets(withIndex: 0, withCount: 20) { bets in
self.bets = bets
}
}
}

@ -36,10 +36,10 @@ class LoginViewModel: ObservableObject {
self.onLoginSuccess() self.onLoginSuccess()
case 404: case 404:
AppStateContainer.shared.loggedState.connectedUser = false AppStateContainer.shared.loggedState.connectedUser = false
self.setErrorMessage(errorMessage: String(localized: "login_bad_credentials")) self.setErrorMessage(errorMessage: "Login ou mot de passe incorrects.")
default: default:
AppStateContainer.shared.loggedState.connectedUser = false AppStateContainer.shared.loggedState.connectedUser = false
self.setErrorMessage(errorMessage: String(localized: "login_error_content")) self.setErrorMessage(errorMessage: "La connexion a échoué. Veuillez réessayer.")
} }
} }
} }
@ -55,13 +55,13 @@ class LoginViewModel: ObservableObject {
// Login // Login
if checkLogin, loginIdentifier.isEmpty { if checkLogin, loginIdentifier.isEmpty {
newLoginIdentifierFieldError = String(localized: "field_error_mandatory") newLoginIdentifierFieldError = "Veuillez saisir votre identifiant."
hasError = true hasError = true
} }
// Password // Password
if checkPassword, loginPassword.isEmpty { if checkPassword, loginPassword.isEmpty {
newLoginPasswordFieldError = String(localized: "field_error_mandatory") newLoginPasswordFieldError = "Veuillez saisir votre mot de passe."
hasError = true hasError = true
} }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save