diff --git a/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/Contents.json b/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/Contents.json new file mode 100644 index 00000000..de9fd99c --- /dev/null +++ b/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/Contents.json @@ -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 + } +} diff --git a/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt.png b/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt.png new file mode 100644 index 00000000..fafe5a39 Binary files /dev/null and b/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt.png differ diff --git a/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt_2x.png b/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt_2x.png new file mode 100644 index 00000000..fce18840 Binary files /dev/null and b/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt_2x.png differ diff --git a/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt_3x.png b/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt_3x.png new file mode 100644 index 00000000..109c594b Binary files /dev/null and b/Resources/Assets.xcassets/ic_bluetooth_white_18pt.imageset/ic_bluetooth_white_18pt_3x.png differ diff --git a/Resources/iDOS-Info.plist b/Resources/iDOS-Info.plist index 09bdfc4e..85a7eaec 100644 --- a/Resources/iDOS-Info.plist +++ b/Resources/iDOS-Info.plist @@ -36,11 +36,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - $(MARKETING_VERSION) + 2.1 CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 20201019.2116 LSApplicationCategoryType public.app-category.utilities LSRequiresIPhoneOS diff --git a/dospad.xcodeproj/project.pbxproj b/dospad.xcodeproj/project.pbxproj index 7c231f31..7b7793ae 100755 --- a/dospad.xcodeproj/project.pbxproj +++ b/dospad.xcodeproj/project.pbxproj @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/dospad/iPad/DosPadViewController.m b/dospad/iPad/DosPadViewController.m index f737ee1d..6d2cbde8 100755 --- a/dospad/iPad/DosPadViewController.m +++ b/dospad/iPad/DosPadViewController.m @@ -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]; diff --git a/dospad/iPhone/DosPadViewController_iPhone.m b/dospad/iPhone/DosPadViewController_iPhone.m index 2e994d72..5b8c15ee 100755 --- a/dospad/iPhone/DosPadViewController_iPhone.m +++ b/dospad/iPhone/DosPadViewController_iPhone.m @@ -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]; diff --git a/iDOSThumbnail/Info.plist b/iDOSThumbnail/Info.plist index 624360be..9bb03594 100644 --- a/iDOSThumbnail/Info.plist +++ b/iDOSThumbnail/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - $(MARKETING_VERSION) + 2.1 CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 20201019.2116 NSExtension NSExtensionAttributes