diff --git a/configuration.c b/configuration.c index 423399f7adf9..4bdaa69509fe 100644 --- a/configuration.c +++ b/configuration.c @@ -1646,7 +1646,6 @@ static struct config_path_setting *populate_settings_path( #endif SETTING_ARRAY("log_dir", settings->paths.log_dir, true, NULL, true); - SETTING_ARRAY("app_icon", settings->paths.app_icon, true, NULL, true); *size = count; diff --git a/configuration.h b/configuration.h index 5b961c03bc02..786f1f439c89 100644 --- a/configuration.h +++ b/configuration.h @@ -563,7 +563,6 @@ typedef struct settings char directory_bottom_assets[PATH_MAX_LENGTH]; #endif char log_dir[PATH_MAX_LENGTH]; - char app_icon[PATH_MAX_LENGTH]; } paths; bool modified; diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 38c9ccec2a0d..c227a5a524eb 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1285,10 +1285,6 @@ MSG_HASH( MENU_ENUM_LABEL_DEFERRED_MENU_SETTINGS_LIST, "deferred_menu_settings_list" ) -MSG_HASH( - MENU_ENUM_LABEL_APPICON_SETTINGS, - "appicon_settings" - ) #ifdef _3DS MSG_HASH( MENU_ENUM_LABEL_DEFERRED_MENU_BOTTOM_SETTINGS_LIST, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 999390dab45f..875ba9e18ef1 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -5598,14 +5598,6 @@ MSG_HASH( MENU_ENUM_SUBLABEL_MENU_SETTINGS, "Change menu screen appearance settings." ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_APPICON_SETTINGS, - "App Icon" - ) -MSG_HASH( - MENU_ENUM_SUBLABEL_APPICON_SETTINGS, - "Change App Icon." - ) #ifdef _3DS MSG_HASH( MENU_ENUM_LABEL_VALUE_MENU_BOTTOM_SETTINGS, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 632c0ae7c47d..530d73d95ca3 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -335,7 +335,6 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_views_settings_list, MENU_ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_quick_menu_views_settings_list, MENU_ENUM_SUBLABEL_QUICK_MENU_VIEWS_SETTINGS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_settings_views_settings_list, MENU_ENUM_SUBLABEL_SETTINGS_VIEWS_SETTINGS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_settings_list, MENU_ENUM_SUBLABEL_MENU_SETTINGS) -DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_appicon_settings_list, MENU_ENUM_SUBLABEL_APPICON_SETTINGS) #ifdef _3DS DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_bottom_settings_list, MENU_ENUM_SUBLABEL_MENU_BOTTOM_SETTINGS) #endif @@ -4822,9 +4821,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_settings_list); break; - case MENU_ENUM_LABEL_APPICON_SETTINGS: - BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_appicon_settings_list); - break; #ifdef _3DS case MENU_ENUM_LABEL_MENU_BOTTOM_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_bottom_settings_list); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index fc503218b600..ee71e2dc8e10 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -8989,10 +8989,8 @@ unsigned menu_displaylist_build_list( (enum menu_screensaver_effect) settings->uints.menu_screensaver_animation; #endif - uico_driver_state_t *uico_st = uico_state_get_ptr(); menu_displaylist_build_info_selective_t build_list[] = { - {MENU_ENUM_LABEL_APPICON_SETTINGS, PARSE_ONLY_STRING_OPTIONS, false}, {MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS, PARSE_ACTION, true}, {MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, PARSE_ACTION, true}, {MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS, PARSE_ACTION, true}, @@ -9034,9 +9032,6 @@ unsigned menu_displaylist_build_list( { switch (build_list[i].enum_idx) { - case MENU_ENUM_LABEL_APPICON_SETTINGS: - build_list[i].checked = (uico_st->drv && uico_st->drv->set_app_icon); - break; case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS: build_list[i].checked = settings->bools.settings_show_onscreen_display; break; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index cc4ff76001e1..80a43f75c763 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -9001,16 +9001,6 @@ static void timezone_change_handler(rarch_setting_t *setting) } #endif -static void appicon_change_handler(rarch_setting_t *setting) -{ - uico_driver_state_t *uico_st = uico_state_get_ptr(); - if (!setting) - return; - if (!uico_st->drv || !uico_st->drv->set_app_icon) - return; - uico_st->drv->set_app_icon(setting->value.target.string); -} - #ifdef _3DS static void new3ds_speedup_change_handler(rarch_setting_t *setting) { @@ -19514,36 +19504,6 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - { - uico_driver_state_t *uico_st = uico_state_get_ptr(); - struct string_list *icons; - if (uico_st->drv && uico_st->drv->get_app_icons && (icons = uico_st->drv->get_app_icons()) && icons->size) - { - char *options; - int len = 0, i = 0; - for (; i < icons->size; i++) - len += strlen(icons->elems[i].data) + 1; - options = (char*)calloc(len, sizeof(char)); - string_list_join_concat(options, len, icons, "|"); - CONFIG_STRING_OPTIONS( - list, list_info, - settings->paths.app_icon, - sizeof(settings->paths.app_icon), - MENU_ENUM_LABEL_APPICON_SETTINGS, - MENU_ENUM_LABEL_VALUE_APPICON_SETTINGS, - icons->elems[0].data, - options, - &group_info, - &subgroup_info, - parent_group, - general_write_handler, - general_read_handler); - SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_IS_DRIVER); - (*list)[list_info->index - 1].action_ok = setting_action_ok_uint; - (*list)[list_info->index - 1].change_handler = appicon_change_handler; - } - } - CONFIG_BOOL( list, list_info, &settings->bools.pause_nonactive, diff --git a/msg_hash.h b/msg_hash.h index c3ccb2783728..1cc171886cf1 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1751,7 +1751,6 @@ enum msg_hash_enums MENU_LABEL(QUICK_MENU_VIEWS_SETTINGS), MENU_LABEL(SETTINGS_VIEWS_SETTINGS), MENU_LABEL(MENU_SETTINGS), - MENU_LABEL(APPICON_SETTINGS), #ifdef _3DS MENU_LABEL(MENU_BOTTOM_SETTINGS), #endif diff --git a/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj index ee6b8e75610c..15e1f4ce10b5 100644 --- a/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj @@ -1540,8 +1540,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ARCHS = "$(ARCHS_STANDARD)"; - ASSETCATALOG_COMPILER_APPICON_NAME = Default; - ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1615,8 +1614,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ARCHS = "$(ARCHS_STANDARD)"; - ASSETCATALOG_COMPILER_APPICON_NAME = Default; - ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Contents.json b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000000..d7728fbfd8f1 --- /dev/null +++ b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,158 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-20-3.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-76-3.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-29-1.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-29-2.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-29-3.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40-2.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40-3.png", + "scale" : "3x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "Icon-57-1.png", + "scale" : "1x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "Icon-57-2.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60-2.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60-3.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-20-4.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-20-2.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-29-1.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-29-2.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40-1.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40-2.png", + "scale" : "2x" + }, + { + "size" : "50x50", + "idiom" : "ipad", + "filename" : "Icon-50-1.png", + "scale" : "1x" + }, + { + "size" : "50x50", + "idiom" : "ipad", + "filename" : "Icon-50-2.png", + "scale" : "2x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "Icon-72-1.png", + "scale" : "1x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "Icon-72-2.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76-1.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76-2.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-83.5-2.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-83.5-3.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-2.png new file mode 100644 index 000000000000..1009473a294f Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-3.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-3.png new file mode 100644 index 000000000000..1009473a294f Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-3.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-4.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-4.png new file mode 100644 index 000000000000..cf13734415ce Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-20-4.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-1.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-1.png new file mode 100644 index 000000000000..e54bd6091870 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-1.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-2.png new file mode 100644 index 000000000000..efc808230703 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-3.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-3.png new file mode 100644 index 000000000000..d120dc90ba1b Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-29-3.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-1.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-1.png new file mode 100644 index 000000000000..1009473a294f Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-1.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-2.png new file mode 100644 index 000000000000..2e9837af69cb Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-3.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-3.png new file mode 100644 index 000000000000..93a46ae194c2 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-40-3.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-50-1.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-50-1.png new file mode 100644 index 000000000000..5ecd4dce5578 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-50-1.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-50-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-50-2.png new file mode 100644 index 000000000000..ad7e19dc8e07 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-50-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-57-1.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-57-1.png new file mode 100644 index 000000000000..37d8a3fdcfea Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-57-1.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-57-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-57-2.png new file mode 100644 index 000000000000..6f831c2f66f6 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-57-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-60-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-60-2.png new file mode 100644 index 000000000000..93a46ae194c2 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-60-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-60-3.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-60-3.png new file mode 100644 index 000000000000..084cfc1b9b0f Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-60-3.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-72-1.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-72-1.png new file mode 100644 index 000000000000..13b468dafd08 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-72-1.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-72-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-72-2.png new file mode 100644 index 000000000000..c5b92714cc85 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-72-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-1.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-1.png new file mode 100644 index 000000000000..d6a9e8c6db4d Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-1.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-2.png new file mode 100644 index 000000000000..e0712c1b877f Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-3.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-3.png new file mode 100644 index 000000000000..02e159b22ce1 Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-76-3.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-83.5-2.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-83.5-2.png new file mode 100644 index 000000000000..102b9f2a15bd Binary files /dev/null and b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-83.5-2.png differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Default.appiconset/Icon-83.5-3.png b/pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-83.5-3.png similarity index 100% rename from pkg/apple/iOS/Resources/Media.xcassets/Default.appiconset/Icon-83.5-3.png rename to pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Icon-83.5-3.png diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Arcade 1.appiconset/Contents.json b/pkg/apple/iOS/Resources/Media.xcassets/Arcade 1.appiconset/Contents.json deleted file mode 100644 index fdf71a79def5..000000000000 --- a/pkg/apple/iOS/Resources/Media.xcassets/Arcade 1.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "RetroArch_Arcade_1.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Arcade 1.appiconset/RetroArch_Arcade_1.png b/pkg/apple/iOS/Resources/Media.xcassets/Arcade 1.appiconset/RetroArch_Arcade_1.png deleted file mode 100644 index a19f7ba9780c..000000000000 Binary files a/pkg/apple/iOS/Resources/Media.xcassets/Arcade 1.appiconset/RetroArch_Arcade_1.png and /dev/null differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Arcade 2.appiconset/Contents.json b/pkg/apple/iOS/Resources/Media.xcassets/Arcade 2.appiconset/Contents.json deleted file mode 100644 index b035f929680c..000000000000 --- a/pkg/apple/iOS/Resources/Media.xcassets/Arcade 2.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "RetroArch_Arcade_2.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Arcade 2.appiconset/RetroArch_Arcade_2.png b/pkg/apple/iOS/Resources/Media.xcassets/Arcade 2.appiconset/RetroArch_Arcade_2.png deleted file mode 100644 index d4a9322641a6..000000000000 Binary files a/pkg/apple/iOS/Resources/Media.xcassets/Arcade 2.appiconset/RetroArch_Arcade_2.png and /dev/null differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Contents.json b/pkg/apple/iOS/Resources/Media.xcassets/Contents.json index 73c00596a7fc..da4a164c9186 100644 --- a/pkg/apple/iOS/Resources/Media.xcassets/Contents.json +++ b/pkg/apple/iOS/Resources/Media.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" } -} +} \ No newline at end of file diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Default.appiconset/Contents.json b/pkg/apple/iOS/Resources/Media.xcassets/Default.appiconset/Contents.json deleted file mode 100644 index 0d778b470945..000000000000 --- a/pkg/apple/iOS/Resources/Media.xcassets/Default.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "Icon-83.5-3.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Glow.appiconset/Contents.json b/pkg/apple/iOS/Resources/Media.xcassets/Glow.appiconset/Contents.json deleted file mode 100644 index ec9a144133fa..000000000000 --- a/pkg/apple/iOS/Resources/Media.xcassets/Glow.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "Retroarch.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Glow.appiconset/Retroarch.png b/pkg/apple/iOS/Resources/Media.xcassets/Glow.appiconset/Retroarch.png deleted file mode 100644 index 328288815668..000000000000 Binary files a/pkg/apple/iOS/Resources/Media.xcassets/Glow.appiconset/Retroarch.png and /dev/null differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Gruvbox.appiconset/Contents.json b/pkg/apple/iOS/Resources/Media.xcassets/Gruvbox.appiconset/Contents.json deleted file mode 100644 index be6a1312fad9..000000000000 --- a/pkg/apple/iOS/Resources/Media.xcassets/Gruvbox.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "Retroarch_Gruvbox.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Gruvbox.appiconset/Retroarch_Gruvbox.png b/pkg/apple/iOS/Resources/Media.xcassets/Gruvbox.appiconset/Retroarch_Gruvbox.png deleted file mode 100644 index 6ce263c06b3c..000000000000 Binary files a/pkg/apple/iOS/Resources/Media.xcassets/Gruvbox.appiconset/Retroarch_Gruvbox.png and /dev/null differ diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Light.appiconset/Contents.json b/pkg/apple/iOS/Resources/Media.xcassets/Light.appiconset/Contents.json deleted file mode 100644 index d70a1bf7d071..000000000000 --- a/pkg/apple/iOS/Resources/Media.xcassets/Light.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "Retroarch_Light.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/pkg/apple/iOS/Resources/Media.xcassets/Light.appiconset/Retroarch_Light.png b/pkg/apple/iOS/Resources/Media.xcassets/Light.appiconset/Retroarch_Light.png deleted file mode 100644 index 78227e25c968..000000000000 Binary files a/pkg/apple/iOS/Resources/Media.xcassets/Light.appiconset/Retroarch_Light.png and /dev/null differ diff --git a/retroarch.c b/retroarch.c index cd5b4fe7a2dd..896598c99023 100644 --- a/retroarch.c +++ b/retroarch.c @@ -7552,7 +7552,6 @@ bool retroarch_main_init(int argc, char *argv[]) #endif ); #endif - ui_companion_driver_init_first(); drivers_init(settings, DRIVERS_CMD_ALL, 0, verbosity_enabled); #ifdef HAVE_COMMAND input_driver_deinit_command(input_st); diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 6db48a0acafc..213cade79233 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -1111,8 +1111,6 @@ static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) ui_companion_cocoa_get_main_window, NULL, /* log_msg */ NULL, /* is_active */ - NULL, /* get_app_icons */ - NULL, /* set_app_icon */ &ui_browser_window_cocoa, &ui_msg_window_cocoa, &ui_window_cocoa, diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index fcd4c0a5ae8a..d19e03565776 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -41,7 +41,6 @@ #endif #import -#import #import #import @@ -57,46 +56,6 @@ static void ui_companion_cocoatouch_event_command( void *data, enum event_command cmd) { } -static struct string_list *ui_companion_cocoatouch_get_app_icons(void) -{ - static struct string_list *list = NULL; - static dispatch_once_t onceToken; - - dispatch_once(&onceToken, ^{ - union string_list_elem_attr attr; - attr.i = 0; - NSDictionary *iconfiles = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIcons"]; - NSString *primary; -#if TARGET_OS_TV - primary = iconfiles[@"CFBundlePrimaryIcon"]; -#else - primary = iconfiles[@"CFBundlePrimaryIcon"][@"CFBundleIconName"]; -#endif - list = string_list_new(); - string_list_append(list, [primary cStringUsingEncoding:kCFStringEncodingUTF8], attr); - - NSArray *alts; -#if TARGET_OS_TV - alts = iconfiles[@"CFBundleAlternateIcons"]; -#else - alts = [iconfiles[@"CFBundleAlternateIcons"] allKeys]; -#endif - NSArray *sorted = [alts sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)]; - for (NSString *str in sorted) - string_list_append(list, [str cStringUsingEncoding:kCFStringEncodingUTF8], attr); - }); - - return list; -} - -static void ui_companion_cocoatouch_set_app_icon(const char *iconName) -{ - NSString *str; - if (!string_is_equal(iconName, "Default")) - str = [NSString stringWithCString:iconName encoding:NSUTF8StringEncoding]; - [[UIApplication sharedApplication] setAlternateIconName:str completionHandler:nil]; -} - static void rarch_draw_observer(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) { @@ -498,22 +457,6 @@ - (void)handleAudioSessionInterruption:(NSNotification *)notification } } -- (NSData *)pngForIcon:(NSString *)iconName -{ - UIImage *img; - NSData *png; - img = [UIImage imageNamed:iconName]; - if (!img) - NSLog(@"could not load %@\n", iconName); - else - { - png = UIImagePNGRepresentation(img); - if (!png) - NSLog(@"could not get png for %@\n", iconName); - } - return png; -} - - (void)applicationDidFinishLaunching:(UIApplication *)application { char arguments[] = "retroarch"; @@ -656,26 +599,6 @@ - (void)didReceiveDiagnosticPayloads:(NSArray *)payloads @end -ui_companion_driver_t ui_companion_cocoatouch = { - NULL, /* init */ - NULL, /* deinit */ - NULL, /* toggle */ - ui_companion_cocoatouch_event_command, - NULL, /* notify_refresh */ - NULL, /* msg_queue_push */ - NULL, /* render_messagebox */ - NULL, /* get_main_window */ - NULL, /* log_msg */ - NULL, /* is_active */ - ui_companion_cocoatouch_get_app_icons, - ui_companion_cocoatouch_set_app_icon, - NULL, /* browser_window */ - NULL, /* msg_window */ - NULL, /* window */ - NULL, /* application */ - "cocoatouch", -}; - int main(int argc, char *argv[]) { #if TARGET_OS_IOS diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index 93edf9a07562..53485619e545 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -4940,8 +4940,6 @@ ui_companion_driver_t ui_companion_qt = { NULL, ui_companion_qt_log_msg, ui_companion_qt_is_active, - NULL, /* get_app_icons */ - NULL, /* set_app_icon */ &ui_browser_window_qt, &ui_msg_window_qt, &ui_window_qt, diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index fd4520270cd3..cebd5b6f9466 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -336,8 +336,6 @@ ui_companion_driver_t ui_companion_win32 = { NULL, NULL, /* log_msg */ NULL, /* is_active */ - NULL, /* get_app_icons */ - NULL, /* set_app_icon */ &ui_browser_window_win32, &ui_msg_window_win32, &ui_window_win32, diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c index 92408eaf2b4e..f8b16fdf864f 100644 --- a/ui/ui_companion_driver.c +++ b/ui/ui_companion_driver.c @@ -38,8 +38,6 @@ static ui_companion_driver_t ui_companion_null = { NULL, /* get_main_window */ NULL, /* log_msg */ NULL, /* is_active */ - NULL, /* get_app_icons */ - NULL, /* set_app_icon */ NULL, /* browser_window */ NULL, /* msg_window */ NULL, /* window */ @@ -53,9 +51,6 @@ static const ui_companion_driver_t *ui_companion_drivers[] = { #endif #if defined(OSX) &ui_companion_cocoa, -#endif -#if defined(IOS) - &ui_companion_cocoatouch, #endif &ui_companion_null, NULL diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h index 0e5f8c21e394..f0071b2a2b45 100644 --- a/ui/ui_companion_driver.h +++ b/ui/ui_companion_driver.h @@ -22,7 +22,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H #include "../config.h" @@ -131,8 +130,6 @@ typedef struct ui_companion_driver void *(*get_main_window)(void *data); void (*log_msg)(void *data, const char *msg); bool (*is_active)(void *data); - struct string_list *(*get_app_icons)(void); - void (*set_app_icon)(const char *icon); ui_browser_window_t *browser_window; ui_msg_window_t *msg_window; ui_window_t *window; @@ -184,7 +181,6 @@ void ui_companion_driver_toggle( uico_driver_state_t *uico_state_get_ptr(void); extern ui_companion_driver_t ui_companion_cocoa; -extern ui_companion_driver_t ui_companion_cocoatouch; extern ui_companion_driver_t ui_companion_qt; extern ui_companion_driver_t ui_companion_win32;