Skip to content

Commit ad22296

Browse files
cryptexctlcryptexctl
committed
в1.3 - Минорненькое, добавил myschol fm
1 parent 3f9c00a commit ad22296

5 files changed

Lines changed: 44 additions & 28 deletions

File tree

‎EasyMusic.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/* End PBXFileReference section */
3131

3232
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
33-
F0CD7D9B2D059D7B0034CC02 /* Exceptions for "EasyMusic" folder in "EasyMusic" target */ = {
33+
F0D851512D064F7E001A76ED /* Exceptions for "EasyMusic" folder in "EasyMusic" target */ = {
3434
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
3535
membershipExceptions = (
3636
Info.plist,
@@ -43,20 +43,11 @@
4343
F0CD7D6D2D059CED0034CC02 /* EasyMusic */ = {
4444
isa = PBXFileSystemSynchronizedRootGroup;
4545
exceptions = (
46-
F0CD7D9B2D059D7B0034CC02 /* Exceptions for "EasyMusic" folder in "EasyMusic" target */,
46+
F0D851512D064F7E001A76ED /* Exceptions for "EasyMusic" folder in "EasyMusic" target */,
4747
);
48-
path = EasyMusic;
49-
sourceTree = "<group>";
50-
};
51-
F0CD7D7E2D059CEE0034CC02 /* EasyMusicTests */ = {
52-
isa = PBXFileSystemSynchronizedRootGroup;
53-
path = EasyMusicTests;
54-
sourceTree = "<group>";
55-
};
56-
F0CD7D882D059CEE0034CC02 /* EasyMusicUITests */ = {
57-
isa = PBXFileSystemSynchronizedRootGroup;
58-
path = EasyMusicUITests;
59-
sourceTree = "<group>";
48+
name = EasyMusic;
49+
path = /Users/arbung/iOS/calcul/platonfm/EasyMusic/EasyMusic;
50+
sourceTree = "<absolute>";
6051
};
6152
/* End PBXFileSystemSynchronizedRootGroup section */
6253

@@ -89,8 +80,6 @@
8980
isa = PBXGroup;
9081
children = (
9182
F0CD7D6D2D059CED0034CC02 /* EasyMusic */,
92-
F0CD7D7E2D059CEE0034CC02 /* EasyMusicTests */,
93-
F0CD7D882D059CEE0034CC02 /* EasyMusicUITests */,
9483
F0CD7D6C2D059CED0034CC02 /* Products */,
9584
);
9685
sourceTree = "<group>";
@@ -143,9 +132,6 @@
143132
dependencies = (
144133
F0CD7D7D2D059CEE0034CC02 /* PBXTargetDependency */,
145134
);
146-
fileSystemSynchronizedGroups = (
147-
F0CD7D7E2D059CEE0034CC02 /* EasyMusicTests */,
148-
);
149135
name = EasyMusicTests;
150136
packageProductDependencies = (
151137
);
@@ -166,9 +152,6 @@
166152
dependencies = (
167153
F0CD7D872D059CEE0034CC02 /* PBXTargetDependency */,
168154
);
169-
fileSystemSynchronizedGroups = (
170-
F0CD7D882D059CEE0034CC02 /* EasyMusicUITests */,
171-
);
172155
name = EasyMusicUITests;
173156
packageProductDependencies = (
174157
);
@@ -409,7 +392,7 @@
409392
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
410393
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
411394
CODE_SIGN_STYLE = Automatic;
412-
CURRENT_PROJECT_VERSION = 1;
395+
CURRENT_PROJECT_VERSION = 7;
413396
DEVELOPMENT_ASSET_PATHS = "\"EasyMusic/Preview Content\"";
414397
DEVELOPMENT_TEAM = 25G2F7AWV6;
415398
ENABLE_PREVIEWS = YES;
@@ -419,14 +402,15 @@
419402
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
420403
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
421404
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
405+
INFOPLIST_KEY_UIStatusBarHidden = NO;
422406
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
423407
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
424408
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
425409
LD_RUNPATH_SEARCH_PATHS = (
426410
"$(inherited)",
427411
"@executable_path/Frameworks",
428412
);
429-
MARKETING_VERSION = 1.2;
413+
MARKETING_VERSION = 1.3;
430414
PRODUCT_BUNDLE_IDENTIFIER = platon.EasyMusic;
431415
PRODUCT_NAME = "$(TARGET_NAME)";
432416
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -441,7 +425,7 @@
441425
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
442426
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
443427
CODE_SIGN_STYLE = Automatic;
444-
CURRENT_PROJECT_VERSION = 1;
428+
CURRENT_PROJECT_VERSION = 7;
445429
DEVELOPMENT_ASSET_PATHS = "\"EasyMusic/Preview Content\"";
446430
DEVELOPMENT_TEAM = 25G2F7AWV6;
447431
ENABLE_PREVIEWS = YES;
@@ -451,14 +435,15 @@
451435
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
452436
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
453437
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
438+
INFOPLIST_KEY_UIStatusBarHidden = NO;
454439
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
455440
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
456441
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
457442
LD_RUNPATH_SEARCH_PATHS = (
458443
"$(inherited)",
459444
"@executable_path/Frameworks",
460445
);
461-
MARKETING_VERSION = 1.2;
446+
MARKETING_VERSION = 1.3;
462447
PRODUCT_BUNDLE_IDENTIFIER = platon.EasyMusic;
463448
PRODUCT_NAME = "$(TARGET_NAME)";
464449
SWIFT_EMIT_LOC_STRINGS = YES;

‎EasyMusic.xcodeproj/project.xcworkspace/xcuserdata/arbung.xcuserdatad/UserInterfaceState.xcuserstate‎

46.8 KB
Binary file not shown.

‎EasyMusic/ContentView.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ struct ContentView: View {
3636
description: "Музыка всех жанров, характеров и исполнителей. Идеально подойдет для меломанов.",
3737
streamURL: "http://45.95.234.91:8000/music",
3838
color: LinearGradient(colors: [.yellow, .orange], startPoint: .top, endPoint: .bottom)
39+
),
40+
Station(
41+
name: "Memschol FM",
42+
description: "полная сборная солянка от красивых и уникальных жанров до рофл гей ремиксов и блатных треков, часто проводятся подкасты на разные темы в прямом эфире от простого общения до политики",
43+
streamURL: "https://stream.zeno.fm/hydtchh8maguv.m3u",
44+
color: LinearGradient(colors: [Color(red: 106/255, green: 13/255, blue: 173/255), Color.purple], startPoint: .top, endPoint: .bottom)
3945
)
4046
]
4147

‎EasyMusic/Info.plist‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@
44
<dict>
55
<key>NSAppTransportSecurity</key>
66
<dict>
7-
<key>NSAllowsArbitraryLoads</key>
8-
<true/>
7+
<key>NSExceptionDomains</key>
8+
<dict>
9+
<key>45.95.234.91</key>
10+
<dict>
11+
<key>NSExceptionAllowsInsecureHTTPLoads</key>
12+
<true/>
13+
<key>NSIncludesSubdomains</key>
14+
<true/>
15+
</dict>
16+
</dict>
917
</dict>
1018
<key>UIBackgroundModes</key>
1119
<array>

‎Info.plist‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSAppTransportSecurity</key>
6+
<dict>
7+
<key>NSAllowsArbitraryLoads</key>
8+
<true/>
9+
</dict>
10+
<key>UIBackgroundModes</key>
11+
<array>
12+
<string>audio</string>
13+
<string>fetch</string>
14+
<string>processing</string>
15+
</array>
16+
</dict>
17+
</plist>

0 commit comments

Comments
 (0)