Merge pull request #46 from blackcandy-org/ui-issue

Fix some UI issues

Author: aidewoode

BlackCandy/Utils/CustomStyle.swift

@@ -28,6 +28,7 @@ struct CustomStyle {
 
   enum Style {
     case largeSymbol
+    case extraLargeSymbol
     case smallFont
     case mediumFont
     case playerProgressLoader
@@ -56,6 +57,9 @@ extension View {
     case .largeSymbol:
       font(.system(size: CustomStyle.spacing(.wide)))
 
+    case .extraLargeSymbol:
+      font(.system(size: CustomStyle.spacing(.extraWide)))
+
     case .smallFont:
       font(.system(size: CustomStyle.fontSize(.small)))
 

BlackCandy/ViewControllers/PlayerViewController.swift

@@ -12,7 +12,17 @@ class PlayerViewController: UIHostingController<PlayerView> {
 
   init(store: StoreOf<PlayerReducer>) {
     self.store = store
-    super.init(rootView: PlayerView(store: store))
+    super.init(
+      rootView: PlayerView(
+        store: store,
+        padding: .init(
+          top: CustomStyle.spacing(.medium),
+          leading: 0,
+          bottom: CustomStyle.spacing(.narrow),
+          trailing: 0
+        )
+      )
+    )
   }
 
   override func viewDidLoad() {
@@ -31,9 +41,11 @@ class PlayerViewController: UIHostingController<PlayerView> {
 
         pauseButton.isEnabled = state.hasCurrentSong
         pauseButton.tintColor = .label
+        pauseButton.width = CustomStyle.spacing(.ultraWide)
 
         playButton.isEnabled = state.hasCurrentSong
         playButton.tintColor = .label
+        playButton.width = CustomStyle.spacing(.ultraWide)
 
         nextButton.isEnabled = state.hasCurrentSong
         nextButton.tintColor = .label

BlackCandy/ViewControllers/SideBarViewController.swift

@@ -12,7 +12,15 @@ class SideBarViewController: UIViewController {
     playerViewController = UIHostingController(
       rootView: VStack {
         Divider()
-        PlayerView(store: store)
+        PlayerView(
+          store: store,
+          padding: .init(
+            top: CustomStyle.spacing(.tiny),
+            leading: CustomStyle.spacing(.tiny),
+            bottom: 0,
+            trailing: CustomStyle.spacing(.tiny)
+          )
+        )
       }
     )
 

BlackCandy/Views/Player/PlayerActionsView.swift

@@ -16,10 +16,9 @@ struct PlayerActionsView: View {
               .tint(viewStore.mode == .noRepeat ? .primary : .white)
           }
         )
-        .padding(CustomStyle.spacing(.tiny))
+        .padding(CustomStyle.spacing(.narrow))
         .background(viewStore.mode == .noRepeat ? .clear : .accentColor)
         .cornerRadius(CustomStyle.cornerRadius(.medium))
-        .disabled(viewStore.isPlaylistVisible)
 
         Spacer()
 
@@ -37,8 +36,8 @@ struct PlayerActionsView: View {
             }
           }
         )
-        .padding(CustomStyle.spacing(.tiny))
-        .disabled(viewStore.isPlaylistVisible || !viewStore.hasCurrentSong)
+        .padding(CustomStyle.spacing(.narrow))
+        .disabled(!viewStore.hasCurrentSong)
 
         Spacer()
 
@@ -48,15 +47,14 @@ struct PlayerActionsView: View {
           },
           label: {
             Image(systemName: "list.bullet")
-              .tint(.primary)
+              .tint(viewStore.isPlaylistVisible ? .white : .primary)
           }
         )
-        .padding(CustomStyle.spacing(.tiny))
-        .background(viewStore.isPlaylistVisible ? Color.init(.systemGray3) : Color.clear)
-        .cornerRadius(CustomStyle.cornerRadius(.small))
+        .padding(CustomStyle.spacing(.narrow))
+        .background(viewStore.isPlaylistVisible ? Color.accentColor : .clear)
+        .cornerRadius(CustomStyle.cornerRadius(.medium))
       }
     })
-    .padding(.horizontal, CustomStyle.spacing(.large))
   }
 }
 

BlackCandy/Views/Player/PlayerControlView.swift

@@ -42,11 +42,11 @@ struct PlayerControlView: View {
           if viewStore.isPlaying {
             Image(systemName: "pause.fill")
               .tint(.primary)
-              .customStyle(.largeSymbol)
+              .customStyle(.extraLargeSymbol)
           } else {
             Image(systemName: "play.fill")
               .tint(.primary)
-              .customStyle(.largeSymbol)
+              .customStyle(.extraLargeSymbol)
           }
         }
       )

BlackCandy/Views/PlayerView.swift

@@ -3,6 +3,7 @@ import ComposableArchitecture
 
 struct PlayerView: View {
   let store: StoreOf<PlayerReducer>
+  var padding: EdgeInsets = .init()
 
   struct ViewState: Equatable {
     let isPlaylistVisible: Bool
@@ -23,18 +24,22 @@ struct PlayerView: View {
 
         if viewStore.isPlaylistVisible {
           PlayerPlaylistView(store: store)
+            .padding(.horizontal, CustomStyle.spacing(.tiny))
+
         } else {
           PlayerSongInfoView(currentSong: viewStore.currentSong)
           PlayerControlView(store: store)
             .disabled(!viewStore.hasCurrentSong)
+            .padding(.horizontal, CustomStyle.spacing(.small))
         }
 
         Spacer()
 
         PlayerActionsView(store: store)
+          .padding(.vertical, CustomStyle.spacing(.medium))
+          .padding(.horizontal, CustomStyle.spacing(.large))
       }
-      .padding()
-      .padding(.bottom, CustomStyle.spacing(.wide))
+      .padding(padding)
       .frame(maxWidth: CustomStyle.playerMaxWidth)
       .task {
         await viewStore.send(.getLivingStates).finish()