Mvvmswift

Sources/SwiftMvvm/SwiftMvvm.xcodeproj/project.pbxproj

@@ -35,7 +35,6 @@
 		EC7693022A4568D700F9F644 /* MatiereEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7693012A4568D700F9F644 /* MatiereEditView.swift */; };
 		EC7693042A4568F300F9F644 /* BlockItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7693032A4568F300F9F644 /* BlockItem.swift */; };
 		EC7693062A45691900F9F644 /* AddSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7693052A45691900F9F644 /* AddSheet.swift */; };
-		EC7693082A456A2400F9F644 /* NoteColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7693072A456A2400F9F644 /* NoteColor.swift */; };
 		EC76930A2A456B6B00F9F644 /* Block.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7693092A456B6B00F9F644 /* Block.swift */; };
 		EC7725452A1F814A0075CBBF /* UeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7725442A1F814A0075CBBF /* UeView.swift */; };
 		EC7725542A1F90CF0075CBBF /* BlocModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7725532A1F90CF0075CBBF /* BlocModel.swift */; };
@@ -99,7 +98,6 @@
 		EC7693012A4568D700F9F644 /* MatiereEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MatiereEditView.swift; sourceTree = "<group>"; };
 		EC7693032A4568F300F9F644 /* BlockItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockItem.swift; sourceTree = "<group>"; };
 		EC7693052A45691900F9F644 /* AddSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSheet.swift; sourceTree = "<group>"; };
-		EC7693072A456A2400F9F644 /* NoteColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteColor.swift; sourceTree = "<group>"; };
 		EC7693092A456B6B00F9F644 /* Block.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Block.swift; sourceTree = "<group>"; };
 		EC7725442A1F814A0075CBBF /* UeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UeView.swift; sourceTree = "<group>"; };
 		EC7725532A1F90CF0075CBBF /* BlocModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlocModel.swift; sourceTree = "<group>"; };
@@ -171,7 +169,6 @@
 				EC1A52612A1CE12900F8CC93 /* SwiftMvvmApp.swift */,
 				EC1A52632A1CE12900F8CC93 /* ContentView.swift */,
 				EC1A52652A1CE12A00F8CC93 /* Assets.xcassets */,
-				EC7693072A456A2400F9F644 /* NoteColor.swift */,
 				EC1A52672A1CE12A00F8CC93 /* Preview Content */,
 			);
 			path = SwiftMvvm;
@@ -413,7 +410,6 @@
 				ECF5E2722A23102800A2E9CA /* BlocVm.swift in Sources */,
 				EC7692E82A4565ED00F9F644 /* UeCollection.swift in Sources */,
 				EC7693002A4568BD00F9F644 /* EditSheet.swift in Sources */,
-				EC7693082A456A2400F9F644 /* NoteColor.swift in Sources */,
 				EC7692F82A45685200F9F644 /* MatiereUnq.swift in Sources */,
 				EC7692EA2A45660500F9F644 /* MatiereCollection.swift in Sources */,
 				EC47F9D62A34C50C00CA3A3F /* DataManager.swift in Sources */,

Sources/SwiftMvvm/SwiftMvvm/NoteColor.swift

@@ -1,13 +0,0 @@
-//
-//  NoteColor.swift
-//  SwiftMvvm
-//
-//  Created by etudiant on 23/06/2023.
-//
-
-import Foundation
-import Foundation
-import SwiftUI
-public struct NoteColor{
-  public  let ue_back = Color("background_UE")
-}

Sources/SwiftMvvm/SwiftMvvm/Vue/Block.swift

@@ -18,7 +18,7 @@ struct Block: View {
         VStack(alignment: .leading) {
             
             HStack {
-                Image(systemName: "menucard.fill")
+                Image(systemName: "doc.on.doc.fill")
                 Text("Blocs").bold().font(.title)
             }
             
@@ -32,7 +32,7 @@ struct Block: View {
                 }
                
             }
-        }.padding().background(NoteColor().ue_back).cornerRadius(10)
+        }.padding().cornerRadius(10)
     }
 }
 struct Block_Previews: PreviewProvider {

Sources/SwiftMvvm/SwiftMvvm/Vue/EditSheet.swift

@@ -22,9 +22,6 @@ struct EditSheet : View{
                         TextField("Description", text: $ue.nom)
                         TextField("Coefficient", value: $ue.coef, format: .number)
                     }            
-                    
-                    
-                    
                 }
                 Divider()
                 Section(header: Text("Matieres").font(.title)) {
@@ -46,7 +43,7 @@ struct EditSheet : View{
                         Text("Ajouter une matiere")
                     }
                 }
-            }.padding().background(NoteColor().ue_back)
+            }.padding()
             
         }
         .navigationBarItems(trailing:

Sources/SwiftMvvm/SwiftMvvm/Vue/Home.swift

@@ -23,7 +23,7 @@ struct Home: View {
                 Block(manager: manager )
                VStack(alignment : .leading){
                    HStack(alignment:.bottom){
-                       Image(systemName: "menucard.fill")
+                       Image(systemName: "doc.on.doc.fill")
                        Text("UEs").bold().font(.title)
                    }.padding()
                        
@@ -35,17 +35,11 @@ struct Home: View {
                                     UeView(bloc: item, ue:  ue)
                                }
                               
-                              
-                              
                            }
                            
                        }
-               }.padding().background(NoteColor().ue_back).cornerRadius(10)
-                
-                
                }.padding()             
-                
-                 
+                }.padding()
         }
        
     }

Sources/SwiftMvvm/SwiftMvvm/Vue/UeCapsule.swift

@@ -70,18 +70,12 @@ import UIKit
                 }
         }
     }
-     
-     
      private func updateMoy(){
          var da = ue.model.totalMoyenne * capsuleWidth / 100
          ue.model.coef = ue.model.coef + 1
          print(da)
      }
 }
-
-
-
-
 struct CapsuleV_Previews: PreviewProvider {
     static var previews: some View {
         

Sources/SwiftMvvm/SwiftMvvm/Vue/UeView.swift

@@ -6,7 +6,6 @@ public struct UeView : View{
    @ObservedObject var bloc : BlocVM
    @ObservedObject var ue : UeVM
     public var body: some View {        
-        
         VStack(alignment:.leading){
 
             Divider()
@@ -15,8 +14,6 @@ public struct UeView : View{
                 Spacer()
                 Text(ue.coef.description)
             }
-            
-       
             HStack(){
                 Capsule().foregroundColor( ue.totalMoyenne * 5 < 50 ? .red : .green).frame(width: ue.totalMoyenne * 5 ,height: 22)
               Spacer()
@@ -35,10 +32,8 @@ public struct UeView : View{
 
 struct UeView_Previews: PreviewProvider {
     static var previews: some View {
-       
             let ue =  DataStub().load()[0]
             let ueVM = UeVM(withUe: ue)
-            
         UeView(bloc: BlocVM(withBloc: Bloc(nom: "Projet/Stage", ues: DataStub().loadUeStage_Proj(),isUq: true)), ue: ueVM)
         }
    

Sources/SwiftMvvm/SwiftMvvm/Vue/Uee.swift

@@ -10,8 +10,6 @@ import SwiftUI
 struct Uee: View {
     @ObservedObject var ue: UeVM
     @ObservedObject var bloc: BlocVM
-    
-
     var body: some View {
         NavigationView {
             VStack {