Skip to content

Commit

Permalink
Update icon for game controller mapper button
Browse files Browse the repository at this point in the history
  • Loading branch information
Chaoji Li committed Oct 20, 2020
1 parent e7651d5 commit 1980db0
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 15 deletions.
23 changes: 23 additions & 0 deletions Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images": [
{
"filename": "ic_bluetooth_white_18pt.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_bluetooth_white_18pt_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_bluetooth_white_18pt_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
}
}
Binary file added ...es/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt_2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt_3x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Resources/iDOS-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>2.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>20201019.2116</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
18 changes: 9 additions & 9 deletions dospad.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3628,7 +3628,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20201008;
CURRENT_PROJECT_VERSION = 20201019.2;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 4C8YZND49H;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -3649,7 +3649,7 @@
INFOPLIST_FILE = iDOSThumbnail/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.0.1;
MARKETING_VERSION = 2.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.litchie.idosgames.thumbnail;
Expand Down Expand Up @@ -3695,7 +3695,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20201008;
CURRENT_PROJECT_VERSION = 20201019.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 4C8YZND49H;
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -3711,7 +3711,7 @@
INFOPLIST_FILE = iDOSThumbnail/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.0.1;
MARKETING_VERSION = 2.1;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.litchie.idosgames.thumbnail;
Expand Down Expand Up @@ -3758,7 +3758,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20201008;
CURRENT_PROJECT_VERSION = 20201019.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 4C8YZND49H;
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -3774,7 +3774,7 @@
INFOPLIST_FILE = iDOSThumbnail/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.0.1;
MARKETING_VERSION = 2.1;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.litchie.idosgames.thumbnail;
Expand All @@ -3793,7 +3793,7 @@
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20201008;
CURRENT_PROJECT_VERSION = 20201019.2;
DEVELOPMENT_TEAM = 4C8YZND49H;
GCC_DYNAMIC_NO_PIC = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down Expand Up @@ -3828,7 +3828,7 @@
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20201008;
CURRENT_PROJECT_VERSION = 20201019.2;
DEVELOPMENT_TEAM = 4C8YZND49H;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = dospad/dospad_Prefix.pch;
Expand Down Expand Up @@ -3975,7 +3975,7 @@
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20201008;
CURRENT_PROJECT_VERSION = 20201019.2;
DEVELOPMENT_TEAM = 4C8YZND49H;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = dospad/dospad_Prefix.pch;
Expand Down
2 changes: 1 addition & 1 deletion dospad/iPad/DosPadViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ - (void)refreshFullscreenPanel

// Remap controls button
UIButton *btnRemap = [[UIButton alloc] initWithFrame:CGRectMake(0,0,72,36)];
[btnRemap setTitle:@"R" forState:UIControlStateNormal];
[btnRemap setImage:[UIImage imageNamed:@"ic_bluetooth_white_18pt"] forState:UIControlStateNormal];
[btnRemap addTarget:self action:@selector(openMfiMapper:) forControlEvents:UIControlEventTouchUpInside];
[items addObject:btnRemap];

Expand Down
3 changes: 2 additions & 1 deletion dospad/iPhone/DosPadViewController_iPhone.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ - (void)refreshFullscreenPanel
[items addObject:btnOption];

UIButton *btnRemap = [[UIButton alloc] initWithFrame:CGRectMake(340,0,20,24)];
[btnRemap setTitle:@"R" forState:UIControlStateNormal];
// [btnRemap setTitle:@"R" forState:UIControlStateNormal];
[btnRemap setImage:[UIImage imageNamed:@"ic_bluetooth_white_18pt"] forState:UIControlStateNormal];
[btnRemap addTarget:self action:@selector(openMfiMapper:) forControlEvents:UIControlEventTouchUpInside];
[items addObject:btnRemap];

Expand Down
4 changes: 2 additions & 2 deletions iDOSThumbnail/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>2.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>20201019.2116</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down

0 comments on commit 1980db0

Please sign in to comment.