Add new fonts and picker style.

8 files changed, 34 insertions, 32 deletions

diff --git a/Map/Presentation/Base Components/MapRender/MapAxes.swift b/Map/Presentation/Base Components/MapRender/MapAxes.swift
index 1c0a147..48e0b6d 100644
--- a/Map/Presentation/Base Components/MapRender/MapAxes.swift
+++ b/Map/Presentation/Base Components/MapRender/MapAxes.swift
@@ -33,52 +33,54 @@ struct MapAxes: View {
         path.addLine(to: CGPoint(x: mapSize.width, y: mapSize.height))
         path.move(to: CGPoint(x: mapSize.width, y: mapSize.height))
         path.closeSubpath()
-      }.stroke(Color.Map.axisColor, lineWidth: lineWidth * 2)
+      }.stroke(Color.Theme.Map.axisColor, lineWidth: lineWidth * 2)
 
       // Y Labels
-      Text("Visible").font(.Theme.Map.axisLabel).foregroundColor(.Map.labelColor).rotationEffect(
-        Angle(degrees: -90.0)
-      )
-      .offset(CGSize(width: -35.0, height: 0.0))
-      Text("Invisible").font(.Theme.Map.axisLabel).foregroundColor(.Map.labelColor).rotationEffect(
-        Angle(degrees: -90.0)
-      )
-      .offset(CGSize(width: -40.0, height: mapSize.height - 20))
+      Text("Visible").font(.Theme.Map.axisLabel).foregroundColor(.Theme.Map.labelColor)
+        .rotationEffect(
+          Angle(degrees: -90.0)
+        )
+        .offset(CGSize(width: -35.0, height: 0.0))
+      Text("Invisible").font(.Theme.Map.axisLabel).foregroundColor(.Theme.Map.labelColor)
+        .rotationEffect(
+          Angle(degrees: -90.0)
+        )
+        .offset(CGSize(width: -40.0, height: mapSize.height - 20))
 
       // X Labels
 
       Text("Uncharted")
         .font(.Theme.Map.axisLabel)
-        .foregroundColor(.Map.labelColor)
+        .foregroundColor(.Theme.Map.labelColor)
         .frame(width: mapSize.width / 4, height: stageHeight / 2.0, alignment: .topLeading)
         .offset(CGSize(width: 0.0, height: -stageHeight / 4.0))
       Text("Industrialised")
         .font(.Theme.Map.axisLabel)
-        .foregroundColor(.Map.labelColor)
+        .foregroundColor(.Theme.Map.labelColor)
         .frame(width: mapSize.width / 4, height: stageHeight / 2.0, alignment: .topLeading)
         .offset(CGSize(width: mapSize.width - 100.0, height: -stageHeight / 4.0))
 
       Text(evolution.i)
         .font(.Theme.Map.axisLabel)
-        .foregroundColor(.Map.labelColor)
+        .foregroundColor(.Theme.Map.labelColor)
         .frame(width: w(stages[0]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: 0.0, height: mapSize.height + padding))
 
       Text(evolution.ii)
         .font(.Theme.Map.axisLabel)
-        .foregroundColor(.Map.labelColor)
+        .foregroundColor(.Theme.Map.labelColor)
         .frame(width: w(stages[1]) - w(stages[0]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[0]), height: mapSize.height + padding))
 
       Text(evolution.iii)
         .font(.Theme.Map.axisLabel)
-        .foregroundColor(.Map.labelColor)
+        .foregroundColor(.Theme.Map.labelColor)
         .frame(width: w(stages[2]) - w(stages[1]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[1]), height: mapSize.height + padding))
 
       Text(evolution.iv)
         .font(.Theme.Map.axisLabel)
-        .foregroundColor(.Map.labelColor)
+        .foregroundColor(.Theme.Map.labelColor)
         .frame(width: mapSize.width - w(stages[2]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[2]), height: mapSize.height + padding))
     }
