Browse Source

TabBar: Adapt icons according to new design

Soomin Lee 6 years ago
parent
commit
54339a74e1
30 changed files with 55 additions and 26 deletions
  1. 2 2
      Sources/LocalNetworkConnectivity/VLCServerListViewController.m
  2. 2 2
      Sources/MediaViewControllers/AudioViewController.swift
  3. 2 2
      Sources/MediaViewControllers/PlaylistViewController.swift
  4. 2 2
      Sources/MediaViewControllers/VideoViewController.swift
  5. BIN
      vlc-ios/Images.xcassets/menu/MusicAlbums.imageset/MusicAlbums.png
  6. BIN
      vlc-ios/Images.xcassets/menu/MusicAlbums.imageset/MusicAlbums@2x.png
  7. BIN
      vlc-ios/Images.xcassets/menu/MusicAlbums.imageset/MusicAlbums@3x.png
  8. BIN
      vlc-ios/Images.xcassets/menu/Settings.imageset/Settings.png
  9. BIN
      vlc-ios/Images.xcassets/menu/Settings.imageset/Settings@2x.png
  10. BIN
      vlc-ios/Images.xcassets/menu/Settings.imageset/Settings@3x.png
  11. BIN
      vlc-ios/Images.xcassets/menu/TVShowsIcon.imageset/TVShowsIcon.png
  12. BIN
      vlc-ios/Images.xcassets/menu/TVShowsIcon.imageset/TVShowsIcon@2x.png
  13. BIN
      vlc-ios/Images.xcassets/menu/TVShowsIcon.imageset/TVShowsIcon@3x.png
  14. 6 6
      vlc-ios/Images.xcassets/menu/TVShowsIcon.imageset/Contents.json
  15. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Audio.imageset/audio@1x.png
  16. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Audio.imageset/audio@2x.png
  17. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Audio.imageset/audio@3x.png
  18. 6 0
      vlc-ios/Images.xcassets/menu/Tab bar/Contents.json
  19. 6 6
      vlc-ios/Images.xcassets/menu/Settings.imageset/Contents.json
  20. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Network.imageset/network@1x.png
  21. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Network.imageset/network@2x.png
  22. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Network.imageset/network@3x.png
  23. 23 0
      vlc-ios/Images.xcassets/menu/Tab bar/Settings.imageset/Contents.json
  24. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Settings.imageset/settings@1x.png
  25. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Settings.imageset/settings@2x.png
  26. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Settings.imageset/settings@3x.png
  27. 6 6
      vlc-ios/Images.xcassets/menu/MusicAlbums.imageset/Contents.json
  28. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Video.imageset/video@1x.png
  29. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Video.imageset/video@2x.png
  30. BIN
      vlc-ios/Images.xcassets/menu/Tab bar/Video.imageset/video@3x.png

+ 2 - 2
Sources/LocalNetworkConnectivity/VLCServerListViewController.m

@@ -150,8 +150,8 @@
 {
     self.title = NSLocalizedString(@"LOCAL_NETWORK", nil);
     self.tabBarItem = [[UITabBarItem alloc] initWithTitle: NSLocalizedString(@"LOCAL_NETWORK", nil)
-                                                    image: [UIImage imageNamed:@"Local"]
-                                            selectedImage: [UIImage imageNamed:@"Local"]];
+                                                    image: [UIImage imageNamed:@"Network"]
+                                            selectedImage: [UIImage imageNamed:@"Network"]];
     self.tabBarItem.accessibilityIdentifier = VLCAccessibilityIdentifier.localNetwork;
 }
 

+ 2 - 2
Sources/MediaViewControllers/AudioViewController.swift

@@ -20,8 +20,8 @@ class VLCAudioViewController: VLCMediaViewController {
         title = NSLocalizedString("AUDIO", comment: "")
         tabBarItem = UITabBarItem(
             title: NSLocalizedString("AUDIO", comment: ""),
-            image: UIImage(named: "MusicAlbums"),
-            selectedImage: UIImage(named: "MusicAlbums"))
+            image: UIImage(named: "Audio"),
+            selectedImage: UIImage(named: "Audio"))
         tabBarItem.accessibilityIdentifier = VLCAccessibilityIdentifier.audio
     }
 

+ 2 - 2
Sources/MediaViewControllers/PlaylistViewController.swift

