sarsoo/Mixonomer-iOS
1
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases Wiki Activity

rebrand

Browse Source
This commit is contained in:
andy 2022-08-07 13:31:15 +01:00
parent e45ba9e589
commit 263117607b
26 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Music Tools/Application/AppDelegate.swift
View File

@ -1,6 +1,6 @@
// //
// AppDelegate.swift // AppDelegate.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 16/02/2020. // Created by Andy Pack on 16/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Application/SceneDelegate.swift
View File

@ -1,6 +1,6 @@
// //
// SceneDelegate.swift // SceneDelegate.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 16/02/2020. // Created by Andy Pack on 16/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Model/LiveUser.swift
View File

@ -1,6 +1,6 @@
// //
// LiveUser.swift // LiveUser.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 19/02/2020. // Created by Andy Pack on 19/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Model/Playlist.swift
View File

@ -1,6 +1,6 @@
// //
// Playlist.swift // Playlist.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 16/02/2020. // Created by Andy Pack on 16/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Model/Tag.swift
View File

@ -1,6 +1,6 @@
// //
// Tag.swift // Tag.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 20/02/2020. // Created by Andy Pack on 20/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Model/User.swift
View File

@ -1,6 +1,6 @@
// //
// User.swift // User.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 18/02/2020. // Created by Andy Pack on 18/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Network/Network.swift
View File

@ -1,6 +1,6 @@
// //
// Network.swift // Network.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 18/02/2020. // Created by Andy Pack on 18/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Network/NetworkPersister.swift
View File

@ -1,6 +1,6 @@
// //
// NetWorkPersister.swift // NetWorkPersister.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 07/03/2020. // Created by Andy Pack on 07/03/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Network/PlaylistApi.swift
View File

@ -1,6 +1,6 @@
// //
// PlaylistApi.swift // PlaylistApi.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 18/02/2020. // Created by Andy Pack on 18/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Network/TagApi.swift
View File

@ -1,6 +1,6 @@
// //
// TagApi.swift // TagApi.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 20/02/2020. // Created by Andy Pack on 20/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Network/UserApi.swift
View File

@ -1,6 +1,6 @@
// //
// UserApi.swift // UserApi.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 18/02/2020. // Created by Andy Pack on 18/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Router.swift
View File

@ -1,6 +1,6 @@
// //
// Router.swift // Router.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 25/04/2020. // Created by Andy Pack on 25/04/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Views/AppSkeleton.swift
View File

@ -1,6 +1,6 @@
// //
// AppSkeleton.swift // AppSkeleton.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 16/02/2020. // Created by Andy Pack on 16/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

4
Music Tools/Views/LoginScreen.swift
View File

