diff --git a/Limelight/Images.xcassets/AButton.imageset/Contents.json b/Limelight/Images.xcassets/AButton.imageset/Contents.json index 429e86f..a899ed2 100644 --- a/Limelight/Images.xcassets/AButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/AButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "a_button.png" + "filename" : "a_button_40x40@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "a_button-1.png" + "filename" : "a_button_80x80@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "a_button-2.png" + "filename" : "a_button_120x120@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/AButton.imageset/a_button-2.png b/Limelight/Images.xcassets/AButton.imageset/a_button-2.png deleted file mode 100644 index a1b6d68..0000000 Binary files a/Limelight/Images.xcassets/AButton.imageset/a_button-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/AButton.imageset/a_button.png b/Limelight/Images.xcassets/AButton.imageset/a_button.png deleted file mode 100644 index a1b6d68..0000000 Binary files a/Limelight/Images.xcassets/AButton.imageset/a_button.png and /dev/null differ diff --git a/Limelight/Images.xcassets/AButton.imageset/a_button_120x120@3x.png b/Limelight/Images.xcassets/AButton.imageset/a_button_120x120@3x.png new file mode 100644 index 0000000..8e2b6c2 Binary files /dev/null and b/Limelight/Images.xcassets/AButton.imageset/a_button_120x120@3x.png differ diff --git a/Limelight/Images.xcassets/AButton.imageset/a_button_40x40@1x.png b/Limelight/Images.xcassets/AButton.imageset/a_button_40x40@1x.png new file mode 100644 index 0000000..d76d68b Binary files /dev/null and b/Limelight/Images.xcassets/AButton.imageset/a_button_40x40@1x.png differ diff --git a/Limelight/Images.xcassets/AButton.imageset/a_button-1.png b/Limelight/Images.xcassets/AButton.imageset/a_button_80x80@2x.png similarity index 100% rename from Limelight/Images.xcassets/AButton.imageset/a_button-1.png rename to Limelight/Images.xcassets/AButton.imageset/a_button_80x80@2x.png diff --git a/Limelight/Images.xcassets/BButton.imageset/Contents.json b/Limelight/Images.xcassets/BButton.imageset/Contents.json index 8c941fa..e448a93 100644 --- a/Limelight/Images.xcassets/BButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/BButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "b_button.png" + "filename" : "b_button_40x40@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "b_button-1.png" + "filename" : "b_button_80x80@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "b_button-2.png" + "filename" : "b_button_120x120@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/BButton.imageset/b_button-2.png b/Limelight/Images.xcassets/BButton.imageset/b_button-2.png deleted file mode 100644 index 18649f4..0000000 Binary files a/Limelight/Images.xcassets/BButton.imageset/b_button-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/BButton.imageset/b_button.png b/Limelight/Images.xcassets/BButton.imageset/b_button.png deleted file mode 100644 index 18649f4..0000000 Binary files a/Limelight/Images.xcassets/BButton.imageset/b_button.png and /dev/null differ diff --git a/Limelight/Images.xcassets/BButton.imageset/b_button_120x120@3x.png b/Limelight/Images.xcassets/BButton.imageset/b_button_120x120@3x.png new file mode 100644 index 0000000..04089f3 Binary files /dev/null and b/Limelight/Images.xcassets/BButton.imageset/b_button_120x120@3x.png differ diff --git a/Limelight/Images.xcassets/BButton.imageset/b_button_40x40@1x.png b/Limelight/Images.xcassets/BButton.imageset/b_button_40x40@1x.png new file mode 100644 index 0000000..93760fd Binary files /dev/null and b/Limelight/Images.xcassets/BButton.imageset/b_button_40x40@1x.png differ diff --git a/Limelight/Images.xcassets/BButton.imageset/b_button-1.png b/Limelight/Images.xcassets/BButton.imageset/b_button_80x80@2x.png similarity index 100% rename from Limelight/Images.xcassets/BButton.imageset/b_button-1.png rename to Limelight/Images.xcassets/BButton.imageset/b_button_80x80@2x.png diff --git a/Limelight/Images.xcassets/DownButton.imageset/Contents.json b/Limelight/Images.xcassets/DownButton.imageset/Contents.json index e57d1fe..bd51f19 100644 --- a/Limelight/Images.xcassets/DownButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/DownButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "down.png" + "filename" : "down_31x38@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "down-1.png" + "filename" : "down_61x75@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "down-2.png" + "filename" : "down_93x114@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/DownButton.imageset/down-2.png b/Limelight/Images.xcassets/DownButton.imageset/down-2.png deleted file mode 100644 index 0557cee..0000000 Binary files a/Limelight/Images.xcassets/DownButton.imageset/down-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/DownButton.imageset/down.png b/Limelight/Images.xcassets/DownButton.imageset/down.png deleted file mode 100644 index 0557cee..0000000 Binary files a/Limelight/Images.xcassets/DownButton.imageset/down.png and /dev/null differ diff --git a/Limelight/Images.xcassets/DownButton.imageset/down_31x38@1x.png b/Limelight/Images.xcassets/DownButton.imageset/down_31x38@1x.png new file mode 100644 index 0000000..bf7a7d8 Binary files /dev/null and b/Limelight/Images.xcassets/DownButton.imageset/down_31x38@1x.png differ diff --git a/Limelight/Images.xcassets/DownButton.imageset/down-1.png b/Limelight/Images.xcassets/DownButton.imageset/down_61x75@2x.png similarity index 100% rename from Limelight/Images.xcassets/DownButton.imageset/down-1.png rename to Limelight/Images.xcassets/DownButton.imageset/down_61x75@2x.png diff --git a/Limelight/Images.xcassets/DownButton.imageset/down_93x114@3x.png b/Limelight/Images.xcassets/DownButton.imageset/down_93x114@3x.png new file mode 100644 index 0000000..8c193d5 Binary files /dev/null and b/Limelight/Images.xcassets/DownButton.imageset/down_93x114@3x.png differ diff --git a/Limelight/Images.xcassets/L1.imageset/Contents.json b/Limelight/Images.xcassets/L1.imageset/Contents.json index a22f6eb..a2d194d 100644 --- a/Limelight/Images.xcassets/L1.imageset/Contents.json +++ b/Limelight/Images.xcassets/L1.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "L1-1.png" + "filename" : "L1_40x40@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "L1.png" + "filename" : "L1_80x80@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "L1-2.png" + "filename" : "L1_120x120@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/L1.imageset/L1-1.png b/Limelight/Images.xcassets/L1.imageset/L1-1.png deleted file mode 100644 index c85fcc0..0000000 Binary files a/Limelight/Images.xcassets/L1.imageset/L1-1.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L1.imageset/L1-2.png b/Limelight/Images.xcassets/L1.imageset/L1-2.png deleted file mode 100644 index c85fcc0..0000000 Binary files a/Limelight/Images.xcassets/L1.imageset/L1-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L1.imageset/L1.png b/Limelight/Images.xcassets/L1.imageset/L1.png deleted file mode 100644 index c85fcc0..0000000 Binary files a/Limelight/Images.xcassets/L1.imageset/L1.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L1.imageset/L1_120x120@3x.png b/Limelight/Images.xcassets/L1.imageset/L1_120x120@3x.png new file mode 100644 index 0000000..c676d21 Binary files /dev/null and b/Limelight/Images.xcassets/L1.imageset/L1_120x120@3x.png differ diff --git a/Limelight/Images.xcassets/L1.imageset/L1_40x40@1x.png b/Limelight/Images.xcassets/L1.imageset/L1_40x40@1x.png new file mode 100644 index 0000000..7c69c08 Binary files /dev/null and b/Limelight/Images.xcassets/L1.imageset/L1_40x40@1x.png differ diff --git a/Limelight/Images.xcassets/L1.imageset/L1_80x80@2x.png b/Limelight/Images.xcassets/L1.imageset/L1_80x80@2x.png new file mode 100644 index 0000000..c3f7110 Binary files /dev/null and b/Limelight/Images.xcassets/L1.imageset/L1_80x80@2x.png differ diff --git a/Limelight/Images.xcassets/L2.imageset/Contents.json b/Limelight/Images.xcassets/L2.imageset/Contents.json index bad00e0..b2bba89 100644 --- a/Limelight/Images.xcassets/L2.imageset/Contents.json +++ b/Limelight/Images.xcassets/L2.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "L2.png" + "filename" : "L2_60x60@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "L2-1.png" + "filename" : "L2_120x120@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "L2-2.png" + "filename" : "L2_180x180@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/L2.imageset/L2-1.png b/Limelight/Images.xcassets/L2.imageset/L2-1.png deleted file mode 100644 index 687e468..0000000 Binary files a/Limelight/Images.xcassets/L2.imageset/L2-1.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L2.imageset/L2-2.png b/Limelight/Images.xcassets/L2.imageset/L2-2.png deleted file mode 100644 index 687e468..0000000 Binary files a/Limelight/Images.xcassets/L2.imageset/L2-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L2.imageset/L2.png b/Limelight/Images.xcassets/L2.imageset/L2.png deleted file mode 100644 index 687e468..0000000 Binary files a/Limelight/Images.xcassets/L2.imageset/L2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L2.imageset/L2_120x120@2x.png b/Limelight/Images.xcassets/L2.imageset/L2_120x120@2x.png new file mode 100644 index 0000000..ad72d5b Binary files /dev/null and b/Limelight/Images.xcassets/L2.imageset/L2_120x120@2x.png differ diff --git a/Limelight/Images.xcassets/L2.imageset/L2_180x180@3x.png b/Limelight/Images.xcassets/L2.imageset/L2_180x180@3x.png new file mode 100644 index 0000000..456589c Binary files /dev/null and b/Limelight/Images.xcassets/L2.imageset/L2_180x180@3x.png differ diff --git a/Limelight/Images.xcassets/L2.imageset/L2_60x60@1x.png b/Limelight/Images.xcassets/L2.imageset/L2_60x60@1x.png new file mode 100644 index 0000000..fefe8f6 Binary files /dev/null and b/Limelight/Images.xcassets/L2.imageset/L2_60x60@1x.png differ diff --git a/Limelight/Images.xcassets/L3.imageset/Contents.json b/Limelight/Images.xcassets/L3.imageset/Contents.json index 126944e..5c09745 100644 --- a/Limelight/Images.xcassets/L3.imageset/Contents.json +++ b/Limelight/Images.xcassets/L3.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "L3.png" + "filename" : "L3_80x80@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "L3-1.png" + "filename" : "L3_160x160@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "L3-2.png" + "filename" : "L3_240x240@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/L3.imageset/L3-1.png b/Limelight/Images.xcassets/L3.imageset/L3-1.png deleted file mode 100644 index ae4bfdf..0000000 Binary files a/Limelight/Images.xcassets/L3.imageset/L3-1.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L3.imageset/L3-2.png b/Limelight/Images.xcassets/L3.imageset/L3-2.png deleted file mode 100644 index ae4bfdf..0000000 Binary files a/Limelight/Images.xcassets/L3.imageset/L3-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L3.imageset/L3.png b/Limelight/Images.xcassets/L3.imageset/L3.png deleted file mode 100644 index ae4bfdf..0000000 Binary files a/Limelight/Images.xcassets/L3.imageset/L3.png and /dev/null differ diff --git a/Limelight/Images.xcassets/L3.imageset/L3_160x160@2x.png b/Limelight/Images.xcassets/L3.imageset/L3_160x160@2x.png new file mode 100644 index 0000000..98e4d95 Binary files /dev/null and b/Limelight/Images.xcassets/L3.imageset/L3_160x160@2x.png differ diff --git a/Limelight/Images.xcassets/L3.imageset/L3_240x240@3x.png b/Limelight/Images.xcassets/L3.imageset/L3_240x240@3x.png new file mode 100644 index 0000000..d8f2b10 Binary files /dev/null and b/Limelight/Images.xcassets/L3.imageset/L3_240x240@3x.png differ diff --git a/Limelight/Images.xcassets/L3.imageset/L3_80x80@1x.png b/Limelight/Images.xcassets/L3.imageset/L3_80x80@1x.png new file mode 100644 index 0000000..a156678 Binary files /dev/null and b/Limelight/Images.xcassets/L3.imageset/L3_80x80@1x.png differ diff --git a/Limelight/Images.xcassets/LaunchImage.launchimage/Contents.json b/Limelight/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index 6da7c45..0000000 --- a/Limelight/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Limelight/Images.xcassets/LeftButton.imageset/Contents.json b/Limelight/Images.xcassets/LeftButton.imageset/Contents.json index b5b34f5..645b92b 100644 --- a/Limelight/Images.xcassets/LeftButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/LeftButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "left.png" + "filename" : "left_38x31@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "left-1.png" + "filename" : "left_76x61@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "left-2.png" + "filename" : "left_114x92@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/LeftButton.imageset/left-2.png b/Limelight/Images.xcassets/LeftButton.imageset/left-2.png deleted file mode 100644 index 3ab4150..0000000 Binary files a/Limelight/Images.xcassets/LeftButton.imageset/left-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/LeftButton.imageset/left.png b/Limelight/Images.xcassets/LeftButton.imageset/left.png deleted file mode 100644 index 3ab4150..0000000 Binary files a/Limelight/Images.xcassets/LeftButton.imageset/left.png and /dev/null differ diff --git a/Limelight/Images.xcassets/LeftButton.imageset/left_114x92@3x.png b/Limelight/Images.xcassets/LeftButton.imageset/left_114x92@3x.png new file mode 100644 index 0000000..adfed54 Binary files /dev/null and b/Limelight/Images.xcassets/LeftButton.imageset/left_114x92@3x.png differ diff --git a/Limelight/Images.xcassets/LeftButton.imageset/left_38x31@1x.png b/Limelight/Images.xcassets/LeftButton.imageset/left_38x31@1x.png new file mode 100644 index 0000000..ad7079b Binary files /dev/null and b/Limelight/Images.xcassets/LeftButton.imageset/left_38x31@1x.png differ diff --git a/Limelight/Images.xcassets/LeftButton.imageset/left-1.png b/Limelight/Images.xcassets/LeftButton.imageset/left_76x61@2x.png similarity index 100% rename from Limelight/Images.xcassets/LeftButton.imageset/left-1.png rename to Limelight/Images.xcassets/LeftButton.imageset/left_76x61@2x.png diff --git a/Limelight/Images.xcassets/R1.imageset/Contents.json b/Limelight/Images.xcassets/R1.imageset/Contents.json index 0d0657b..3b0bce9 100644 --- a/Limelight/Images.xcassets/R1.imageset/Contents.json +++ b/Limelight/Images.xcassets/R1.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "R1.png" + "filename" : "R1_40x40@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "R1-1.png" + "filename" : "R1_80x80@1x-1.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "R1-2.png" + "filename" : "R1_120x120@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/R1.imageset/R1-1.png b/Limelight/Images.xcassets/R1.imageset/R1-1.png deleted file mode 100644 index 3c1479d..0000000 Binary files a/Limelight/Images.xcassets/R1.imageset/R1-1.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R1.imageset/R1-2.png b/Limelight/Images.xcassets/R1.imageset/R1-2.png deleted file mode 100644 index 3c1479d..0000000 Binary files a/Limelight/Images.xcassets/R1.imageset/R1-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R1.imageset/R1.png b/Limelight/Images.xcassets/R1.imageset/R1.png deleted file mode 100644 index 3c1479d..0000000 Binary files a/Limelight/Images.xcassets/R1.imageset/R1.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R1.imageset/R1_120x120@3x.png b/Limelight/Images.xcassets/R1.imageset/R1_120x120@3x.png new file mode 100644 index 0000000..537a243 Binary files /dev/null and b/Limelight/Images.xcassets/R1.imageset/R1_120x120@3x.png differ diff --git a/Limelight/Images.xcassets/R1.imageset/R1_40x40@1x.png b/Limelight/Images.xcassets/R1.imageset/R1_40x40@1x.png new file mode 100644 index 0000000..51abcd6 Binary files /dev/null and b/Limelight/Images.xcassets/R1.imageset/R1_40x40@1x.png differ diff --git a/Limelight/Images.xcassets/R1.imageset/R1_80x80@1x-1.png b/Limelight/Images.xcassets/R1.imageset/R1_80x80@1x-1.png new file mode 100644 index 0000000..c7a1da2 Binary files /dev/null and b/Limelight/Images.xcassets/R1.imageset/R1_80x80@1x-1.png differ diff --git a/Limelight/Images.xcassets/R2.imageset/Contents.json b/Limelight/Images.xcassets/R2.imageset/Contents.json index fac4fd2..bbaf1d6 100644 --- a/Limelight/Images.xcassets/R2.imageset/Contents.json +++ b/Limelight/Images.xcassets/R2.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "R2-1.png" + "filename" : "R2_60x60@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "R2.png" + "filename" : "R2_120x120@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "R2-2.png" + "filename" : "R2_120x120@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/R2.imageset/R2-1.png b/Limelight/Images.xcassets/R2.imageset/R2-1.png deleted file mode 100644 index a522377..0000000 Binary files a/Limelight/Images.xcassets/R2.imageset/R2-1.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R2.imageset/R2-2.png b/Limelight/Images.xcassets/R2.imageset/R2-2.png deleted file mode 100644 index a522377..0000000 Binary files a/Limelight/Images.xcassets/R2.imageset/R2-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R2.imageset/R2.png b/Limelight/Images.xcassets/R2.imageset/R2.png deleted file mode 100644 index a522377..0000000 Binary files a/Limelight/Images.xcassets/R2.imageset/R2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R2.imageset/R2_120x120@2x.png b/Limelight/Images.xcassets/R2.imageset/R2_120x120@2x.png new file mode 100644 index 0000000..fa7adb4 Binary files /dev/null and b/Limelight/Images.xcassets/R2.imageset/R2_120x120@2x.png differ diff --git a/Limelight/Images.xcassets/R2.imageset/R2_120x120@3x.png b/Limelight/Images.xcassets/R2.imageset/R2_120x120@3x.png new file mode 100644 index 0000000..51a40e5 Binary files /dev/null and b/Limelight/Images.xcassets/R2.imageset/R2_120x120@3x.png differ diff --git a/Limelight/Images.xcassets/R2.imageset/R2_60x60@1x.png b/Limelight/Images.xcassets/R2.imageset/R2_60x60@1x.png new file mode 100644 index 0000000..6f6ad1f Binary files /dev/null and b/Limelight/Images.xcassets/R2.imageset/R2_60x60@1x.png differ diff --git a/Limelight/Images.xcassets/R3.imageset/Contents.json b/Limelight/Images.xcassets/R3.imageset/Contents.json index 0c57767..de75fdf 100644 --- a/Limelight/Images.xcassets/R3.imageset/Contents.json +++ b/Limelight/Images.xcassets/R3.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "R3.png" + "filename" : "R3_80x80@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "R3-1.png" + "filename" : "R3_160x160@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "R3-2.png" + "filename" : "R3_240x240@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/R3.imageset/R3-1.png b/Limelight/Images.xcassets/R3.imageset/R3-1.png deleted file mode 100644 index c956686..0000000 Binary files a/Limelight/Images.xcassets/R3.imageset/R3-1.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R3.imageset/R3-2.png b/Limelight/Images.xcassets/R3.imageset/R3-2.png deleted file mode 100644 index c956686..0000000 Binary files a/Limelight/Images.xcassets/R3.imageset/R3-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R3.imageset/R3.png b/Limelight/Images.xcassets/R3.imageset/R3.png deleted file mode 100644 index c956686..0000000 Binary files a/Limelight/Images.xcassets/R3.imageset/R3.png and /dev/null differ diff --git a/Limelight/Images.xcassets/R3.imageset/R3_160x160@2x.png b/Limelight/Images.xcassets/R3.imageset/R3_160x160@2x.png new file mode 100644 index 0000000..f7791e6 Binary files /dev/null and b/Limelight/Images.xcassets/R3.imageset/R3_160x160@2x.png differ diff --git a/Limelight/Images.xcassets/R3.imageset/R3_240x240@3x.png b/Limelight/Images.xcassets/R3.imageset/R3_240x240@3x.png new file mode 100644 index 0000000..cd2f172 Binary files /dev/null and b/Limelight/Images.xcassets/R3.imageset/R3_240x240@3x.png differ diff --git a/Limelight/Images.xcassets/R3.imageset/R3_80x80@1x.png b/Limelight/Images.xcassets/R3.imageset/R3_80x80@1x.png new file mode 100644 index 0000000..319dacd Binary files /dev/null and b/Limelight/Images.xcassets/R3.imageset/R3_80x80@1x.png differ diff --git a/Limelight/Images.xcassets/RightButton.imageset/Contents.json b/Limelight/Images.xcassets/RightButton.imageset/Contents.json index a11eef9..0b7b374 100644 --- a/Limelight/Images.xcassets/RightButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/RightButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "right.png" + "filename" : "right_38x31@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "right-1.png" + "filename" : "right_75x61@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "right-2.png" + "filename" : "right_114x93@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/RightButton.imageset/right-2.png b/Limelight/Images.xcassets/RightButton.imageset/right-2.png deleted file mode 100644 index c717a8d..0000000 Binary files a/Limelight/Images.xcassets/RightButton.imageset/right-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/RightButton.imageset/right.png b/Limelight/Images.xcassets/RightButton.imageset/right.png deleted file mode 100644 index c717a8d..0000000 Binary files a/Limelight/Images.xcassets/RightButton.imageset/right.png and /dev/null differ diff --git a/Limelight/Images.xcassets/RightButton.imageset/right_114x93@3x.png b/Limelight/Images.xcassets/RightButton.imageset/right_114x93@3x.png new file mode 100644 index 0000000..2db167f Binary files /dev/null and b/Limelight/Images.xcassets/RightButton.imageset/right_114x93@3x.png differ diff --git a/Limelight/Images.xcassets/RightButton.imageset/right_38x31@1x.png b/Limelight/Images.xcassets/RightButton.imageset/right_38x31@1x.png new file mode 100644 index 0000000..503babf Binary files /dev/null and b/Limelight/Images.xcassets/RightButton.imageset/right_38x31@1x.png differ diff --git a/Limelight/Images.xcassets/RightButton.imageset/right-1.png b/Limelight/Images.xcassets/RightButton.imageset/right_75x61@2x.png similarity index 100% rename from Limelight/Images.xcassets/RightButton.imageset/right-1.png rename to Limelight/Images.xcassets/RightButton.imageset/right_75x61@2x.png diff --git a/Limelight/Images.xcassets/SelectButton.imageset/Contents.json b/Limelight/Images.xcassets/SelectButton.imageset/Contents.json index c587132..f62ac9b 100644 --- a/Limelight/Images.xcassets/SelectButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/SelectButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "select_button-1.png" + "filename" : "select_button_54x24@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "select_button.png" + "filename" : "select_button_108x48@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "select_button-2.png" + "filename" : "select_button_162x72@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/SelectButton.imageset/select_button-2.png b/Limelight/Images.xcassets/SelectButton.imageset/select_button-2.png deleted file mode 100644 index 4969cdd..0000000 Binary files a/Limelight/Images.xcassets/SelectButton.imageset/select_button-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/SelectButton.imageset/select_button.png b/Limelight/Images.xcassets/SelectButton.imageset/select_button.png deleted file mode 100644 index 4969cdd..0000000 Binary files a/Limelight/Images.xcassets/SelectButton.imageset/select_button.png and /dev/null differ diff --git a/Limelight/Images.xcassets/SelectButton.imageset/select_button-1.png b/Limelight/Images.xcassets/SelectButton.imageset/select_button_108x48@2x.png similarity index 100% rename from Limelight/Images.xcassets/SelectButton.imageset/select_button-1.png rename to Limelight/Images.xcassets/SelectButton.imageset/select_button_108x48@2x.png diff --git a/Limelight/Images.xcassets/SelectButton.imageset/select_button_162x72@3x.png b/Limelight/Images.xcassets/SelectButton.imageset/select_button_162x72@3x.png new file mode 100644 index 0000000..27de27a Binary files /dev/null and b/Limelight/Images.xcassets/SelectButton.imageset/select_button_162x72@3x.png differ diff --git a/Limelight/Images.xcassets/SelectButton.imageset/select_button_54x24@1x.png b/Limelight/Images.xcassets/SelectButton.imageset/select_button_54x24@1x.png new file mode 100644 index 0000000..32b2e99 Binary files /dev/null and b/Limelight/Images.xcassets/SelectButton.imageset/select_button_54x24@1x.png differ diff --git a/Limelight/Images.xcassets/Settings.imageset/Contents.json b/Limelight/Images.xcassets/Settings.imageset/Contents.json deleted file mode 100644 index 3653346..0000000 --- a/Limelight/Images.xcassets/Settings.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "settings_1x.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "settings_2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "settings_3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Limelight/Images.xcassets/Settings.imageset/settings_1x.png b/Limelight/Images.xcassets/Settings.imageset/settings_1x.png deleted file mode 100644 index e738770..0000000 Binary files a/Limelight/Images.xcassets/Settings.imageset/settings_1x.png and /dev/null differ diff --git a/Limelight/Images.xcassets/Settings.imageset/settings_2x.png b/Limelight/Images.xcassets/Settings.imageset/settings_2x.png deleted file mode 100644 index bb5b00c..0000000 Binary files a/Limelight/Images.xcassets/Settings.imageset/settings_2x.png and /dev/null differ diff --git a/Limelight/Images.xcassets/Settings.imageset/settings_3x.png b/Limelight/Images.xcassets/Settings.imageset/settings_3x.png deleted file mode 100644 index 05d1454..0000000 Binary files a/Limelight/Images.xcassets/Settings.imageset/settings_3x.png and /dev/null differ diff --git a/Limelight/Images.xcassets/StartButton.imageset/Contents.json b/Limelight/Images.xcassets/StartButton.imageset/Contents.json index bdd774e..0902a5a 100644 --- a/Limelight/Images.xcassets/StartButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/StartButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "start_button-1.png" + "filename" : "start_button_54x24@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "start_button.png" + "filename" : "start_button_108x48@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "start_button-2.png" + "filename" : "start_button_162x72@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/StartButton.imageset/start_button-2.png b/Limelight/Images.xcassets/StartButton.imageset/start_button-2.png deleted file mode 100644 index c600404..0000000 Binary files a/Limelight/Images.xcassets/StartButton.imageset/start_button-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/StartButton.imageset/start_button.png b/Limelight/Images.xcassets/StartButton.imageset/start_button.png deleted file mode 100644 index c600404..0000000 Binary files a/Limelight/Images.xcassets/StartButton.imageset/start_button.png and /dev/null differ diff --git a/Limelight/Images.xcassets/StartButton.imageset/start_button-1.png b/Limelight/Images.xcassets/StartButton.imageset/start_button_108x48@2x.png similarity index 100% rename from Limelight/Images.xcassets/StartButton.imageset/start_button-1.png rename to Limelight/Images.xcassets/StartButton.imageset/start_button_108x48@2x.png diff --git a/Limelight/Images.xcassets/StartButton.imageset/start_button_162x72@3x.png b/Limelight/Images.xcassets/StartButton.imageset/start_button_162x72@3x.png new file mode 100644 index 0000000..f6bfa9c Binary files /dev/null and b/Limelight/Images.xcassets/StartButton.imageset/start_button_162x72@3x.png differ diff --git a/Limelight/Images.xcassets/StartButton.imageset/start_button_54x24@1x.png b/Limelight/Images.xcassets/StartButton.imageset/start_button_54x24@1x.png new file mode 100644 index 0000000..ff9b0be Binary files /dev/null and b/Limelight/Images.xcassets/StartButton.imageset/start_button_54x24@1x.png differ diff --git a/Limelight/Images.xcassets/StickInner.imageset/Contents.json b/Limelight/Images.xcassets/StickInner.imageset/Contents.json index a9f35e7..6b13eb0 100644 --- a/Limelight/Images.xcassets/StickInner.imageset/Contents.json +++ b/Limelight/Images.xcassets/StickInner.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "stick_inner-1.png" + "filename" : "stick_inner_48x49@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "stick_inner.png" + "filename" : "stick_inner_96x97@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "stick_inner-2.png" + "filename" : "stick_inner_144x146@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/StickInner.imageset/stick_inner-2.png b/Limelight/Images.xcassets/StickInner.imageset/stick_inner-2.png deleted file mode 100644 index c09763a..0000000 Binary files a/Limelight/Images.xcassets/StickInner.imageset/stick_inner-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/StickInner.imageset/stick_inner.png b/Limelight/Images.xcassets/StickInner.imageset/stick_inner.png deleted file mode 100644 index c09763a..0000000 Binary files a/Limelight/Images.xcassets/StickInner.imageset/stick_inner.png and /dev/null differ diff --git a/Limelight/Images.xcassets/StickInner.imageset/stick_inner_144x146@3x.png b/Limelight/Images.xcassets/StickInner.imageset/stick_inner_144x146@3x.png new file mode 100644 index 0000000..5471a5a Binary files /dev/null and b/Limelight/Images.xcassets/StickInner.imageset/stick_inner_144x146@3x.png differ diff --git a/Limelight/Images.xcassets/StickInner.imageset/stick_inner_48x49@1x.png b/Limelight/Images.xcassets/StickInner.imageset/stick_inner_48x49@1x.png new file mode 100644 index 0000000..779c6a2 Binary files /dev/null and b/Limelight/Images.xcassets/StickInner.imageset/stick_inner_48x49@1x.png differ diff --git a/Limelight/Images.xcassets/StickInner.imageset/stick_inner-1.png b/Limelight/Images.xcassets/StickInner.imageset/stick_inner_96x97@2x.png similarity index 100% rename from Limelight/Images.xcassets/StickInner.imageset/stick_inner-1.png rename to Limelight/Images.xcassets/StickInner.imageset/stick_inner_96x97@2x.png diff --git a/Limelight/Images.xcassets/StickOuter.imageset/Contents.json b/Limelight/Images.xcassets/StickOuter.imageset/Contents.json index d0f3212..4048b3f 100644 --- a/Limelight/Images.xcassets/StickOuter.imageset/Contents.json +++ b/Limelight/Images.xcassets/StickOuter.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "stick_outer-1.png" + "filename" : "stick_outer_80x80@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "stick_outer.png" + "filename" : "stick_outer_160x160@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "stick_outer-2.png" + "filename" : "stick_outer_240x240@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/StickOuter.imageset/stick_outer-2.png b/Limelight/Images.xcassets/StickOuter.imageset/stick_outer-2.png deleted file mode 100644 index 5748ede..0000000 Binary files a/Limelight/Images.xcassets/StickOuter.imageset/stick_outer-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/StickOuter.imageset/stick_outer.png b/Limelight/Images.xcassets/StickOuter.imageset/stick_outer.png deleted file mode 100644 index 5748ede..0000000 Binary files a/Limelight/Images.xcassets/StickOuter.imageset/stick_outer.png and /dev/null differ diff --git a/Limelight/Images.xcassets/StickOuter.imageset/stick_outer-1.png b/Limelight/Images.xcassets/StickOuter.imageset/stick_outer_160x160@2x.png similarity index 100% rename from Limelight/Images.xcassets/StickOuter.imageset/stick_outer-1.png rename to Limelight/Images.xcassets/StickOuter.imageset/stick_outer_160x160@2x.png diff --git a/Limelight/Images.xcassets/StickOuter.imageset/stick_outer_240x240@3x.png b/Limelight/Images.xcassets/StickOuter.imageset/stick_outer_240x240@3x.png new file mode 100644 index 0000000..f8d5d5f Binary files /dev/null and b/Limelight/Images.xcassets/StickOuter.imageset/stick_outer_240x240@3x.png differ diff --git a/Limelight/Images.xcassets/StickOuter.imageset/stick_outer_80x80@1x.png b/Limelight/Images.xcassets/StickOuter.imageset/stick_outer_80x80@1x.png new file mode 100644 index 0000000..40b55be Binary files /dev/null and b/Limelight/Images.xcassets/StickOuter.imageset/stick_outer_80x80@1x.png differ diff --git a/Limelight/Images.xcassets/UpButton.imageset/Contents.json b/Limelight/Images.xcassets/UpButton.imageset/Contents.json index 523b6d7..aab957c 100644 --- a/Limelight/Images.xcassets/UpButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/UpButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "up-1.png" + "filename" : "up_31x39@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "up.png" + "filename" : "up_61x76@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "up-2.png" + "filename" : "up_93x116@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/UpButton.imageset/up-2.png b/Limelight/Images.xcassets/UpButton.imageset/up-2.png deleted file mode 100644 index a2b194e..0000000 Binary files a/Limelight/Images.xcassets/UpButton.imageset/up-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/UpButton.imageset/up.png b/Limelight/Images.xcassets/UpButton.imageset/up.png deleted file mode 100644 index a2b194e..0000000 Binary files a/Limelight/Images.xcassets/UpButton.imageset/up.png and /dev/null differ diff --git a/Limelight/Images.xcassets/UpButton.imageset/up_31x39@1x.png b/Limelight/Images.xcassets/UpButton.imageset/up_31x39@1x.png new file mode 100644 index 0000000..00815ba Binary files /dev/null and b/Limelight/Images.xcassets/UpButton.imageset/up_31x39@1x.png differ diff --git a/Limelight/Images.xcassets/UpButton.imageset/up-1.png b/Limelight/Images.xcassets/UpButton.imageset/up_61x76@2x.png similarity index 100% rename from Limelight/Images.xcassets/UpButton.imageset/up-1.png rename to Limelight/Images.xcassets/UpButton.imageset/up_61x76@2x.png diff --git a/Limelight/Images.xcassets/UpButton.imageset/up_93x116@3x.png b/Limelight/Images.xcassets/UpButton.imageset/up_93x116@3x.png new file mode 100644 index 0000000..2549cff Binary files /dev/null and b/Limelight/Images.xcassets/UpButton.imageset/up_93x116@3x.png differ diff --git a/Limelight/Images.xcassets/XButton.imageset/Contents.json b/Limelight/Images.xcassets/XButton.imageset/Contents.json index 82e66ef..6f7026e 100644 --- a/Limelight/Images.xcassets/XButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/XButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "x_button-1.png" + "filename" : "x_button_40x40@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "x_button.png" + "filename" : "x_button_80x80@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "x_button-2.png" + "filename" : "x_button_120x120@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/XButton.imageset/x_button-2.png b/Limelight/Images.xcassets/XButton.imageset/x_button-2.png deleted file mode 100644 index 125ce38..0000000 Binary files a/Limelight/Images.xcassets/XButton.imageset/x_button-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/XButton.imageset/x_button.png b/Limelight/Images.xcassets/XButton.imageset/x_button.png deleted file mode 100644 index 125ce38..0000000 Binary files a/Limelight/Images.xcassets/XButton.imageset/x_button.png and /dev/null differ diff --git a/Limelight/Images.xcassets/XButton.imageset/x_button_120x120@3x.png b/Limelight/Images.xcassets/XButton.imageset/x_button_120x120@3x.png new file mode 100644 index 0000000..77a15a9 Binary files /dev/null and b/Limelight/Images.xcassets/XButton.imageset/x_button_120x120@3x.png differ diff --git a/Limelight/Images.xcassets/XButton.imageset/x_button_40x40@1x.png b/Limelight/Images.xcassets/XButton.imageset/x_button_40x40@1x.png new file mode 100644 index 0000000..e4623ac Binary files /dev/null and b/Limelight/Images.xcassets/XButton.imageset/x_button_40x40@1x.png differ diff --git a/Limelight/Images.xcassets/XButton.imageset/x_button-1.png b/Limelight/Images.xcassets/XButton.imageset/x_button_80x80@2x.png similarity index 100% rename from Limelight/Images.xcassets/XButton.imageset/x_button-1.png rename to Limelight/Images.xcassets/XButton.imageset/x_button_80x80@2x.png diff --git a/Limelight/Images.xcassets/YButton.imageset/Contents.json b/Limelight/Images.xcassets/YButton.imageset/Contents.json index 1aa5efb..66951dc 100644 --- a/Limelight/Images.xcassets/YButton.imageset/Contents.json +++ b/Limelight/Images.xcassets/YButton.imageset/Contents.json @@ -3,17 +3,17 @@ { "idiom" : "universal", "scale" : "1x", - "filename" : "y_button.png" + "filename" : "y_button_40x40@1x.png" }, { "idiom" : "universal", "scale" : "2x", - "filename" : "y_button-1.png" + "filename" : "y_button_80x80@2x.png" }, { "idiom" : "universal", "scale" : "3x", - "filename" : "y_button-2.png" + "filename" : "y_button_120x120@3x.png" } ], "info" : { diff --git a/Limelight/Images.xcassets/YButton.imageset/y_button-2.png b/Limelight/Images.xcassets/YButton.imageset/y_button-2.png deleted file mode 100644 index 626f224..0000000 Binary files a/Limelight/Images.xcassets/YButton.imageset/y_button-2.png and /dev/null differ diff --git a/Limelight/Images.xcassets/YButton.imageset/y_button.png b/Limelight/Images.xcassets/YButton.imageset/y_button.png deleted file mode 100644 index 626f224..0000000 Binary files a/Limelight/Images.xcassets/YButton.imageset/y_button.png and /dev/null differ diff --git a/Limelight/Images.xcassets/YButton.imageset/y_button_120x120@3x.png b/Limelight/Images.xcassets/YButton.imageset/y_button_120x120@3x.png new file mode 100644 index 0000000..6e64408 Binary files /dev/null and b/Limelight/Images.xcassets/YButton.imageset/y_button_120x120@3x.png differ diff --git a/Limelight/Images.xcassets/YButton.imageset/y_button_40x40@1x.png b/Limelight/Images.xcassets/YButton.imageset/y_button_40x40@1x.png new file mode 100644 index 0000000..bf50128 Binary files /dev/null and b/Limelight/Images.xcassets/YButton.imageset/y_button_40x40@1x.png differ diff --git a/Limelight/Images.xcassets/YButton.imageset/y_button-1.png b/Limelight/Images.xcassets/YButton.imageset/y_button_80x80@2x.png similarity index 100% rename from Limelight/Images.xcassets/YButton.imageset/y_button-1.png rename to Limelight/Images.xcassets/YButton.imageset/y_button_80x80@2x.png