@@ -20,8 +20,8 @@ class VLCPlaylistViewController: VLCMediaViewController {
         title = NSLocalizedString("PLAYLISTS", comment: "")
         tabBarItem = UITabBarItem(
             title: NSLocalizedString("PLAYLISTS", comment: ""),
-            image: UIImage(named: "TVShowsIcon"),
-            selectedImage: UIImage(named: "TVShowsIcon"))
+            image: UIImage(named: "tableViewIcon"),
+            selectedImage: UIImage(named: "tableViewIcon"))
         tabBarItem.accessibilityIdentifier = VLCAccessibilityIdentifier.playlist
     }
 

+ 2 - 2
Sources/MediaViewControllers/VideoViewController.swift

@@ -20,8 +20,8 @@ class VLCVideoViewController: VLCMediaViewController {
         title = NSLocalizedString("VIDEO", comment: "")
         tabBarItem = UITabBarItem(
             title: NSLocalizedString("VIDEO", comment: ""),
-            image: UIImage(named: "TVShowsIcon"),
-            selectedImage: UIImage(named: "TVShowsIcon"))
+            image: UIImage(named: "Video"),
+            selectedImage: UIImage(named: "Video"))
         tabBarItem.accessibilityIdentifier = VLCAccessibilityIdentifier.video
     }
 

BIN
vlc-ios/Images.xcassets/menu/MusicAlbums.imageset/MusicAlbums.png


BIN
vlc-ios/Images.xcassets/menu/MusicAlbums.imageset/MusicAlbums@2x.png


BIN
vlc-ios/Images.xcassets/menu/MusicAlbums.imageset/MusicAlbums@3x.png


BIN
vlc-ios/Images.xcassets/menu/Settings.imageset/Settings.png


BIN
vlc-ios/Images.xcassets/menu/Settings.imageset/Settings@2x.png


BIN
vlc-ios/Images.xcassets/menu/Settings.imageset/Settings@3x.png


BIN
vlc-ios/Images.xcassets/menu/TVShowsIcon.imageset/TVShowsIcon.png


BIN
vlc-ios/Images.xcassets/menu/TVShowsIcon.imageset/TVShowsIcon@2x.png


BIN
vlc-ios/Images.xcassets/menu/TVShowsIcon.imageset/TVShowsIcon@3x.png


+ 6 - 6
vlc-ios/Images.xcassets/menu/TVShowsIcon.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "TVShowsIcon.png"
+      "filename" : "audio@1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "TVShowsIcon@2x.png"
+      "filename" : "audio@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "TVShowsIcon@3x.png"
+      "filename" : "audio@3x.png",
+      "scale" : "3x"
     }
   ],
   "info" : {

BIN
vlc-ios/Images.xcassets/menu/Tab bar/Audio.imageset/audio@1x.png


BIN
vlc-ios/Images.xcassets/menu/Tab bar/Audio.imageset/audio@2x.png


BIN
vlc-ios/Images.xcassets/menu/Tab bar/Audio.imageset/audio@3x.png


+ 6 - 0
vlc-ios/Images.xcassets/menu/Tab bar/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

+ 6 - 6
vlc-ios/Images.xcassets/menu/Settings.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "Settings.png"
+      "filename" : "network@1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "Settings@2x.png"
+      "filename" : "network@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "Settings@3x.png"
+      "filename" : "network@3x.png",
+      "scale" : "3x"
     }
   ],
   "info" : {

BIN
vlc-ios/Images.xcassets/menu/Tab bar/Network.imageset/network@1x.png


BIN
vlc-ios/Images.xcassets/menu/Tab bar/Network.imageset/network@2x.png


BIN
vlc-ios/Images.xcassets/menu/Tab bar/Network.imageset/network@3x.png


+ 23 - 0
vlc-ios/Images.xcassets/menu/Tab bar/Settings.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "settings@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "settings@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "settings@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
vlc-ios/Images.xcassets/menu/Tab bar/Settings.imageset/settings@1x.png


BIN
vlc-ios/Images.xcassets/menu/Tab bar/Settings.imageset/settings@2x.png


BIN
vlc-ios/Images.xcassets/menu/Tab bar/Settings.imageset/settings@3x.png


+ 6 - 6
vlc-ios/Images.xcassets/menu/MusicAlbums.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "MusicAlbums.png"
+      "filename" : "video@1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "MusicAlbums@2x.png"
+      "filename" : "video@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "MusicAlbums@3x.png"
+      "filename" : "video@3x.png",
+      "scale" : "3x"
     }
   ],
   "info" : {

BIN
vlc-ios/Images.xcassets/menu/Tab bar/Video.imageset/video@1x.png


BIN
vlc-ios/Images.xcassets/menu/Tab bar/Video.imageset/video@2x.png


BIN
vlc-ios/Images.xcassets/menu/Tab bar/Video.imageset/video@3x.png