diff --git a/Map/Presentation/Base Components/MapRender/MapBlockers.swift b/Map/Presentation/Base Components/MapRender/MapBlockers.swift
index 613b792..e550ca9 100644
--- a/Map/Presentation/Base Components/MapRender/MapBlockers.swift
+++ b/Map/Presentation/Base Components/MapRender/MapBlockers.swift
@@ -32,7 +32,7 @@ struct MapBlockers: View {
               y: h(vertex.position.y) - vertexSize.height * 2 / 3),
             size: CGSize(width: vertexSize.width / 2, height: vertexSize.height * 2)
           ), cornerSize: cornerSize)
-      }.fill(Color.Map.blockerColor)
+      }.fill(Color.Theme.Map.blockerColor)
     }
   }
 
diff --git a/Map/Presentation/Base Components/MapRender/MapEdges.swift b/Map/Presentation/Base Components/MapRender/MapEdges.swift
index 3090c04..3c6ef82 100644
--- a/Map/Presentation/Base Components/MapRender/MapEdges.swift
+++ b/Map/Presentation/Base Components/MapRender/MapEdges.swift
@@ -66,7 +66,7 @@ struct MapEdges: View {
         path.closeSubpath()
       }.applying(
         CGAffineTransform(translationX: vertexSize.width / 2.0, y: vertexSize.height / 2.0)
-      ).stroke(Color.Map.vertexColor, lineWidth: lineWidth)
+      ).stroke(Color.Theme.Map.vertexColor, lineWidth: lineWidth)
     }
   }
 
diff --git a/Map/Presentation/Base Components/MapRender/MapGroups.swift b/Map/Presentation/Base Components/MapRender/MapGroups.swift
index 41ea147..1983dcd 100644
--- a/Map/Presentation/Base Components/MapRender/MapGroups.swift
+++ b/Map/Presentation/Base Components/MapRender/MapGroups.swift
@@ -28,7 +28,7 @@ struct MapGroups: View {
   }
 
   private func color(_ index: Int) -> Color {
-    return .Map.groupColors[index % Color.Map.groupColors.count]
+    return .Theme.Map.groupColors[index % Color.Theme.Map.groupColors.count]
   }
 }
 
diff --git a/Map/Presentation/Base Components/MapRender/MapNotes.swift b/Map/Presentation/Base Components/MapRender/MapNotes.swift
index 16c61ba..20aa1e1 100644
--- a/Map/Presentation/Base Components/MapRender/MapNotes.swift
+++ b/Map/Presentation/Base Components/MapRender/MapNotes.swift
@@ -29,8 +29,8 @@ struct MapNotes: View {
         .lineSpacing(Dimensions.LineHeight.Map.note - Dimensions.FontSize.Map.note)
         .padding(Dimensions.Spacing.cozy)
         .background(.white)
-        .foregroundColor(.Map.labelColor)
-        .border(Color.Map.vertexColor, width: lineWidth)
+        .foregroundColor(.Theme.Map.labelColor)
+        .border(Color.Theme.Map.vertexColor, width: lineWidth)
         .frame(minWidth: 16.0, maxWidth: maxWidth, alignment: .topLeading)
         .offset(
           CGSize(
diff --git a/Map/Presentation/Base Components/MapRender/MapOpportunities.swift b/Map/Presentation/Base Components/MapRender/MapOpportunities.swift
index 3d539d4..04d4b40 100644
--- a/Map/Presentation/Base Components/MapRender/MapOpportunities.swift
+++ b/Map/Presentation/Base Components/MapRender/MapOpportunities.swift
@@ -61,7 +61,7 @@ struct MapOpportunities: View {
       }.applying(
         CGAffineTransform(translationX: vertexSize.width / 2.0, y: vertexSize.height / 2.0)
       ).strokedPath(StrokeStyle(lineWidth: lineWidth / 4, dash: [10.0])).stroke(
-        Color.Map.opportunityColor)
+        Color.Theme.Map.opportunityColor)
     }
   }
 
