From 263117607b0c2870529c6b5b4fa249f06a9f17bd Mon Sep 17 00:00:00 2001 From: andy Date: Sun, 7 Aug 2022 13:31:15 +0100 Subject: [PATCH] rebrand --- Music Tools/Application/AppDelegate.swift | 2 +- Music Tools/Application/SceneDelegate.swift | 2 +- Music Tools/Model/LiveUser.swift | 2 +- Music Tools/Model/Playlist.swift | 2 +- Music Tools/Model/Tag.swift | 2 +- Music Tools/Model/User.swift | 2 +- Music Tools/Network/Network.swift | 2 +- Music Tools/Network/NetworkPersister.swift | 2 +- Music Tools/Network/PlaylistApi.swift | 2 +- Music Tools/Network/TagApi.swift | 2 +- Music Tools/Network/UserApi.swift | 2 +- Music Tools/Router.swift | 2 +- Music Tools/Views/AppSkeleton.swift | 2 +- Music Tools/Views/LoginScreen.swift | 4 +-- .../Views/Playlist/AddPlaylistSheet.swift | 2 +- .../Views/Playlist/PlaylistInputList.swift | 2 +- Music Tools/Views/Playlist/PlaylistList.swift | 2 +- Music Tools/Views/Playlist/PlaylistRow.swift | 2 +- Music Tools/Views/Playlist/PlaylistView.swift | 32 ++++++++++++------- Music Tools/Views/Settings/SettingsList.swift | 6 ++-- Music Tools/Views/Tag/AddTagSheet.swift | 2 +- Music Tools/Views/Tag/TagList.swift | 2 +- Music Tools/Views/Tag/TagObjList.swift | 2 +- Music Tools/Views/Tag/TagRow.swift | 2 +- Music Tools/Views/Tag/TagView.swift | 2 +- README.md | 4 +-- 26 files changed, 50 insertions(+), 40 deletions(-) diff --git a/Music Tools/Application/AppDelegate.swift b/Music Tools/Application/AppDelegate.swift index 6217415..899e6f2 100644 --- a/Music Tools/Application/AppDelegate.swift +++ b/Music Tools/Application/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 16/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Application/SceneDelegate.swift b/Music Tools/Application/SceneDelegate.swift index 81bbda8..a6e70c8 100644 --- a/Music Tools/Application/SceneDelegate.swift +++ b/Music Tools/Application/SceneDelegate.swift @@ -1,6 +1,6 @@ // // SceneDelegate.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 16/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Model/LiveUser.swift b/Music Tools/Model/LiveUser.swift index dbf6f0b..40970a5 100644 --- a/Music Tools/Model/LiveUser.swift +++ b/Music Tools/Model/LiveUser.swift @@ -1,6 +1,6 @@ // // LiveUser.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 19/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Model/Playlist.swift b/Music Tools/Model/Playlist.swift index b1cf38e..933bc1b 100644 --- a/Music Tools/Model/Playlist.swift +++ b/Music Tools/Model/Playlist.swift @@ -1,6 +1,6 @@ // // Playlist.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 16/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Model/Tag.swift b/Music Tools/Model/Tag.swift index 5c46240..00454bf 100644 --- a/Music Tools/Model/Tag.swift +++ b/Music Tools/Model/Tag.swift @@ -1,6 +1,6 @@ // // Tag.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 20/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Model/User.swift b/Music Tools/Model/User.swift index 122b827..ab3d923 100644 --- a/Music Tools/Model/User.swift +++ b/Music Tools/Model/User.swift @@ -1,6 +1,6 @@ // // User.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 18/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Network/Network.swift b/Music Tools/Network/Network.swift index aa793f0..c210ac1 100644 --- a/Music Tools/Network/Network.swift +++ b/Music Tools/Network/Network.swift @@ -1,6 +1,6 @@ // // Network.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 18/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Network/NetworkPersister.swift b/Music Tools/Network/NetworkPersister.swift index 29202e3..bd91306 100644 --- a/Music Tools/Network/NetworkPersister.swift +++ b/Music Tools/Network/NetworkPersister.swift @@ -1,6 +1,6 @@ // // NetWorkPersister.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 07/03/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Network/PlaylistApi.swift b/Music Tools/Network/PlaylistApi.swift index 555559e..53e88d6 100644 --- a/Music Tools/Network/PlaylistApi.swift +++ b/Music Tools/Network/PlaylistApi.swift @@ -1,6 +1,6 @@ // // PlaylistApi.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 18/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Network/TagApi.swift b/Music Tools/Network/TagApi.swift index c4ccbbc..5de4999 100644 --- a/Music Tools/Network/TagApi.swift +++ b/Music Tools/Network/TagApi.swift @@ -1,6 +1,6 @@ // // TagApi.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 20/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Network/UserApi.swift b/Music Tools/Network/UserApi.swift index 24f9fc3..fb7f3c7 100644 --- a/Music Tools/Network/UserApi.swift +++ b/Music Tools/Network/UserApi.swift @@ -1,6 +1,6 @@ // // UserApi.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 18/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Router.swift b/Music Tools/Router.swift index 646e3e8..4f2e22b 100644 --- a/Music Tools/Router.swift +++ b/Music Tools/Router.swift @@ -1,6 +1,6 @@ // // Router.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 25/04/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/AppSkeleton.swift b/Music Tools/Views/AppSkeleton.swift index dba150b..17953b4 100644 --- a/Music Tools/Views/AppSkeleton.swift +++ b/Music Tools/Views/AppSkeleton.swift @@ -1,6 +1,6 @@ // // AppSkeleton.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 16/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/LoginScreen.swift b/Music Tools/Views/LoginScreen.swift index 04513ca..3b46928 100644 --- a/Music Tools/Views/LoginScreen.swift +++ b/Music Tools/Views/LoginScreen.swift @@ -1,6 +1,6 @@ // // LoginScreen.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 17/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. @@ -28,7 +28,7 @@ struct LoginScreen: View { .cornerRadius(18) .shadow(radius: /*@START_MENU_TOKEN@*/10/*@END_MENU_TOKEN@*/) .padding(.bottom, 20) - Text("Sarsoo Music Tools") + Text("Sarsoo's Mixonomer") .font(.largeTitle) TextField("Username", text: $username) SecureField("Password", text: $password) diff --git a/Music Tools/Views/Playlist/AddPlaylistSheet.swift b/Music Tools/Views/Playlist/AddPlaylistSheet.swift index 5770982..bebb22f 100644 --- a/Music Tools/Views/Playlist/AddPlaylistSheet.swift +++ b/Music Tools/Views/Playlist/AddPlaylistSheet.swift @@ -1,6 +1,6 @@ // // AddPlaylistSheet.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 19/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/Playlist/PlaylistInputList.swift b/Music Tools/Views/Playlist/PlaylistInputList.swift index 64735c7..2153de6 100644 --- a/Music Tools/Views/Playlist/PlaylistInputList.swift +++ b/Music Tools/Views/Playlist/PlaylistInputList.swift @@ -1,6 +1,6 @@ // // PlaylistInputList.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 19/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/Playlist/PlaylistList.swift b/Music Tools/Views/Playlist/PlaylistList.swift index f1ae5c9..7c6d044 100644 --- a/Music Tools/Views/Playlist/PlaylistList.swift +++ b/Music Tools/Views/Playlist/PlaylistList.swift @@ -1,6 +1,6 @@ // // PlaylistList.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 25/04/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/Playlist/PlaylistRow.swift b/Music Tools/Views/Playlist/PlaylistRow.swift index c9cc82f..edbd0bc 100644 --- a/Music Tools/Views/Playlist/PlaylistRow.swift +++ b/Music Tools/Views/Playlist/PlaylistRow.swift @@ -1,6 +1,6 @@ // // PlaylistRow.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 17/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/Playlist/PlaylistView.swift b/Music Tools/Views/Playlist/PlaylistView.swift index 234794c..8030fd3 100644 --- a/Music Tools/Views/Playlist/PlaylistView.swift +++ b/Music Tools/Views/Playlist/PlaylistView.swift @@ -1,6 +1,6 @@ // // PlaylistView.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 16/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. @@ -25,7 +25,7 @@ struct PlaylistView: View { } } - var chartSize = CGSize(width:140, height:220); + var chartSize = CGSize(width:210, height:250); var body: some View { Form { @@ -66,8 +66,8 @@ struct PlaylistView: View { Text("Refresh") } } - - VStack { + + ScrollView(.horizontal){ HStack { Spacer() PieChartView( @@ -76,20 +76,24 @@ struct PlaylistView: View { legend:"Listening", style: chartStyle, form: chartSize) + Spacer(minLength: 20) PieChartView( data: [Double(self.playlist.lastfm_stat_album_percent), Double(100 - self.playlist.lastfm_stat_album_percent)], title: "Albums", legend:"Listening", style: chartStyle, form: chartSize) + Spacer(minLength: 20) + PieChartView( + data: [Double(self.playlist.lastfm_stat_artist_percent), Double(100 - self.playlist.lastfm_stat_artist_percent)], + title: "Artists", + legend:"Listening", + style: chartStyle, + form: chartSize) Spacer() } - PieChartView( - data: [Double(self.playlist.lastfm_stat_artist_percent), Double(100 - self.playlist.lastfm_stat_artist_percent)], - title: "Artists", - legend:"Listening", - style: chartStyle, - form: chartSize) + .padding([.vertical], 20) + .padding([.horizontal], 10) } Section(header: Text("Options")){ @@ -264,7 +268,13 @@ struct PlaylistView: View { struct PlaylistView_Previews: PreviewProvider { static var previews: some View { PlaylistView(playlist: .constant( - Playlist(name: "playlist name", username: "username") + Playlist(name: "playlist name", + username: "username", + lastfm_stat_percent: 30, + lastfm_stat_album_percent: 40, + lastfm_stat_artist_percent: 80 + ) )) + } } diff --git a/Music Tools/Views/Settings/SettingsList.swift b/Music Tools/Views/Settings/SettingsList.swift index d79f23c..aa420e8 100644 --- a/Music Tools/Views/Settings/SettingsList.swift +++ b/Music Tools/Views/Settings/SettingsList.swift @@ -1,6 +1,6 @@ // // SettingsList.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 20/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. @@ -53,14 +53,14 @@ struct SettingsList: View { } ) { Button(action: { - if let url = URL(string: "https://github.com/sarsoo/music-tools") { + if let url = URL(string: "https://github.com/sarsoo/Mixonomer") { UIApplication.shared.open(url) } }) { Text("Server Source") } Button(action: { - if let url = URL(string: "https://github.com/sarsoo/music-tools-ios") { + if let url = URL(string: "https://github.com/sarsoo/Mixonomer-ios") { UIApplication.shared.open(url) } }) { diff --git a/Music Tools/Views/Tag/AddTagSheet.swift b/Music Tools/Views/Tag/AddTagSheet.swift index bebd5ea..776ae56 100644 --- a/Music Tools/Views/Tag/AddTagSheet.swift +++ b/Music Tools/Views/Tag/AddTagSheet.swift @@ -1,6 +1,6 @@ // // AddTagSheet.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 02/03/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/Tag/TagList.swift b/Music Tools/Views/Tag/TagList.swift index 1e4f788..b3c6513 100644 --- a/Music Tools/Views/Tag/TagList.swift +++ b/Music Tools/Views/Tag/TagList.swift @@ -1,6 +1,6 @@ // // TagList.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 25/04/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/Tag/TagObjList.swift b/Music Tools/Views/Tag/TagObjList.swift index b1b557c..32a68d7 100644 --- a/Music Tools/Views/Tag/TagObjList.swift +++ b/Music Tools/Views/Tag/TagObjList.swift @@ -1,6 +1,6 @@ // // TagObjList.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 20/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/Tag/TagRow.swift b/Music Tools/Views/Tag/TagRow.swift index 27a7406..fcd586c 100644 --- a/Music Tools/Views/Tag/TagRow.swift +++ b/Music Tools/Views/Tag/TagRow.swift @@ -1,6 +1,6 @@ // // TagRow.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 20/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/Music Tools/Views/Tag/TagView.swift b/Music Tools/Views/Tag/TagView.swift index 16969d0..5a1c330 100644 --- a/Music Tools/Views/Tag/TagView.swift +++ b/Music Tools/Views/Tag/TagView.swift @@ -1,6 +1,6 @@ // // TagView.swift -// Music Tools +// Mixonomer // // Created by Andy Pack on 20/02/2020. // Copyright © 2020 Sarsoo. All rights reserved. diff --git a/README.md b/README.md index 149d895..516e3cc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Music Tools iOS +# Mixonomer iOS -iOS client for [Music Tools](https://music.sarsoo.xyz) ([Source](https://github.com/sarsoo/Music-Tools)), using it to learn swift. +iOS client for [Mixonomer](https://music.sarsoo.xyz) ([Source](https://github.com/sarsoo/Mixonomer)), using it to learn swift. Using SwiftUI for the main app UI. Hanging SwiftUI on a hosting controller for log in/register.