@ -1,6 +1,6 @@
// //
// LoginScreen.swift // LoginScreen.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 17/02/2020. // Created by Andy Pack on 17/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.
@ -28,7 +28,7 @@ struct LoginScreen: View {
.cornerRadius(18) .cornerRadius(18)
.shadow(radius: /*@START_MENU_TOKEN@*/10/*@END_MENU_TOKEN@*/) .shadow(radius: /*@START_MENU_TOKEN@*/10/*@END_MENU_TOKEN@*/)
.padding(.bottom, 20) .padding(.bottom, 20)
Text("Sarsoo Music Tools") Text("Sarsoo's Mixonomer")
.font(.largeTitle) .font(.largeTitle)
TextField("Username", text: $username) TextField("Username", text: $username)
SecureField("Password", text: $password) SecureField("Password", text: $password)

2
Music Tools/Views/Playlist/AddPlaylistSheet.swift
View File

@ -1,6 +1,6 @@
// //
// AddPlaylistSheet.swift // AddPlaylistSheet.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 19/02/2020. // Created by Andy Pack on 19/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Views/Playlist/PlaylistInputList.swift
View File

@ -1,6 +1,6 @@
// //
// PlaylistInputList.swift // PlaylistInputList.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 19/02/2020. // Created by Andy Pack on 19/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Views/Playlist/PlaylistList.swift
View File

@ -1,6 +1,6 @@
// //
// PlaylistList.swift // PlaylistList.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 25/04/2020. // Created by Andy Pack on 25/04/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Views/Playlist/PlaylistRow.swift
View File

@ -1,6 +1,6 @@
// //
// PlaylistRow.swift // PlaylistRow.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 17/02/2020. // Created by Andy Pack on 17/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

32
Music Tools/Views/Playlist/PlaylistView.swift
View File

@ -1,6 +1,6 @@
// //
// PlaylistView.swift // PlaylistView.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 16/02/2020. // Created by Andy Pack on 16/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // 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 { var body: some View {
Form { Form {
@ -66,8 +66,8 @@ struct PlaylistView: View {
Text("Refresh") Text("Refresh")
} }
} }
VStack { ScrollView(.horizontal){
HStack { HStack {
Spacer() Spacer()
PieChartView( PieChartView(
@ -76,20 +76,24 @@ struct PlaylistView: View {
legend:"Listening", legend:"Listening",
style: chartStyle, style: chartStyle,
form: chartSize) form: chartSize)
Spacer(minLength: 20)
PieChartView( PieChartView(
data: [Double(self.playlist.lastfm_stat_album_percent), Double(100 - self.playlist.lastfm_stat_album_percent)], data: [Double(self.playlist.lastfm_stat_album_percent), Double(100 - self.playlist.lastfm_stat_album_percent)],
title: "Albums", title: "Albums",
legend:"Listening", legend:"Listening",
style: chartStyle, style: chartStyle,
form: chartSize) 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() Spacer()
} }
PieChartView( .padding([.vertical], 20)
data: [Double(self.playlist.lastfm_stat_artist_percent), Double(100 - self.playlist.lastfm_stat_artist_percent)], .padding([.horizontal], 10)
title: "Artists",
legend:"Listening",
style: chartStyle,
form: chartSize)
} }
Section(header: Text("Options")){ Section(header: Text("Options")){
@ -264,7 +268,13 @@ struct PlaylistView: View {
struct PlaylistView_Previews: PreviewProvider { struct PlaylistView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
PlaylistView(playlist: .constant( 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
)
)) ))
} }
} }

6
Music Tools/Views/Settings/SettingsList.swift
View File

@ -1,6 +1,6 @@
// //
// SettingsList.swift // SettingsList.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 20/02/2020. // Created by Andy Pack on 20/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.
@ -53,14 +53,14 @@ struct SettingsList: View {
} }
) { ) {
Button(action: { 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) UIApplication.shared.open(url)
} }
}) { }) {
Text("Server Source") Text("Server Source")
} }
Button(action: { 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) UIApplication.shared.open(url)
} }
}) { }) {

2
Music Tools/Views/Tag/AddTagSheet.swift
View File

@ -1,6 +1,6 @@
// //
// AddTagSheet.swift // AddTagSheet.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 02/03/2020. // Created by Andy Pack on 02/03/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Views/Tag/TagList.swift
View File

@ -1,6 +1,6 @@
// //
// TagList.swift // TagList.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 25/04/2020. // Created by Andy Pack on 25/04/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Views/Tag/TagObjList.swift
View File

@ -1,6 +1,6 @@
// //
// TagObjList.swift // TagObjList.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 20/02/2020. // Created by Andy Pack on 20/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Views/Tag/TagRow.swift
View File

@ -1,6 +1,6 @@
// //
// TagRow.swift // TagRow.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 20/02/2020. // Created by Andy Pack on 20/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

2
Music Tools/Views/Tag/TagView.swift
View File

@ -1,6 +1,6 @@
// //
// TagView.swift // TagView.swift
// Music Tools // Mixonomer
// //
// Created by Andy Pack on 20/02/2020. // Created by Andy Pack on 20/02/2020.
// Copyright © 2020 Sarsoo. All rights reserved. // Copyright © 2020 Sarsoo. All rights reserved.

4
README.md
View File

@ -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. Using SwiftUI for the main app UI. Hanging SwiftUI on a hosting controller for log in/register.