diff --git a/Map/Presentation/Base Components/MapRender/MapStages.swift b/Map/Presentation/Base Components/MapRender/MapStages.swift
index d5e5965..08250f7 100644
--- a/Map/Presentation/Base Components/MapRender/MapStages.swift
+++ b/Map/Presentation/Base Components/MapRender/MapStages.swift
@@ -25,25 +25,25 @@ struct MapStages: View {
   var body: some View {
     ZStack(alignment: .topLeading) {
       PatternView(
-        design: .constant(.stitch), pixelSize: 1.0, foregroundColor: .Map.stageForeground,
-        backgroundColor: .Map.stageBackground
+        design: .constant(.stitch), pixelSize: 1.0, foregroundColor: .Theme.Map.stageForeground,
+        backgroundColor: .Theme.Map.stageBackground
       )
       .frame(width: w(stages[0]), height: mapSize.height)
       PatternView(
-        design: .constant(.shingles), pixelSize: 1.0, foregroundColor: .Map.stageForeground,
-        backgroundColor: .Map.stageBackground
+        design: .constant(.shingles), pixelSize: 1.0, foregroundColor: .Theme.Map.stageForeground,
+        backgroundColor: .Theme.Map.stageBackground
       )
       .offset(CGSize(width: w(stages[0]), height: 0))
       .frame(width: w(stages[1]) - w(stages[0]), height: mapSize.height)
       PatternView(
-        design: .constant(.shadowGrid), pixelSize: 1.0, foregroundColor: .Map.stageForeground,
-        backgroundColor: .Map.stageBackground
+        design: .constant(.shadowGrid), pixelSize: 1.0, foregroundColor: .Theme.Map.stageForeground,
+        backgroundColor: .Theme.Map.stageBackground
       )
       .offset(CGSize(width: w(stages[1]), height: 0))
       .frame(width: w(stages[2]) - w(stages[1]), height: mapSize.height)
       PatternView(
-        design: .constant(.wicker), pixelSize: 1.0, foregroundColor: .Map.stageForeground,
-        backgroundColor: .Map.stageBackground
+        design: .constant(.wicker), pixelSize: 1.0, foregroundColor: .Theme.Map.stageForeground,
+        backgroundColor: .Theme.Map.stageBackground
       )
       .offset(CGSize(width: w(stages[2]), height: 0))
       .frame(width: mapSize.width - w(stages[2]), height: mapSize.height)
@@ -61,7 +61,7 @@ struct MapStages: View {
         path.move(to: CGPoint(x: w(stages[0]), y: 0))
         path.closeSubpath()
       }.strokedPath(StrokeStyle(lineWidth: lineWidth / 4, dash: [10.0, 18.0])).stroke(
-        Color.Map.axisColor)
+        Color.Theme.Map.axisColor)
     }
   }
 
diff --git a/Map/Presentation/Base Components/MapRender/MapVertices.swift b/Map/Presentation/Base Components/MapRender/MapVertices.swift
index 1f6cf1a..4f130c6 100644
--- a/Map/Presentation/Base Components/MapRender/MapVertices.swift
+++ b/Map/Presentation/Base Components/MapRender/MapVertices.swift
@@ -27,13 +27,13 @@ struct MapVertices: View {
     ZStack(alignment: .topLeading) {
       ForEach(vertices, id: \.id) { vertex in
         ZStack(alignment: .topLeading) {
-          getVertexShape(vertex).fill(Color.Map.vertexColor)
+          getVertexShape(vertex).fill(Color.Theme.Map.vertexColor)
           Text(vertex.label.replacingOccurrences(of: "\\n", with: "\n"))
             .font(.Theme.Map.vertexLabel)
             .lineSpacing(
               Dimensions.LineHeight.Map.vertexLabel - Dimensions.FontSize.Map.vertexLabel
             )
-            .foregroundColor(.Map.labelColor)
+            .foregroundColor(.Theme.Map.labelColor)
             .shadow(color: .white, radius: 0, x: -0.5, y: -0.5)
             .shadow(color: .white, radius: 0, x: 0.5, y: 0.5)
             .offset(