diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 8cfa1477a..ece1a8839 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -1090,6 +1090,21 @@ + + + + + + + + + + + + + + + diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index ac08f7a93..f88c593d8 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -2500,358 +2500,361 @@ namespace Bit.Android public const int folder = 2130837645; // aapt resource value: 0x7f02008e - public const int globe = 2130837646; + public const int folder_o = 2130837646; // aapt resource value: 0x7f02008f - public const int hockeyapp_btn_background = 2130837647; + public const int globe = 2130837647; // aapt resource value: 0x7f020090 - public const int ic_audiotrack = 2130837648; + public const int hockeyapp_btn_background = 2130837648; // aapt resource value: 0x7f020091 - public const int ic_audiotrack_light = 2130837649; + public const int ic_audiotrack = 2130837649; // aapt resource value: 0x7f020092 - public const int ic_bluetooth_grey = 2130837650; + public const int ic_audiotrack_light = 2130837650; // aapt resource value: 0x7f020093 - public const int ic_bluetooth_white = 2130837651; + public const int ic_bluetooth_grey = 2130837651; // aapt resource value: 0x7f020094 - public const int ic_cast_dark = 2130837652; + public const int ic_bluetooth_white = 2130837652; // aapt resource value: 0x7f020095 - public const int ic_cast_disabled_light = 2130837653; + public const int ic_cast_dark = 2130837653; // aapt resource value: 0x7f020096 - public const int ic_cast_grey = 2130837654; + public const int ic_cast_disabled_light = 2130837654; // aapt resource value: 0x7f020097 - public const int ic_cast_light = 2130837655; + public const int ic_cast_grey = 2130837655; // aapt resource value: 0x7f020098 - public const int ic_cast_off_light = 2130837656; + public const int ic_cast_light = 2130837656; // aapt resource value: 0x7f020099 - public const int ic_cast_on_0_light = 2130837657; + public const int ic_cast_off_light = 2130837657; // aapt resource value: 0x7f02009a - public const int ic_cast_on_1_light = 2130837658; + public const int ic_cast_on_0_light = 2130837658; // aapt resource value: 0x7f02009b - public const int ic_cast_on_2_light = 2130837659; + public const int ic_cast_on_1_light = 2130837659; // aapt resource value: 0x7f02009c - public const int ic_cast_on_light = 2130837660; + public const int ic_cast_on_2_light = 2130837660; // aapt resource value: 0x7f02009d - public const int ic_cast_white = 2130837661; + public const int ic_cast_on_light = 2130837661; // aapt resource value: 0x7f02009e - public const int ic_close_dark = 2130837662; + public const int ic_cast_white = 2130837662; // aapt resource value: 0x7f02009f - public const int ic_close_light = 2130837663; + public const int ic_close_dark = 2130837663; // aapt resource value: 0x7f0200a0 - public const int ic_collapse = 2130837664; + public const int ic_close_light = 2130837664; // aapt resource value: 0x7f0200a1 - public const int ic_collapse_00000 = 2130837665; + public const int ic_collapse = 2130837665; // aapt resource value: 0x7f0200a2 - public const int ic_collapse_00001 = 2130837666; + public const int ic_collapse_00000 = 2130837666; // aapt resource value: 0x7f0200a3 - public const int ic_collapse_00002 = 2130837667; + public const int ic_collapse_00001 = 2130837667; // aapt resource value: 0x7f0200a4 - public const int ic_collapse_00003 = 2130837668; + public const int ic_collapse_00002 = 2130837668; // aapt resource value: 0x7f0200a5 - public const int ic_collapse_00004 = 2130837669; + public const int ic_collapse_00003 = 2130837669; // aapt resource value: 0x7f0200a6 - public const int ic_collapse_00005 = 2130837670; + public const int ic_collapse_00004 = 2130837670; // aapt resource value: 0x7f0200a7 - public const int ic_collapse_00006 = 2130837671; + public const int ic_collapse_00005 = 2130837671; // aapt resource value: 0x7f0200a8 - public const int ic_collapse_00007 = 2130837672; + public const int ic_collapse_00006 = 2130837672; // aapt resource value: 0x7f0200a9 - public const int ic_collapse_00008 = 2130837673; + public const int ic_collapse_00007 = 2130837673; // aapt resource value: 0x7f0200aa - public const int ic_collapse_00009 = 2130837674; + public const int ic_collapse_00008 = 2130837674; // aapt resource value: 0x7f0200ab - public const int ic_collapse_00010 = 2130837675; + public const int ic_collapse_00009 = 2130837675; // aapt resource value: 0x7f0200ac - public const int ic_collapse_00011 = 2130837676; + public const int ic_collapse_00010 = 2130837676; // aapt resource value: 0x7f0200ad - public const int ic_collapse_00012 = 2130837677; + public const int ic_collapse_00011 = 2130837677; // aapt resource value: 0x7f0200ae - public const int ic_collapse_00013 = 2130837678; + public const int ic_collapse_00012 = 2130837678; // aapt resource value: 0x7f0200af - public const int ic_collapse_00014 = 2130837679; + public const int ic_collapse_00013 = 2130837679; // aapt resource value: 0x7f0200b0 - public const int ic_collapse_00015 = 2130837680; + public const int ic_collapse_00014 = 2130837680; // aapt resource value: 0x7f0200b1 - public const int ic_errorstatus = 2130837681; + public const int ic_collapse_00015 = 2130837681; // aapt resource value: 0x7f0200b2 - public const int ic_expand = 2130837682; + public const int ic_errorstatus = 2130837682; // aapt resource value: 0x7f0200b3 - public const int ic_expand_00000 = 2130837683; + public const int ic_expand = 2130837683; // aapt resource value: 0x7f0200b4 - public const int ic_expand_00001 = 2130837684; + public const int ic_expand_00000 = 2130837684; // aapt resource value: 0x7f0200b5 - public const int ic_expand_00002 = 2130837685; + public const int ic_expand_00001 = 2130837685; // aapt resource value: 0x7f0200b6 - public const int ic_expand_00003 = 2130837686; + public const int ic_expand_00002 = 2130837686; // aapt resource value: 0x7f0200b7 - public const int ic_expand_00004 = 2130837687; + public const int ic_expand_00003 = 2130837687; // aapt resource value: 0x7f0200b8 - public const int ic_expand_00005 = 2130837688; + public const int ic_expand_00004 = 2130837688; // aapt resource value: 0x7f0200b9 - public const int ic_expand_00006 = 2130837689; + public const int ic_expand_00005 = 2130837689; // aapt resource value: 0x7f0200ba - public const int ic_expand_00007 = 2130837690; + public const int ic_expand_00006 = 2130837690; // aapt resource value: 0x7f0200bb - public const int ic_expand_00008 = 2130837691; + public const int ic_expand_00007 = 2130837691; // aapt resource value: 0x7f0200bc - public const int ic_expand_00009 = 2130837692; + public const int ic_expand_00008 = 2130837692; // aapt resource value: 0x7f0200bd - public const int ic_expand_00010 = 2130837693; + public const int ic_expand_00009 = 2130837693; // aapt resource value: 0x7f0200be - public const int ic_expand_00011 = 2130837694; + public const int ic_expand_00010 = 2130837694; // aapt resource value: 0x7f0200bf - public const int ic_expand_00012 = 2130837695; + public const int ic_expand_00011 = 2130837695; // aapt resource value: 0x7f0200c0 - public const int ic_expand_00013 = 2130837696; + public const int ic_expand_00012 = 2130837696; // aapt resource value: 0x7f0200c1 - public const int ic_expand_00014 = 2130837697; + public const int ic_expand_00013 = 2130837697; // aapt resource value: 0x7f0200c2 - public const int ic_expand_00015 = 2130837698; + public const int ic_expand_00014 = 2130837698; // aapt resource value: 0x7f0200c3 - public const int ic_media_pause = 2130837699; + public const int ic_expand_00015 = 2130837699; // aapt resource value: 0x7f0200c4 - public const int ic_media_play = 2130837700; + public const int ic_media_pause = 2130837700; // aapt resource value: 0x7f0200c5 - public const int ic_media_route_disabled_mono_dark = 2130837701; + public const int ic_media_play = 2130837701; // aapt resource value: 0x7f0200c6 - public const int ic_media_route_off_mono_dark = 2130837702; + public const int ic_media_route_disabled_mono_dark = 2130837702; // aapt resource value: 0x7f0200c7 - public const int ic_media_route_on_0_mono_dark = 2130837703; + public const int ic_media_route_off_mono_dark = 2130837703; // aapt resource value: 0x7f0200c8 - public const int ic_media_route_on_1_mono_dark = 2130837704; + public const int ic_media_route_on_0_mono_dark = 2130837704; // aapt resource value: 0x7f0200c9 - public const int ic_media_route_on_2_mono_dark = 2130837705; + public const int ic_media_route_on_1_mono_dark = 2130837705; // aapt resource value: 0x7f0200ca - public const int ic_media_route_on_mono_dark = 2130837706; + public const int ic_media_route_on_2_mono_dark = 2130837706; // aapt resource value: 0x7f0200cb - public const int ic_pause_dark = 2130837707; + public const int ic_media_route_on_mono_dark = 2130837707; // aapt resource value: 0x7f0200cc - public const int ic_pause_light = 2130837708; + public const int ic_pause_dark = 2130837708; // aapt resource value: 0x7f0200cd - public const int ic_play_dark = 2130837709; + public const int ic_pause_light = 2130837709; // aapt resource value: 0x7f0200ce - public const int ic_play_light = 2130837710; + public const int ic_play_dark = 2130837710; // aapt resource value: 0x7f0200cf - public const int ic_speaker_dark = 2130837711; + public const int ic_play_light = 2130837711; // aapt resource value: 0x7f0200d0 - public const int ic_speaker_group_dark = 2130837712; + public const int ic_speaker_dark = 2130837712; // aapt resource value: 0x7f0200d1 - public const int ic_speaker_group_light = 2130837713; + public const int ic_speaker_group_dark = 2130837713; // aapt resource value: 0x7f0200d2 - public const int ic_speaker_light = 2130837714; + public const int ic_speaker_group_light = 2130837714; // aapt resource value: 0x7f0200d3 - public const int ic_successstatus = 2130837715; + public const int ic_speaker_light = 2130837715; // aapt resource value: 0x7f0200d4 - public const int ic_tv_dark = 2130837716; + public const int ic_successstatus = 2130837716; // aapt resource value: 0x7f0200d5 - public const int ic_tv_light = 2130837717; + public const int ic_tv_dark = 2130837717; // aapt resource value: 0x7f0200d6 - public const int icon = 2130837718; + public const int ic_tv_light = 2130837718; // aapt resource value: 0x7f0200d7 - public const int id = 2130837719; + public const int icon = 2130837719; // aapt resource value: 0x7f0200d8 - public const int ion_chevron_right = 2130837720; + public const int id = 2130837720; // aapt resource value: 0x7f0200d9 - public const int launch = 2130837721; + public const int ion_chevron_right = 2130837721; // aapt resource value: 0x7f0200da - public const int lightbulb = 2130837722; + public const int launch = 2130837722; // aapt resource value: 0x7f0200db - public const int list_selector = 2130837723; + public const int lightbulb = 2130837723; // aapt resource value: 0x7f0200dc - public const int @lock = 2130837724; + public const int list_selector = 2130837724; // aapt resource value: 0x7f0200dd - public const int login = 2130837725; + public const int @lock = 2130837725; // aapt resource value: 0x7f0200de - public const int logo = 2130837726; + public const int login = 2130837726; // aapt resource value: 0x7f0200df - public const int more = 2130837727; + public const int logo = 2130837727; // aapt resource value: 0x7f0200e0 - public const int mr_dialog_material_background_dark = 2130837728; + public const int more = 2130837728; // aapt resource value: 0x7f0200e1 - public const int mr_dialog_material_background_light = 2130837729; + public const int mr_dialog_material_background_dark = 2130837729; // aapt resource value: 0x7f0200e2 - public const int mr_ic_audiotrack_light = 2130837730; + public const int mr_dialog_material_background_light = 2130837730; // aapt resource value: 0x7f0200e3 - public const int mr_ic_cast_dark = 2130837731; + public const int mr_ic_audiotrack_light = 2130837731; // aapt resource value: 0x7f0200e4 - public const int mr_ic_cast_light = 2130837732; + public const int mr_ic_cast_dark = 2130837732; // aapt resource value: 0x7f0200e5 - public const int mr_ic_close_dark = 2130837733; + public const int mr_ic_cast_light = 2130837733; // aapt resource value: 0x7f0200e6 - public const int mr_ic_close_light = 2130837734; + public const int mr_ic_close_dark = 2130837734; // aapt resource value: 0x7f0200e7 - public const int mr_ic_media_route_connecting_mono_dark = 2130837735; + public const int mr_ic_close_light = 2130837735; // aapt resource value: 0x7f0200e8 - public const int mr_ic_media_route_connecting_mono_light = 2130837736; + public const int mr_ic_media_route_connecting_mono_dark = 2130837736; // aapt resource value: 0x7f0200e9 - public const int mr_ic_media_route_mono_dark = 2130837737; + public const int mr_ic_media_route_connecting_mono_light = 2130837737; // aapt resource value: 0x7f0200ea - public const int mr_ic_media_route_mono_light = 2130837738; + public const int mr_ic_media_route_mono_dark = 2130837738; // aapt resource value: 0x7f0200eb - public const int mr_ic_pause_dark = 2130837739; + public const int mr_ic_media_route_mono_light = 2130837739; // aapt resource value: 0x7f0200ec - public const int mr_ic_pause_light = 2130837740; + public const int mr_ic_pause_dark = 2130837740; // aapt resource value: 0x7f0200ed - public const int mr_ic_play_dark = 2130837741; + public const int mr_ic_pause_light = 2130837741; // aapt resource value: 0x7f0200ee - public const int mr_ic_play_light = 2130837742; + public const int mr_ic_play_dark = 2130837742; // aapt resource value: 0x7f0200ef - public const int note = 2130837743; + public const int mr_ic_play_light = 2130837743; // aapt resource value: 0x7f0200f0 - public const int notification_sm = 2130837744; - - // aapt resource value: 0x7f020103 - public const int notification_template_icon_bg = 2130837763; + public const int note = 2130837744; // aapt resource value: 0x7f0200f1 - public const int paperclip = 2130837745; + public const int notification_sm = 2130837745; + + // aapt resource value: 0x7f020104 + public const int notification_template_icon_bg = 2130837764; // aapt resource value: 0x7f0200f2 - public const int plus = 2130837746; + public const int paperclip = 2130837746; // aapt resource value: 0x7f0200f3 - public const int refresh = 2130837747; + public const int plus = 2130837747; // aapt resource value: 0x7f0200f4 - public const int roundedbg = 2130837748; + public const int refresh = 2130837748; // aapt resource value: 0x7f0200f5 - public const int roundedbgdark = 2130837749; + public const int roundedbg = 2130837749; // aapt resource value: 0x7f0200f6 - public const int search = 2130837750; + public const int roundedbgdark = 2130837750; // aapt resource value: 0x7f0200f7 - public const int share = 2130837751; + public const int search = 2130837751; // aapt resource value: 0x7f0200f8 - public const int share_tools = 2130837752; + public const int share = 2130837752; // aapt resource value: 0x7f0200f9 - public const int shield = 2130837753; + public const int share_tools = 2130837753; // aapt resource value: 0x7f0200fa - public const int splash_screen = 2130837754; + public const int shield = 2130837754; // aapt resource value: 0x7f0200fb - public const int star = 2130837755; + public const int splash_screen = 2130837755; // aapt resource value: 0x7f0200fc - public const int star_selected = 2130837756; + public const int star = 2130837756; // aapt resource value: 0x7f0200fd - public const int tools = 2130837757; + public const int star_selected = 2130837757; // aapt resource value: 0x7f0200fe - public const int tools_selected = 2130837758; + public const int tools = 2130837758; // aapt resource value: 0x7f0200ff - public const int trash = 2130837759; + public const int tools_selected = 2130837759; // aapt resource value: 0x7f020100 - public const int upload = 2130837760; + public const int trash = 2130837760; // aapt resource value: 0x7f020101 - public const int user = 2130837761; + public const int upload = 2130837761; // aapt resource value: 0x7f020102 - public const int yubikey = 2130837762; + public const int user = 2130837762; + + // aapt resource value: 0x7f020103 + public const int yubikey = 2130837763; static Drawable() { diff --git a/src/Android/Resources/drawable-hdpi/folder_o.png b/src/Android/Resources/drawable-hdpi/folder_o.png new file mode 100644 index 000000000..b66ec4df0 Binary files /dev/null and b/src/Android/Resources/drawable-hdpi/folder_o.png differ diff --git a/src/Android/Resources/drawable-xhdpi/folder_o.png b/src/Android/Resources/drawable-xhdpi/folder_o.png new file mode 100644 index 000000000..7393cfca5 Binary files /dev/null and b/src/Android/Resources/drawable-xhdpi/folder_o.png differ diff --git a/src/Android/Resources/drawable-xxhdpi/folder_o.png b/src/Android/Resources/drawable-xxhdpi/folder_o.png new file mode 100644 index 000000000..9d87a2052 Binary files /dev/null and b/src/Android/Resources/drawable-xxhdpi/folder_o.png differ diff --git a/src/Android/Resources/drawable-xxxhdpi/folder_o.png b/src/Android/Resources/drawable-xxxhdpi/folder_o.png new file mode 100644 index 000000000..68a5bac24 Binary files /dev/null and b/src/Android/Resources/drawable-xxxhdpi/folder_o.png differ diff --git a/src/Android/Resources/drawable/folder_o.png b/src/Android/Resources/drawable/folder_o.png new file mode 100644 index 000000000..8646e8368 Binary files /dev/null and b/src/Android/Resources/drawable/folder_o.png differ diff --git a/src/App/Controls/VaultGroupingViewCell.cs b/src/App/Controls/VaultGroupingViewCell.cs index dc9964c66..17b3d4681 100644 --- a/src/App/Controls/VaultGroupingViewCell.cs +++ b/src/App/Controls/VaultGroupingViewCell.cs @@ -70,7 +70,7 @@ namespace Bit.App.Controls { if(BindingContext is VaultListPageModel.Grouping grouping) { - Icon.Source = grouping.Folder ? "folder.png" : "cube.png"; + Icon.Source = grouping.Folder ? $"folder{(grouping.Id == null ? "_o" : string.Empty)}.png" : "cube.png"; } base.OnBindingContextChanged(); diff --git a/src/iOS/Resources/folder_o.png b/src/iOS/Resources/folder_o.png new file mode 100644 index 000000000..8646e8368 Binary files /dev/null and b/src/iOS/Resources/folder_o.png differ diff --git a/src/iOS/Resources/folder_o@2x.png b/src/iOS/Resources/folder_o@2x.png new file mode 100644 index 000000000..7393cfca5 Binary files /dev/null and b/src/iOS/Resources/folder_o@2x.png differ diff --git a/src/iOS/Resources/folder_o@3x.png b/src/iOS/Resources/folder_o@3x.png new file mode 100644 index 000000000..9d87a2052 Binary files /dev/null and b/src/iOS/Resources/folder_o@3x.png differ diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index 488622220..1435b48bf 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -826,6 +826,15 @@ + + + + + + + + +