diff --git a/Limelight.xcodeproj/project.pbxproj b/Limelight.xcodeproj/project.pbxproj index 820faf7..40a3fbf 100644 --- a/Limelight.xcodeproj/project.pbxproj +++ b/Limelight.xcodeproj/project.pbxproj @@ -8,6 +8,13 @@ /* Begin PBXBuildFile section */ 98A03B4D19F352EB00861ACA /* liblimelight-common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98A03B4A19F3514B00861ACA /* liblimelight-common.a */; }; + 9E5D600B1A5A5A3900689918 /* Apache License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FF81A5A5A3900689918 /* Apache License.txt */; }; + 9E5D600C1A5A5A3900689918 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */; }; + 9E5D600E1A5A5A3900689918 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */; }; + 9E5D60111A5A5A3900689918 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FFE1A5A5A3900689918 /* Roboto-Light.ttf */; }; + 9E5D60131A5A5A3900689918 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60001A5A5A3900689918 /* Roboto-Medium.ttf */; }; + 9E5D60151A5A5A3900689918 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60021A5A5A3900689918 /* Roboto-Regular.ttf */; }; + 9E5D60161A5A5A3900689918 /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60031A5A5A3900689918 /* Roboto-Thin.ttf */; }; FB290CF219B2C406004C83CF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF119B2C406004C83CF /* Foundation.framework */; }; FB290CF419B2C406004C83CF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF319B2C406004C83CF /* CoreGraphics.framework */; }; FB290CF619B2C406004C83CF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF519B2C406004C83CF /* UIKit.framework */; }; @@ -88,6 +95,13 @@ /* Begin PBXFileReference section */ 98A03B4519F3514B00861ACA /* limelight-common.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "limelight-common.xcodeproj"; path = "limelight-common-c/limelight-common.xcodeproj"; sourceTree = ""; }; + 9E5D5FF81A5A5A3900689918 /* Apache License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Apache License.txt"; sourceTree = ""; }; + 9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Black.ttf"; sourceTree = ""; }; + 9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Bold.ttf"; sourceTree = ""; }; + 9E5D5FFE1A5A5A3900689918 /* Roboto-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Light.ttf"; sourceTree = ""; }; + 9E5D60001A5A5A3900689918 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Medium.ttf"; sourceTree = ""; }; + 9E5D60021A5A5A3900689918 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Regular.ttf"; sourceTree = ""; }; + 9E5D60031A5A5A3900689918 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Thin.ttf"; sourceTree = ""; }; FB290CEE19B2C406004C83CF /* Limelight.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Limelight.app; sourceTree = BUILT_PRODUCTS_DIR; }; FB290CF119B2C406004C83CF /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; FB290CF319B2C406004C83CF /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -295,6 +309,28 @@ name = Products; sourceTree = ""; }; + 9E5D5FF61A5A5A3900689918 /* Font */ = { + isa = PBXGroup; + children = ( + 9E5D5FF71A5A5A3900689918 /* Roboto */, + ); + path = Font; + sourceTree = ""; + }; + 9E5D5FF71A5A5A3900689918 /* Roboto */ = { + isa = PBXGroup; + children = ( + 9E5D5FF81A5A5A3900689918 /* Apache License.txt */, + 9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */, + 9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */, + 9E5D5FFE1A5A5A3900689918 /* Roboto-Light.ttf */, + 9E5D60001A5A5A3900689918 /* Roboto-Medium.ttf */, + 9E5D60021A5A5A3900689918 /* Roboto-Regular.ttf */, + 9E5D60031A5A5A3900689918 /* Roboto-Thin.ttf */, + ); + path = Roboto; + sourceTree = ""; + }; FB290CE519B2C406004C83CF = { isa = PBXGroup; children = ( @@ -336,6 +372,7 @@ FB290CF919B2C406004C83CF /* Limelight */ = { isa = PBXGroup; children = ( + 9E5D5FF61A5A5A3900689918 /* Font */, FB89460419F646E200339C8A /* Crypto */, FB89460919F646E200339C8A /* Input */, FB89460E19F646E200339C8A /* Network */, @@ -744,10 +781,17 @@ buildActionMask = 2147483647; files = ( FB290E7919B37D81004C83CF /* iPad.storyboard in Resources */, + 9E5D60161A5A5A3900689918 /* Roboto-Thin.ttf in Resources */, + 9E5D60151A5A5A3900689918 /* Roboto-Regular.ttf in Resources */, + 9E5D600B1A5A5A3900689918 /* Apache License.txt in Resources */, + 9E5D60111A5A5A3900689918 /* Roboto-Light.ttf in Resources */, FB290CFE19B2C406004C83CF /* InfoPlist.strings in Resources */, FB290E7B19B38036004C83CF /* iPhone.storyboard in Resources */, + 9E5D600C1A5A5A3900689918 /* Roboto-Black.ttf in Resources */, + 9E5D600E1A5A5A3900689918 /* Roboto-Bold.ttf in Resources */, FB290D0919B2C406004C83CF /* Images.xcassets in Resources */, FB89463819F6473800339C8A /* Launch Screen.xib in Resources */, + 9E5D60131A5A5A3900689918 /* Roboto-Medium.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Limelight/AppDelegate.m b/Limelight/AppDelegate.m index 5a83773..4746248 100644 --- a/Limelight/AppDelegate.m +++ b/Limelight/AppDelegate.m @@ -18,6 +18,34 @@ static NSOperationQueue* mainQueue; - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + [[UILabel appearance] setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]]; + [[UIButton appearance].titleLabel setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]]; + + + // Generate selected segment background image + CGSize borderImageSize = CGSizeMake(1.f, 100.f); + + UIGraphicsBeginImageContext(borderImageSize); + CGContextRef context = UIGraphicsGetCurrentContext(); + + CGContextSetStrokeColorWithColor(context, [UIColor whiteColor].CGColor); + CGContextFillRect(context, CGRectMake(0.f, borderImageSize.height * 0.8, borderImageSize.width, borderImageSize.height)); + + UIImage *selectedSegmentBG = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + + // Clear default border and background color + [[UISegmentedControl appearance] setBackgroundImage:[[UIImage alloc] init] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; + [[UISegmentedControl appearance] setDividerImage:[[UIImage alloc] init] forLeftSegmentState:UIControlStateNormal rightSegmentState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; + + // Set selected segment background image + [[UISegmentedControl appearance] setBackgroundImage:[selectedSegmentBG imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault]; + + // Change font on UISegmentedControl + [[UISegmentedControl appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys: + [UIColor whiteColor], NSForegroundColorAttributeName, + [UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]], NSFontAttributeName, nil] forState:UIControlStateNormal]; + return YES; } diff --git a/Limelight/Font/Roboto/Apache License.txt b/Limelight/Font/Roboto/Apache License.txt new file mode 100755 index 0000000..63d5302 --- /dev/null +++ b/Limelight/Font/Roboto/Apache License.txt @@ -0,0 +1,203 @@ +Font data copyright Google 2012 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/Limelight/Font/Roboto/Roboto-Black.ttf b/Limelight/Font/Roboto/Roboto-Black.ttf new file mode 100755 index 0000000..71f01ac Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-Black.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-BlackItalic.ttf b/Limelight/Font/Roboto/Roboto-BlackItalic.ttf new file mode 100755 index 0000000..ec309c7 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-BlackItalic.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-Bold.ttf b/Limelight/Font/Roboto/Roboto-Bold.ttf new file mode 100755 index 0000000..aaf374d Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-Bold.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-BoldItalic.ttf b/Limelight/Font/Roboto/Roboto-BoldItalic.ttf new file mode 100755 index 0000000..dcd0f80 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-BoldItalic.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-Italic.ttf b/Limelight/Font/Roboto/Roboto-Italic.ttf new file mode 100755 index 0000000..f382c68 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-Italic.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-Light.ttf b/Limelight/Font/Roboto/Roboto-Light.ttf new file mode 100755 index 0000000..664e1b2 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-Light.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-LightItalic.ttf b/Limelight/Font/Roboto/Roboto-LightItalic.ttf new file mode 100755 index 0000000..b8f5296 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-LightItalic.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-Medium.ttf b/Limelight/Font/Roboto/Roboto-Medium.ttf new file mode 100755 index 0000000..aa00de0 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-Medium.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-MediumItalic.ttf b/Limelight/Font/Roboto/Roboto-MediumItalic.ttf new file mode 100755 index 0000000..67e25f0 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-MediumItalic.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-Regular.ttf b/Limelight/Font/Roboto/Roboto-Regular.ttf new file mode 100755 index 0000000..3e6e2e7 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-Regular.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-Thin.ttf b/Limelight/Font/Roboto/Roboto-Thin.ttf new file mode 100755 index 0000000..d262d14 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-Thin.ttf differ diff --git a/Limelight/Font/Roboto/Roboto-ThinItalic.ttf b/Limelight/Font/Roboto/Roboto-ThinItalic.ttf new file mode 100755 index 0000000..63e9f97 Binary files /dev/null and b/Limelight/Font/Roboto/Roboto-ThinItalic.ttf differ diff --git a/Limelight/Font/Roboto/RobotoCondensed-Bold.ttf b/Limelight/Font/Roboto/RobotoCondensed-Bold.ttf new file mode 100755 index 0000000..48dd635 Binary files /dev/null and b/Limelight/Font/Roboto/RobotoCondensed-Bold.ttf differ diff --git a/Limelight/Font/Roboto/RobotoCondensed-BoldItalic.ttf b/Limelight/Font/Roboto/RobotoCondensed-BoldItalic.ttf new file mode 100755 index 0000000..ad72864 Binary files /dev/null and b/Limelight/Font/Roboto/RobotoCondensed-BoldItalic.ttf differ diff --git a/Limelight/Font/Roboto/RobotoCondensed-Italic.ttf b/Limelight/Font/Roboto/RobotoCondensed-Italic.ttf new file mode 100755 index 0000000..a232513 Binary files /dev/null and b/Limelight/Font/Roboto/RobotoCondensed-Italic.ttf differ diff --git a/Limelight/Font/Roboto/RobotoCondensed-Light.ttf b/Limelight/Font/Roboto/RobotoCondensed-Light.ttf new file mode 100755 index 0000000..a6e368d Binary files /dev/null and b/Limelight/Font/Roboto/RobotoCondensed-Light.ttf differ diff --git a/Limelight/Font/Roboto/RobotoCondensed-LightItalic.ttf b/Limelight/Font/Roboto/RobotoCondensed-LightItalic.ttf new file mode 100755 index 0000000..5b2b6ae Binary files /dev/null and b/Limelight/Font/Roboto/RobotoCondensed-LightItalic.ttf differ diff --git a/Limelight/Font/Roboto/RobotoCondensed-Regular.ttf b/Limelight/Font/Roboto/RobotoCondensed-Regular.ttf new file mode 100755 index 0000000..65bf32a Binary files /dev/null and b/Limelight/Font/Roboto/RobotoCondensed-Regular.ttf differ diff --git a/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_1x.png b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_1x.png index a1d870a..e2768a1 100644 Binary files a/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_1x.png and b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_1x.png differ diff --git a/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_2x.png b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_2x.png index c043cd1..609be5e 100644 Binary files a/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_2x.png and b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_2x.png differ diff --git a/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_3x.png b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_3x.png index f3e9a6e..42046ec 100644 Binary files a/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_3x.png and b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_3x.png differ diff --git a/Limelight/Limelight-Info.plist b/Limelight/Limelight-Info.plist index 1a6aa2f..893eaec 100644 --- a/Limelight/Limelight-Info.plist +++ b/Limelight/Limelight-Info.plist @@ -26,6 +26,15 @@ public.app-category.games LSRequiresIPhoneOS + UIAppFonts + + Roboto-Black.ttf + Roboto-Bold.ttf + Roboto-Light.ttf + Roboto-Medium.ttf + Roboto-Regular.ttf + Roboto-Thin.ttf + UILaunchStoryboardName Launch Screen UIMainStoryboardFile diff --git a/Limelight/UIAppView.m b/Limelight/UIAppView.m index 1baa3b7..83455f7 100644 --- a/Limelight/UIAppView.m +++ b/Limelight/UIAppView.m @@ -24,25 +24,9 @@ static int LABEL_DY = 20; _appButton = [UIButton buttonWithType:UIButtonTypeCustom]; UIImage* noImage = [UIImage imageNamed:@"NoAppImage"]; [_appButton setBackgroundImage:noImage forState:UIControlStateNormal]; + [_appButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)]; [_appButton sizeToFit]; [_appButton addTarget:self action:@selector(appClicked) forControlEvents:UIControlEventTouchUpInside]; - - - // Remove Shadow and label - /* - _appButton.layer.shadowColor = [[UIColor blackColor] CGColor]; - _appButton.layer.shadowOffset = CGSizeMake(5,8); - _appButton.layer.shadowOpacity = 0.7; - - _appLabel = [[UILabel alloc] init]; - [_appLabel setText:_app.appName]; - [_appLabel sizeToFit]; - _appLabel.center = CGPointMake(_appButton.bounds.origin.x + (_appButton.bounds.size.width / 2), _appButton.bounds.origin.y + _appButton.bounds.size.height + LABEL_DY); - - [self updateBounds]; - [self addSubview:_appLabel]; - */ - [self addSubview:_appButton]; [self sizeToFit]; @@ -70,6 +54,22 @@ static int LABEL_DY = 20; [_appButton setBackgroundImage:_app.appImage forState:UIControlStateNormal]; [self setNeedsDisplay]; } + + // TODO: Improve no-app image detection + if (_app.appImage == nil || (_app.appImage.size.width == 130.f && _app.appImage.size.height == 180.f)) { // This size of image might be blank image received from GameStream. + _appLabel = [[UILabel alloc] init]; + CGFloat padding = 4.f; + [_appLabel setFrame: CGRectMake(padding, padding, _appButton.frame.size.width - 2 * padding, _appButton.frame.size.height - 2 * padding)]; + [_appLabel setTextColor:[UIColor whiteColor]]; + [_appLabel setFont:[UIFont fontWithName:@"Roboto-Regular" size:10.f]]; + [_appLabel setBaselineAdjustment:UIBaselineAdjustmentAlignCenters]; + [_appLabel setTextAlignment:NSTextAlignmentCenter]; + [_appLabel setLineBreakMode:NSLineBreakByWordWrapping]; + [_appLabel setNumberOfLines:0]; + [_appLabel setText:_app.appName]; + [_appButton addSubview:_appLabel]; + } + } /* diff --git a/Limelight/UIComputerView.m b/Limelight/UIComputerView.m index 72c27fa..3bfa4ff 100644 --- a/Limelight/UIComputerView.m +++ b/Limelight/UIComputerView.m @@ -34,6 +34,9 @@ static const int LABEL_DY = 20; _hostLabel = [[UILabel alloc] init]; _hostStatus = [[UILabel alloc] init]; _hostPairState = [[UILabel alloc] init]; + [_hostLabel setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]]; + [_hostStatus setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]]; + [_hostPairState setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]]; return self; } diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m index 11f641f..61de06b 100644 --- a/Limelight/ViewControllers/MainFrameViewController.m +++ b/Limelight/ViewControllers/MainFrameViewController.m @@ -68,6 +68,7 @@ static StreamConfiguration* streamConfig; dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_async(dispatch_get_main_queue(), ^{ _computerNameButton.title = _selectedHost.name; + [self.navigationController.navigationBar setNeedsLayout]; }); HttpManager* hMan = [[HttpManager alloc] initWithHost:_selectedHost.address uniqueId:_uniqueId deviceName:deviceName cert:_cert]; NSData* appListResp = [hMan executeRequestSynchronously:[hMan newAppListRequest]]; diff --git a/iPad.storyboard b/iPad.storyboard index 65c255c..e1a7a68 100644 --- a/iPad.storyboard +++ b/iPad.storyboard @@ -3,6 +3,11 @@ + + + Roboto-Regular + + @@ -39,7 +44,7 @@