diff --git a/media/css/reader.css b/media/css/reader.css index f7791dca3..f011b438c 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -518,7 +518,7 @@ body { top: 2px; } .NB-feedlist li.folder.NB-folder-collapsed .NB-folder-icon{ - background: transparent url('/media/embed/icons/circular/g_icn_folder.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/circular/g_icn_folder_rss.png') no-repeat 0 0; background-size: 16px; } @@ -3320,7 +3320,18 @@ background: transparent; } .NB-feeds-header-river-container .NB-feeds-header-icon { - background: transparent url('/media/embed/icons/silk/images.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/circular/ak-icon-allstories.png') no-repeat 0 0; + background-size: 16px; +} + +.NB-feeds-header-river-global .NB-feeds-header-icon { + background: transparent url('/media/embed/icons/circular/ak-icon-global.png') no-repeat 0 0; + background-size: 16px; +} + +.NB-feeds-header-river-blurblogs .NB-feeds-header-icon { + background: transparent url('/media/embed/icons/circular/ak-icon-blurblogs.png') no-repeat 0 0; + background-size: 16px; } .NB-feeds-header-river-container .NB-feeds-header-count { diff --git a/media/img/icons/circular/ak-icon-allstories.png b/media/img/icons/circular/ak-icon-allstories.png new file mode 100644 index 000000000..483b06c1d Binary files /dev/null and b/media/img/icons/circular/ak-icon-allstories.png differ diff --git a/media/img/icons/circular/ak-icon-blurblogs.png b/media/img/icons/circular/ak-icon-blurblogs.png new file mode 100644 index 000000000..c2d1bf9b9 Binary files /dev/null and b/media/img/icons/circular/ak-icon-blurblogs.png differ diff --git a/media/img/icons/circular/ak-icon-global.png b/media/img/icons/circular/ak-icon-global.png new file mode 100644 index 000000000..930f65739 Binary files /dev/null and b/media/img/icons/circular/ak-icon-global.png differ diff --git a/media/img/icons/circular/btn_icn_add_small_yellow.png b/media/img/icons/circular/btn_icn_add_small_yellow.png index 8bd97682e..34347e82b 100644 Binary files a/media/img/icons/circular/btn_icn_add_small_yellow.png and b/media/img/icons/circular/btn_icn_add_small_yellow.png differ diff --git a/media/img/icons/circular/btn_icn_intel_smalll_grey.png b/media/img/icons/circular/btn_icn_intel_smalll_grey.png index fe3da9db5..efced7c20 100644 Binary files a/media/img/icons/circular/btn_icn_intel_smalll_grey.png and b/media/img/icons/circular/btn_icn_intel_smalll_grey.png differ diff --git a/media/img/icons/circular/g_icn_arrow_down.png b/media/img/icons/circular/g_icn_arrow_down.png index fb712526c..a9367fbf5 100644 Binary files a/media/img/icons/circular/g_icn_arrow_down.png and b/media/img/icons/circular/g_icn_arrow_down.png differ diff --git a/media/img/icons/circular/g_icn_arrow_left.png b/media/img/icons/circular/g_icn_arrow_left.png new file mode 100644 index 000000000..d9ecaee46 Binary files /dev/null and b/media/img/icons/circular/g_icn_arrow_left.png differ diff --git a/media/img/icons/circular/g_icn_arrow_right.png b/media/img/icons/circular/g_icn_arrow_right.png index ea6686743..7f6dddc45 100644 Binary files a/media/img/icons/circular/g_icn_arrow_right.png and b/media/img/icons/circular/g_icn_arrow_right.png differ diff --git a/media/img/icons/circular/g_icn_arrow_up.png b/media/img/icons/circular/g_icn_arrow_up.png index b5e90b8b0..a93f70b37 100644 Binary files a/media/img/icons/circular/g_icn_arrow_up.png and b/media/img/icons/circular/g_icn_arrow_up.png differ diff --git a/media/img/icons/circular/g_icn_collapse.png b/media/img/icons/circular/g_icn_collapse.png index 564deb485..338a83d7f 100644 Binary files a/media/img/icons/circular/g_icn_collapse.png and b/media/img/icons/circular/g_icn_collapse.png differ diff --git a/media/img/icons/circular/g_icn_collapse_hover.png b/media/img/icons/circular/g_icn_collapse_hover.png index e982b94c5..3e37e0173 100644 Binary files a/media/img/icons/circular/g_icn_collapse_hover.png and b/media/img/icons/circular/g_icn_collapse_hover.png differ diff --git a/media/img/icons/circular/g_icn_expand.png b/media/img/icons/circular/g_icn_expand.png index c398477bf..fc801c8e3 100644 Binary files a/media/img/icons/circular/g_icn_expand.png and b/media/img/icons/circular/g_icn_expand.png differ diff --git a/media/img/icons/circular/g_icn_expand_hover.png b/media/img/icons/circular/g_icn_expand_hover.png index 6ea422355..710b0fc63 100644 Binary files a/media/img/icons/circular/g_icn_expand_hover.png and b/media/img/icons/circular/g_icn_expand_hover.png differ diff --git a/media/img/icons/circular/g_icn_focus.png b/media/img/icons/circular/g_icn_focus.png index 0c9d06f34..a1e971ca5 100644 Binary files a/media/img/icons/circular/g_icn_focus.png and b/media/img/icons/circular/g_icn_focus.png differ diff --git a/media/img/icons/circular/g_icn_folder.png b/media/img/icons/circular/g_icn_folder.png index 617eda28c..39f119dda 100644 Binary files a/media/img/icons/circular/g_icn_folder.png and b/media/img/icons/circular/g_icn_folder.png differ diff --git a/media/img/icons/circular/g_icn_folder_rss.png b/media/img/icons/circular/g_icn_folder_rss.png new file mode 100644 index 000000000..7e2992df6 Binary files /dev/null and b/media/img/icons/circular/g_icn_folder_rss.png differ diff --git a/media/img/icons/circular/g_icn_hidden.png b/media/img/icons/circular/g_icn_hidden.png new file mode 100644 index 000000000..78f1c2021 Binary files /dev/null and b/media/img/icons/circular/g_icn_hidden.png differ diff --git a/media/img/icons/circular/g_icn_unread.png b/media/img/icons/circular/g_icn_unread.png index c27199f2d..bcd0a9bd3 100644 Binary files a/media/img/icons/circular/g_icn_unread.png and b/media/img/icons/circular/g_icn_unread.png differ diff --git a/media/img/icons/circular/menu_icn_delete.png b/media/img/icons/circular/menu_icn_delete.png index 7737d3086..dc2123271 100644 Binary files a/media/img/icons/circular/menu_icn_delete.png and b/media/img/icons/circular/menu_icn_delete.png differ diff --git a/media/img/icons/circular/menu_icn_fetch.png b/media/img/icons/circular/menu_icn_fetch.png index 5d2a3e330..d0a324979 100644 Binary files a/media/img/icons/circular/menu_icn_fetch.png and b/media/img/icons/circular/menu_icn_fetch.png differ diff --git a/media/img/icons/circular/menu_icn_fetch_greyscale.png b/media/img/icons/circular/menu_icn_fetch_greyscale.png index 7492d1650..2600a862b 100644 Binary files a/media/img/icons/circular/menu_icn_fetch_greyscale.png and b/media/img/icons/circular/menu_icn_fetch_greyscale.png differ diff --git a/media/img/icons/circular/menu_icn_fetch_subscribers.png b/media/img/icons/circular/menu_icn_fetch_subscribers.png index 47e6f515a..e4531db97 100644 Binary files a/media/img/icons/circular/menu_icn_fetch_subscribers.png and b/media/img/icons/circular/menu_icn_fetch_subscribers.png differ diff --git a/media/img/icons/circular/menu_icn_lastupdated.png b/media/img/icons/circular/menu_icn_lastupdated.png index 53c5ec211..274903ed3 100644 Binary files a/media/img/icons/circular/menu_icn_lastupdated.png and b/media/img/icons/circular/menu_icn_lastupdated.png differ diff --git a/media/img/icons/circular/menu_icn_markread.png b/media/img/icons/circular/menu_icn_markread.png index 71e3b7f82..63c159104 100644 Binary files a/media/img/icons/circular/menu_icn_markread.png and b/media/img/icons/circular/menu_icn_markread.png differ diff --git a/media/img/icons/circular/menu_icn_move.png b/media/img/icons/circular/menu_icn_move.png index bb3f7b86a..6dc040d43 100644 Binary files a/media/img/icons/circular/menu_icn_move.png and b/media/img/icons/circular/menu_icn_move.png differ diff --git a/media/img/icons/circular/menu_icn_rename.png b/media/img/icons/circular/menu_icn_rename.png index 3d5aa6278..50a3cd86f 100644 Binary files a/media/img/icons/circular/menu_icn_rename.png and b/media/img/icons/circular/menu_icn_rename.png differ diff --git a/media/img/icons/circular/menu_icn_settings.png b/media/img/icons/circular/menu_icn_settings.png index ad69144d5..feae72b62 100644 Binary files a/media/img/icons/circular/menu_icn_settings.png and b/media/img/icons/circular/menu_icn_settings.png differ diff --git a/media/img/icons/circular/menu_icn_stats.png b/media/img/icons/circular/menu_icn_stats.png index 8e91760d8..3a9d378fc 100644 Binary files a/media/img/icons/circular/menu_icn_stats.png and b/media/img/icons/circular/menu_icn_stats.png differ diff --git a/media/img/icons/circular/menu_icn_train.png b/media/img/icons/circular/menu_icn_train.png index f58044a3f..255468af7 100644 Binary files a/media/img/icons/circular/menu_icn_train.png and b/media/img/icons/circular/menu_icn_train.png differ diff --git a/media/img/icons/circular/nav_icn_activity.png b/media/img/icons/circular/nav_icn_activity.png index ea75ca931..d71bca619 100644 Binary files a/media/img/icons/circular/nav_icn_activity.png and b/media/img/icons/circular/nav_icn_activity.png differ diff --git a/media/img/icons/circular/nav_icn_activity_active.png b/media/img/icons/circular/nav_icn_activity_active.png index 097c2c337..c3aa1b605 100644 Binary files a/media/img/icons/circular/nav_icn_activity_active.png and b/media/img/icons/circular/nav_icn_activity_active.png differ diff --git a/media/img/icons/circular/nav_icn_activity_hover.png b/media/img/icons/circular/nav_icn_activity_hover.png index d735ace32..585b20bca 100644 Binary files a/media/img/icons/circular/nav_icn_activity_hover.png and b/media/img/icons/circular/nav_icn_activity_hover.png differ diff --git a/media/img/icons/circular/nav_icn_add.png b/media/img/icons/circular/nav_icn_add.png index 3abf64075..807d3a9a9 100644 Binary files a/media/img/icons/circular/nav_icn_add.png and b/media/img/icons/circular/nav_icn_add.png differ diff --git a/media/img/icons/circular/nav_icn_dashboard.png b/media/img/icons/circular/nav_icn_dashboard.png index 6905f89cd..ecd3b799d 100644 Binary files a/media/img/icons/circular/nav_icn_dashboard.png and b/media/img/icons/circular/nav_icn_dashboard.png differ diff --git a/media/img/icons/circular/nav_icn_dashboard_active.png b/media/img/icons/circular/nav_icn_dashboard_active.png index 0963b21cf..21e255baa 100644 Binary files a/media/img/icons/circular/nav_icn_dashboard_active.png and b/media/img/icons/circular/nav_icn_dashboard_active.png differ diff --git a/media/img/icons/circular/nav_icn_dashboard_hover.png b/media/img/icons/circular/nav_icn_dashboard_hover.png index 066268ca1..f53c50871 100644 Binary files a/media/img/icons/circular/nav_icn_dashboard_hover.png and b/media/img/icons/circular/nav_icn_dashboard_hover.png differ diff --git a/media/img/icons/circular/nav_icn_markread.png b/media/img/icons/circular/nav_icn_markread.png index c11102ac3..429d5c7fb 100644 Binary files a/media/img/icons/circular/nav_icn_markread.png and b/media/img/icons/circular/nav_icn_markread.png differ diff --git a/media/img/icons/circular/nav_icn_markread_active.png b/media/img/icons/circular/nav_icn_markread_active.png index b4f5da76c..384bc2be6 100644 Binary files a/media/img/icons/circular/nav_icn_markread_active.png and b/media/img/icons/circular/nav_icn_markread_active.png differ diff --git a/media/img/icons/circular/nav_icn_markread_hover.png b/media/img/icons/circular/nav_icn_markread_hover.png index 7c4c01b56..493f50159 100644 Binary files a/media/img/icons/circular/nav_icn_markread_hover.png and b/media/img/icons/circular/nav_icn_markread_hover.png differ diff --git a/media/img/icons/circular/nav_icn_settings.png b/media/img/icons/circular/nav_icn_settings.png index 684c04a40..3f345a1e6 100644 Binary files a/media/img/icons/circular/nav_icn_settings.png and b/media/img/icons/circular/nav_icn_settings.png differ diff --git a/media/img/icons/circular/nav_next.png b/media/img/icons/circular/nav_next.png new file mode 100644 index 000000000..347af8d99 Binary files /dev/null and b/media/img/icons/circular/nav_next.png differ diff --git a/media/img/icons/circular/nav_next_hover.png b/media/img/icons/circular/nav_next_hover.png new file mode 100644 index 000000000..fa0b46317 Binary files /dev/null and b/media/img/icons/circular/nav_next_hover.png differ diff --git a/media/img/icons/circular/nav_prev.png b/media/img/icons/circular/nav_prev.png new file mode 100644 index 000000000..7f5e53f45 Binary files /dev/null and b/media/img/icons/circular/nav_prev.png differ diff --git a/media/img/icons/circular/nav_prev_hover.png b/media/img/icons/circular/nav_prev_hover.png new file mode 100644 index 000000000..edcb68fdb Binary files /dev/null and b/media/img/icons/circular/nav_prev_hover.png differ diff --git a/media/img/icons/circular/nav_story_feed.png b/media/img/icons/circular/nav_story_feed.png index 40d5e2027..ec6eb3f53 100644 Binary files a/media/img/icons/circular/nav_story_feed.png and b/media/img/icons/circular/nav_story_feed.png differ diff --git a/media/img/icons/circular/nav_story_feed_active.png b/media/img/icons/circular/nav_story_feed_active.png index 3c851f20b..f449a30bd 100644 Binary files a/media/img/icons/circular/nav_story_feed_active.png and b/media/img/icons/circular/nav_story_feed_active.png differ diff --git a/media/img/icons/circular/nav_story_feed_hover.png b/media/img/icons/circular/nav_story_feed_hover.png index 88ab43081..3335fa126 100644 Binary files a/media/img/icons/circular/nav_story_feed_hover.png and b/media/img/icons/circular/nav_story_feed_hover.png differ diff --git a/media/img/icons/circular/nav_story_orginal.png b/media/img/icons/circular/nav_story_orginal.png index f54fcd7db..6df88c1c0 100644 Binary files a/media/img/icons/circular/nav_story_orginal.png and b/media/img/icons/circular/nav_story_orginal.png differ diff --git a/media/img/icons/circular/nav_story_original_active.png b/media/img/icons/circular/nav_story_original_active.png new file mode 100644 index 000000000..cf93dece9 Binary files /dev/null and b/media/img/icons/circular/nav_story_original_active.png differ diff --git a/media/img/icons/circular/nav_story_original_hover.png b/media/img/icons/circular/nav_story_original_hover.png new file mode 100644 index 000000000..4959bc8d3 Binary files /dev/null and b/media/img/icons/circular/nav_story_original_hover.png differ diff --git a/media/img/icons/circular/nav_story_story.png b/media/img/icons/circular/nav_story_story.png index 8b6d53ee8..494d6e5e5 100644 Binary files a/media/img/icons/circular/nav_story_story.png and b/media/img/icons/circular/nav_story_story.png differ diff --git a/media/img/icons/circular/nav_story_story_active.png b/media/img/icons/circular/nav_story_story_active.png index 462d5f074..8ed0f3a7b 100644 Binary files a/media/img/icons/circular/nav_story_story_active.png and b/media/img/icons/circular/nav_story_story_active.png differ diff --git a/media/img/icons/circular/nav_story_story_hover.png b/media/img/icons/circular/nav_story_story_hover.png new file mode 100644 index 000000000..4dfe3e85d Binary files /dev/null and b/media/img/icons/circular/nav_story_story_hover.png differ diff --git a/media/img/icons/circular/nav_story_text.png b/media/img/icons/circular/nav_story_text.png new file mode 100644 index 000000000..552208b45 Binary files /dev/null and b/media/img/icons/circular/nav_story_text.png differ diff --git a/media/img/icons/circular/nav_story_text_active.png b/media/img/icons/circular/nav_story_text_active.png new file mode 100644 index 000000000..e33f6c785 Binary files /dev/null and b/media/img/icons/circular/nav_story_text_active.png differ diff --git a/media/img/icons/circular/nav_story_text_hover.png b/media/img/icons/circular/nav_story_text_hover.png new file mode 100644 index 000000000..6164b654c Binary files /dev/null and b/media/img/icons/circular/nav_story_text_hover.png differ diff --git a/media/img/icons/circular/newuser_icn_avatar.png b/media/img/icons/circular/newuser_icn_avatar.png index d04aed5d1..0eeb85dd9 100644 Binary files a/media/img/icons/circular/newuser_icn_avatar.png and b/media/img/icons/circular/newuser_icn_avatar.png differ diff --git a/media/img/icons/circular/newuser_icn_setup.png b/media/img/icons/circular/newuser_icn_setup.png index 12e8a24d8..ade7cb80e 100644 Binary files a/media/img/icons/circular/newuser_icn_setup.png and b/media/img/icons/circular/newuser_icn_setup.png differ diff --git a/media/img/icons/circular/newuser_icn_sharewith_active.png b/media/img/icons/circular/newuser_icn_sharewith_active.png index 10a36f755..0b2346dfa 100644 Binary files a/media/img/icons/circular/newuser_icn_sharewith_active.png and b/media/img/icons/circular/newuser_icn_sharewith_active.png differ diff --git a/media/img/icons/circular/newuser_icn_sharewith_inactive.png b/media/img/icons/circular/newuser_icn_sharewith_inactive.png index 20a757b64..651310086 100644 Binary files a/media/img/icons/circular/newuser_icn_sharewith_inactive.png and b/media/img/icons/circular/newuser_icn_sharewith_inactive.png differ diff --git a/media/img/icons/circular/newuser_icn_train.png b/media/img/icons/circular/newuser_icn_train.png index 401d4cd43..3081185f3 100644 Binary files a/media/img/icons/circular/newuser_icn_train.png and b/media/img/icons/circular/newuser_icn_train.png differ diff --git a/media/img/icons/circular/retina/btn_icn_add_small_yellow.png b/media/img/icons/circular/retina/btn_icn_add_small_yellow.png new file mode 100644 index 000000000..8bd97682e Binary files /dev/null and b/media/img/icons/circular/retina/btn_icn_add_small_yellow.png differ diff --git a/media/img/icons/circular/retina/btn_icn_intel_smalll_grey.png b/media/img/icons/circular/retina/btn_icn_intel_smalll_grey.png new file mode 100644 index 000000000..fe3da9db5 Binary files /dev/null and b/media/img/icons/circular/retina/btn_icn_intel_smalll_grey.png differ diff --git a/media/img/icons/circular/retina/g_icn_arrow_down.png b/media/img/icons/circular/retina/g_icn_arrow_down.png new file mode 100644 index 000000000..fb712526c Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_arrow_down.png differ diff --git a/media/img/icons/circular/retina/g_icn_arrow_right.png b/media/img/icons/circular/retina/g_icn_arrow_right.png new file mode 100644 index 000000000..ea6686743 Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_arrow_right.png differ diff --git a/media/img/icons/circular/retina/g_icn_arrow_up.png b/media/img/icons/circular/retina/g_icn_arrow_up.png new file mode 100644 index 000000000..b5e90b8b0 Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_arrow_up.png differ diff --git a/media/img/icons/circular/retina/g_icn_collapse.png b/media/img/icons/circular/retina/g_icn_collapse.png new file mode 100644 index 000000000..564deb485 Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_collapse.png differ diff --git a/media/img/icons/circular/retina/g_icn_collapse_hover.png b/media/img/icons/circular/retina/g_icn_collapse_hover.png new file mode 100644 index 000000000..e982b94c5 Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_collapse_hover.png differ diff --git a/media/img/icons/circular/retina/g_icn_expand.png b/media/img/icons/circular/retina/g_icn_expand.png new file mode 100644 index 000000000..c398477bf Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_expand.png differ diff --git a/media/img/icons/circular/retina/g_icn_expand_hover.png b/media/img/icons/circular/retina/g_icn_expand_hover.png new file mode 100644 index 000000000..6ea422355 Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_expand_hover.png differ diff --git a/media/img/icons/circular/retina/g_icn_focus.png b/media/img/icons/circular/retina/g_icn_focus.png new file mode 100644 index 000000000..0c9d06f34 Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_focus.png differ diff --git a/media/img/icons/circular/retina/g_icn_folder.png b/media/img/icons/circular/retina/g_icn_folder.png new file mode 100644 index 000000000..617eda28c Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_folder.png differ diff --git a/media/img/icons/circular/retina/g_icn_unread.png b/media/img/icons/circular/retina/g_icn_unread.png new file mode 100644 index 000000000..c27199f2d Binary files /dev/null and b/media/img/icons/circular/retina/g_icn_unread.png differ diff --git a/media/img/icons/circular/retina/menu_icn_delete.png b/media/img/icons/circular/retina/menu_icn_delete.png new file mode 100644 index 000000000..7737d3086 Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_delete.png differ diff --git a/media/img/icons/circular/retina/menu_icn_fetch.png b/media/img/icons/circular/retina/menu_icn_fetch.png new file mode 100644 index 000000000..5d2a3e330 Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_fetch.png differ diff --git a/media/img/icons/circular/retina/menu_icn_fetch_greyscale.png b/media/img/icons/circular/retina/menu_icn_fetch_greyscale.png new file mode 100644 index 000000000..7492d1650 Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_fetch_greyscale.png differ diff --git a/media/img/icons/circular/retina/menu_icn_fetch_subscribers.png b/media/img/icons/circular/retina/menu_icn_fetch_subscribers.png new file mode 100644 index 000000000..47e6f515a Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_fetch_subscribers.png differ diff --git a/media/img/icons/circular/retina/menu_icn_lastupdated.png b/media/img/icons/circular/retina/menu_icn_lastupdated.png new file mode 100644 index 000000000..53c5ec211 Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_lastupdated.png differ diff --git a/media/img/icons/circular/retina/menu_icn_markread.png b/media/img/icons/circular/retina/menu_icn_markread.png new file mode 100644 index 000000000..71e3b7f82 Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_markread.png differ diff --git a/media/img/icons/circular/retina/menu_icn_move.png b/media/img/icons/circular/retina/menu_icn_move.png new file mode 100644 index 000000000..bb3f7b86a Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_move.png differ diff --git a/media/img/icons/circular/retina/menu_icn_rename.png b/media/img/icons/circular/retina/menu_icn_rename.png new file mode 100644 index 000000000..3d5aa6278 Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_rename.png differ diff --git a/media/img/icons/circular/retina/menu_icn_settings.png b/media/img/icons/circular/retina/menu_icn_settings.png new file mode 100644 index 000000000..ad69144d5 Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_settings.png differ diff --git a/media/img/icons/circular/retina/menu_icn_stats.png b/media/img/icons/circular/retina/menu_icn_stats.png new file mode 100644 index 000000000..8e91760d8 Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_stats.png differ diff --git a/media/img/icons/circular/retina/menu_icn_train.png b/media/img/icons/circular/retina/menu_icn_train.png new file mode 100644 index 000000000..f58044a3f Binary files /dev/null and b/media/img/icons/circular/retina/menu_icn_train.png differ diff --git a/media/img/icons/circular/retina/nav_icn_activity.png b/media/img/icons/circular/retina/nav_icn_activity.png new file mode 100644 index 000000000..ea75ca931 Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_activity.png differ diff --git a/media/img/icons/circular/retina/nav_icn_activity_active.png b/media/img/icons/circular/retina/nav_icn_activity_active.png new file mode 100644 index 000000000..097c2c337 Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_activity_active.png differ diff --git a/media/img/icons/circular/retina/nav_icn_activity_hover.png b/media/img/icons/circular/retina/nav_icn_activity_hover.png new file mode 100644 index 000000000..d735ace32 Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_activity_hover.png differ diff --git a/media/img/icons/circular/retina/nav_icn_add.png b/media/img/icons/circular/retina/nav_icn_add.png new file mode 100644 index 000000000..3abf64075 Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_add.png differ diff --git a/media/img/icons/circular/retina/nav_icn_dashboard.png b/media/img/icons/circular/retina/nav_icn_dashboard.png new file mode 100644 index 000000000..6905f89cd Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_dashboard.png differ diff --git a/media/img/icons/circular/retina/nav_icn_dashboard_active.png b/media/img/icons/circular/retina/nav_icn_dashboard_active.png new file mode 100644 index 000000000..0963b21cf Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_dashboard_active.png differ diff --git a/media/img/icons/circular/retina/nav_icn_dashboard_hover.png b/media/img/icons/circular/retina/nav_icn_dashboard_hover.png new file mode 100644 index 000000000..066268ca1 Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_dashboard_hover.png differ diff --git a/media/img/icons/circular/retina/nav_icn_markread.png b/media/img/icons/circular/retina/nav_icn_markread.png new file mode 100644 index 000000000..c11102ac3 Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_markread.png differ diff --git a/media/img/icons/circular/retina/nav_icn_markread_active.png b/media/img/icons/circular/retina/nav_icn_markread_active.png new file mode 100644 index 000000000..b4f5da76c Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_markread_active.png differ diff --git a/media/img/icons/circular/retina/nav_icn_markread_hover.png b/media/img/icons/circular/retina/nav_icn_markread_hover.png new file mode 100644 index 000000000..7c4c01b56 Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_markread_hover.png differ diff --git a/media/img/icons/circular/retina/nav_icn_settings.png b/media/img/icons/circular/retina/nav_icn_settings.png new file mode 100644 index 000000000..684c04a40 Binary files /dev/null and b/media/img/icons/circular/retina/nav_icn_settings.png differ diff --git a/media/img/icons/circular/retina/nav_story_feed.png b/media/img/icons/circular/retina/nav_story_feed.png new file mode 100644 index 000000000..40d5e2027 Binary files /dev/null and b/media/img/icons/circular/retina/nav_story_feed.png differ diff --git a/media/img/icons/circular/retina/nav_story_feed_active.png b/media/img/icons/circular/retina/nav_story_feed_active.png new file mode 100644 index 000000000..3c851f20b Binary files /dev/null and b/media/img/icons/circular/retina/nav_story_feed_active.png differ diff --git a/media/img/icons/circular/retina/nav_story_feed_hover.png b/media/img/icons/circular/retina/nav_story_feed_hover.png new file mode 100644 index 000000000..88ab43081 Binary files /dev/null and b/media/img/icons/circular/retina/nav_story_feed_hover.png differ diff --git a/media/img/icons/circular/retina/nav_story_orginal.png b/media/img/icons/circular/retina/nav_story_orginal.png new file mode 100644 index 000000000..f54fcd7db Binary files /dev/null and b/media/img/icons/circular/retina/nav_story_orginal.png differ diff --git a/media/img/icons/circular/nav_story_orginal_active.png b/media/img/icons/circular/retina/nav_story_orginal_active.png similarity index 100% rename from media/img/icons/circular/nav_story_orginal_active.png rename to media/img/icons/circular/retina/nav_story_orginal_active.png diff --git a/media/img/icons/circular/nav_story_orginal_hover.png b/media/img/icons/circular/retina/nav_story_orginal_hover.png similarity index 100% rename from media/img/icons/circular/nav_story_orginal_hover.png rename to media/img/icons/circular/retina/nav_story_orginal_hover.png diff --git a/media/img/icons/circular/retina/nav_story_story.png b/media/img/icons/circular/retina/nav_story_story.png new file mode 100644 index 000000000..8b6d53ee8 Binary files /dev/null and b/media/img/icons/circular/retina/nav_story_story.png differ diff --git a/media/img/icons/circular/retina/nav_story_story_active.png b/media/img/icons/circular/retina/nav_story_story_active.png new file mode 100644 index 000000000..462d5f074 Binary files /dev/null and b/media/img/icons/circular/retina/nav_story_story_active.png differ diff --git a/media/img/icons/circular/retina/newuser_icn_avatar.png b/media/img/icons/circular/retina/newuser_icn_avatar.png new file mode 100644 index 000000000..d04aed5d1 Binary files /dev/null and b/media/img/icons/circular/retina/newuser_icn_avatar.png differ diff --git a/media/img/icons/circular/retina/newuser_icn_setup.png b/media/img/icons/circular/retina/newuser_icn_setup.png new file mode 100644 index 000000000..12e8a24d8 Binary files /dev/null and b/media/img/icons/circular/retina/newuser_icn_setup.png differ diff --git a/media/img/icons/circular/retina/newuser_icn_sharewith_active.png b/media/img/icons/circular/retina/newuser_icn_sharewith_active.png new file mode 100644 index 000000000..10a36f755 Binary files /dev/null and b/media/img/icons/circular/retina/newuser_icn_sharewith_active.png differ diff --git a/media/img/icons/circular/retina/newuser_icn_sharewith_inactive.png b/media/img/icons/circular/retina/newuser_icn_sharewith_inactive.png new file mode 100644 index 000000000..20a757b64 Binary files /dev/null and b/media/img/icons/circular/retina/newuser_icn_sharewith_inactive.png differ diff --git a/media/img/icons/circular/retina/newuser_icn_train.png b/media/img/icons/circular/retina/newuser_icn_train.png new file mode 100644 index 000000000..401d4cd43 Binary files /dev/null and b/media/img/icons/circular/retina/newuser_icn_train.png differ diff --git a/media/img/icons/circular/story_save.png b/media/img/icons/circular/story_save.png new file mode 100644 index 000000000..3dbcdfd3a Binary files /dev/null and b/media/img/icons/circular/story_save.png differ diff --git a/media/img/icons/circular/story_share.png b/media/img/icons/circular/story_share.png new file mode 100644 index 000000000..17738db3e Binary files /dev/null and b/media/img/icons/circular/story_share.png differ diff --git a/media/ios/Classes/FeedDetailTableCell.m b/media/ios/Classes/FeedDetailTableCell.m index 138b6b4b2..52f0f5007 100644 --- a/media/ios/Classes/FeedDetailTableCell.m +++ b/media/ios/Classes/FeedDetailTableCell.m @@ -32,7 +32,7 @@ static UIFont *indicatorFont = nil; @synthesize hasAlpha; -#define leftMargin 26 +#define leftMargin 30 #define rightMargin 18 @@ -86,7 +86,7 @@ static UIFont *indicatorFont = nil; if (self.isRiverOrSocial) { [self.siteTitle - drawInRect:CGRectMake(leftMargin + 20, 7, rect.size.width - 20, 21) + drawInRect:CGRectMake(leftMargin + 20, 7, rect.size.width - 20, 21) withFont:font lineBreakMode:UILineBreakModeTailTruncation alignment:UITextAlignmentLeft]; @@ -167,11 +167,11 @@ static UIFont *indicatorFont = nil; // feed bar - CGContextSetStrokeColor(context, CGColorGetComponents([self.feedColorBarTopBorder CGColor])); //feedColorBarTopBorder + CGContextSetStrokeColor(context, CGColorGetComponents([self.feedColorBarTopBorder CGColor])); if (self.isRead) { - CGContextSetAlpha(context, 0.25); + CGContextSetAlpha(context, 0.15); } - CGContextSetLineWidth(context, 6.0f); + CGContextSetLineWidth(context, 4.0f); CGContextBeginPath(context); CGContextMoveToPoint(context, 3.0f, 1.0f); CGContextAddLineToPoint(context, 3.0f, self.frame.size.height - 1); @@ -179,8 +179,8 @@ static UIFont *indicatorFont = nil; CGContextSetStrokeColor(context, CGColorGetComponents([self.feedColorBar CGColor])); CGContextBeginPath(context); - CGContextMoveToPoint(context, 9.0f, 1.0f); - CGContextAddLineToPoint(context, 9.0, self.frame.size.height - 1); + CGContextMoveToPoint(context, 7.0f, 1.0f); + CGContextAddLineToPoint(context, 7.0, self.frame.size.height - 1); CGContextStrokePath(context); // reset for borders @@ -233,23 +233,16 @@ static UIFont *indicatorFont = nil; storyIndicatorY = 4 + adjustForSocial - 5 ; } - UIColor *scoreColor; + UIImage *unreadIcon; if (storyScore == -1) { - scoreColor = UIColorFromRGB(0xCC2A2E); - } else if (storyScore == 0) { - scoreColor = UIColorFromRGB(0xF9C72A); + unreadIcon = [UIImage imageNamed:@"g_icn_hidden"]; + } else if (storyScore == 1) { + unreadIcon = [UIImage imageNamed:@"g_icn_focus"]; } else { - scoreColor = UIColorFromRGB(0x3B7613); - } - CGContextSetFillColorWithColor(context, UIColorFromRGB(0xf4f4f4).CGColor); - CGContextFillEllipseInRect(context, CGRectMake(7, storyIndicatorY + 12, 12, 12)); - - if (self.isRead) { - CGContextSetAlpha(context, 0.25); + unreadIcon = [UIImage imageNamed:@"g_icn_unread"]; } - CGContextSetFillColorWithColor(context, scoreColor.CGColor); - CGContextFillEllipseInRect(context, CGRectMake(9, storyIndicatorY + 14, 8, 8)); + [unreadIcon drawInRect:CGRectMake(15, storyIndicatorY + 14, 8, 8) blendMode:nil alpha:(self.isRead ? .15 : 1)]; } - (UIImage *)imageByApplyingAlpha:(UIImage *)image withAlpha:(CGFloat) alpha { diff --git a/media/ios/Classes/FolderTitleView.m b/media/ios/Classes/FolderTitleView.m index 52f4038b9..1360d28f3 100644 --- a/media/ios/Classes/FolderTitleView.m +++ b/media/ios/Classes/FolderTitleView.m @@ -158,15 +158,22 @@ UIImage *folderImage; int folderImageViewX = 10; - if (section == 0 || section == 1) { - folderImage = [UIImage imageNamed:@"group.png"]; + if (section == 0) { + folderImage = [UIImage imageNamed:@"ak-icon-global.png"]; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + folderImageViewX = 10; + } else { + folderImageViewX = 8; + } + } else if (section == 1) { + folderImage = [UIImage imageNamed:@"ak-icon-blurblogs.png"]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { folderImageViewX = 10; } else { folderImageViewX = 8; } } else if (section == 2) { - folderImage = [UIImage imageNamed:@"archive.png"]; + folderImage = [UIImage imageNamed:@"ak-icon-allstories.png"]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { folderImageViewX = 10; } else { @@ -181,9 +188,9 @@ } } else { if (isFolderCollapsed) { - folderImage = [UIImage imageNamed:@"folder_collapsed.png"]; + folderImage = [UIImage imageNamed:@"g_icn_folder_rss"]; } else { - folderImage = [UIImage imageNamed:@"folder_2.png"]; + folderImage = [UIImage imageNamed:@"g_icn_folder"]; } if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { } else { diff --git a/media/ios/Classes/NewsBlurAppDelegate.h b/media/ios/Classes/NewsBlurAppDelegate.h index 929cf25d4..5ac823324 100644 --- a/media/ios/Classes/NewsBlurAppDelegate.h +++ b/media/ios/Classes/NewsBlurAppDelegate.h @@ -291,7 +291,6 @@ - (NSString *)extractParentFolderName:(NSString *)folderName; - (NSDictionary *)getFeed:(NSString *)feedId; -+ (CGGradientRef)makeGradientCGRef:(UIColor *)startColor endColor:(UIColor *)endColor; + (void)fillGradient:(CGRect)r startColor:(UIColor *)startColor endColor:(UIColor *)endColor; + (UIView *)makeGradientView:(CGRect)rect startColor:(NSString *)start endColor:(NSString *)end; - (UIView *)makeFeedTitleGradient:(NSDictionary *)feed withRect:(CGRect)rect; diff --git a/media/ios/Classes/NewsBlurAppDelegate.m b/media/ios/Classes/NewsBlurAppDelegate.m index 40410caa8..ee67ecc93 100644 --- a/media/ios/Classes/NewsBlurAppDelegate.m +++ b/media/ios/Classes/NewsBlurAppDelegate.m @@ -1052,8 +1052,10 @@ // Nothing for global } else if ([folderName isEqual:@"everything"] || (!folderName && [self.activeFolder isEqual:@"everything"])) { - for (id feedId in self.dictFeeds) { - [counts addCounts:[self splitUnreadCountForFeed:feedId]]; + for (NSArray *folder in [self.dictFolders allValues]) { + for (id feedId in folder) { + [counts addCounts:[self splitUnreadCountForFeed:feedId]]; + } } } else { if (!folderName) { @@ -1534,8 +1536,11 @@ #pragma mark - #pragma mark Feed Templates -+ (CGGradientRef)makeGradientCGRef:(UIColor *)startColor endColor:(UIColor *)endColor { - CGGradientRef result; ++ (void)fillGradient:(CGRect)r startColor:(UIColor *)startColor endColor:(UIColor *)endColor { + CGContextRef context = UIGraphicsGetCurrentContext(); + UIGraphicsPushContext(context); + + CGGradientRef gradient; CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); CGFloat locations[2] = {0.0f, 1.0f}; CGFloat startRed, startGreen, startBlue, startAlpha; @@ -1548,21 +1553,14 @@ startRed, startGreen, startBlue, startAlpha, endRed, endGreen, endBlue, endAlpha }; - result = CGGradientCreateWithColorComponents(colorSpace, components, locations, 2); + gradient = CGGradientCreateWithColorComponents(colorSpace, components, locations, 2); CGColorSpaceRelease(colorSpace); - return result; -} - -+ (void)fillGradient:(CGRect)r startColor:(UIColor *)startColor endColor:(UIColor *)endColor { - CGContextRef context = UIGraphicsGetCurrentContext(); - UIGraphicsPushContext(context); - CGGradientRef gradient = [self makeGradientCGRef:startColor endColor:endColor]; - CGPoint startPoint = CGPointMake(CGRectGetMinX(r), r.origin.y); CGPoint endPoint = CGPointMake(startPoint.x, r.origin.y + r.size.height); CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 0); + CGGradientRelease(gradient); UIGraphicsPopContext(); } @@ -1692,14 +1690,16 @@ titleLabel.center = CGPointMake(28, -2); NSString *feedIdStr = [NSString stringWithFormat:@"%@", [feed objectForKey:@"id"]]; UIImage *titleImage; - if (self.isSocialRiverView) { - titleImage = [UIImage imageNamed:@"group_white.png"]; + if (self.isSocialRiverView && [self.activeFolder isEqualToString:@"river_global"]) { + titleImage = [UIImage imageNamed:@"ak-icon-global.png"]; + } else if (self.isSocialRiverView && [self.activeFolder isEqualToString:@"river_blurblogs"]) { + titleImage = [UIImage imageNamed:@"ak-icon-blurblogs.png"]; } else if (self.isRiverView && [self.activeFolder isEqualToString:@"everything"]) { - titleImage = [UIImage imageNamed:@"archive_white.png"]; + titleImage = [UIImage imageNamed:@"ak-icon-allstories.png"]; } else if (self.isRiverView && [self.activeFolder isEqualToString:@"saved_stories"]) { - titleImage = [UIImage imageNamed:@"clock_white.png"]; + titleImage = [UIImage imageNamed:@"clock.png"]; } else if (self.isRiverView) { - titleImage = [UIImage imageNamed:@"folder_white.png"]; + titleImage = [UIImage imageNamed:@"ak-icon-folder-open.png"]; } else { titleImage = [Utilities getImage:feedIdStr]; } diff --git a/media/ios/Classes/NewsBlurViewController.m b/media/ios/Classes/NewsBlurViewController.m index 5ec1107f3..fc9076c75 100644 --- a/media/ios/Classes/NewsBlurViewController.m +++ b/media/ios/Classes/NewsBlurViewController.m @@ -1338,13 +1338,13 @@ heightForHeaderInSection:(NSInteger)section { [appDelegate.folderCountCache removeObjectForKey:@"everything"]; UnreadCounts *counts = [appDelegate splitUnreadCountForFolder:@"everything"]; - UIImageView *yellow = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bullet_yellow.png"]]; - yellow.frame = CGRectMake(-4, userLabel.frame.origin.y + userLabel.frame.size.height, 16, 16); + UIImageView *yellow = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"g_icn_unread"]]; + yellow.frame = CGRectMake(0, userLabel.frame.origin.y + userLabel.frame.size.height + 4, 8, 8); [userInfoView addSubview:yellow]; UILabel *neutralCount = [[UILabel alloc] init]; - neutralCount.frame = CGRectMake(yellow.frame.size.width + yellow.frame.origin.x - 2, - yellow.frame.origin.y + 1, 100, 16); + neutralCount.frame = CGRectMake(yellow.frame.size.width + yellow.frame.origin.x + 2, + yellow.frame.origin.y - 3, 100, 16); neutralCount.text = [NSString stringWithFormat:@"%d", counts.nt]; neutralCount.font = [UIFont fontWithName:@"Helvetica-Bold" size:11]; neutralCount.textColor = UIColorFromRGB(0x707070); @@ -1352,14 +1352,14 @@ heightForHeaderInSection:(NSInteger)section { [neutralCount sizeToFit]; [userInfoView addSubview:neutralCount]; - UIImageView *green = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bullet_green.png"]]; - green.frame = CGRectMake(neutralCount.frame.origin.x + neutralCount.frame.size.width + 4, - yellow.frame.origin.y, 16, 16); + UIImageView *green = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"g_icn_focus"]]; + green.frame = CGRectMake(neutralCount.frame.origin.x + neutralCount.frame.size.width + 8, + yellow.frame.origin.y, 8, 8); [userInfoView addSubview:green]; UILabel *positiveCount = [[UILabel alloc] init]; - positiveCount.frame = CGRectMake(green.frame.size.width + green.frame.origin.x - 2, - green.frame.origin.y + 1, 100, 16); + positiveCount.frame = CGRectMake(green.frame.size.width + green.frame.origin.x + 2, + green.frame.origin.y - 3, 100, 16); positiveCount.text = [NSString stringWithFormat:@"%d", counts.ps]; positiveCount.font = [UIFont fontWithName:@"Helvetica-Bold" size:11]; positiveCount.textColor = UIColorFromRGB(0x707070); diff --git a/media/ios/Classes/StoryPageControl.m b/media/ios/Classes/StoryPageControl.m index 4b8fee41a..7407cf604 100644 --- a/media/ios/Classes/StoryPageControl.m +++ b/media/ios/Classes/StoryPageControl.m @@ -145,14 +145,16 @@ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { if (!appDelegate.isSocialView) { UIImage *titleImage; - if (appDelegate.isSocialRiverView) { - titleImage = [UIImage imageNamed:@"group_white.png"]; + if (appDelegate.isSocialRiverView && [appDelegate.activeFolder isEqualToString:@"river_global"]) { + titleImage = [UIImage imageNamed:@"ak-icon-global.png"]; + } else if (appDelegate.isSocialRiverView && [appDelegate.activeFolder isEqualToString:@"river_blurblogs"]) { + titleImage = [UIImage imageNamed:@"ak-icon-blurblogs.png"]; } else if (appDelegate.isRiverView && [appDelegate.activeFolder isEqualToString:@"everything"]) { - titleImage = [UIImage imageNamed:@"archive_white.png"]; + titleImage = [UIImage imageNamed:@"ak-icon-allstories.png"]; } else if (appDelegate.isRiverView && [appDelegate.activeFolder isEqualToString:@"saved_stories"]) { - titleImage = [UIImage imageNamed:@"clock_white.png"]; + titleImage = [UIImage imageNamed:@"clock.png"]; } else if (appDelegate.isRiverView) { - titleImage = [UIImage imageNamed:@"folder_white.png"]; + titleImage = [UIImage imageNamed:@"ak-icon-folder-open.png"]; } else { NSString *feedIdStr = [NSString stringWithFormat:@"%@", [appDelegate.activeStory objectForKey:@"story_feed_id"]]; diff --git a/media/ios/Classes/UnreadCountView.m b/media/ios/Classes/UnreadCountView.m index 3c69b0bcc..e42fb246e 100644 --- a/media/ios/Classes/UnreadCountView.m +++ b/media/ios/Classes/UnreadCountView.m @@ -12,9 +12,7 @@ static UIFont *indicatorFont = nil; static UIColor *indicatorWhiteColor = nil; -static UIColor *indicatorWhiteShadowColor = nil; static UIColor *indicatorBlackColor = nil; -static UIColor *indicatorBlackShadowColor = nil; static UIColor *positiveBackgroundColor = nil; static UIColor *neutralBackgroundColor = nil; static UIColor *positiveBackgroundShadowColor = nil; @@ -36,18 +34,16 @@ const int COUNT_HEIGHT = 15; indicatorFont = [UIFont boldSystemFontOfSize:12]; indicatorWhiteColor = [UIColor whiteColor]; indicatorBlackColor = [UIColor blackColor]; - indicatorWhiteShadowColor = UIColorFromRGB(0xFFF6B2); - indicatorBlackShadowColor = UIColorFromRGB(0x4E872A); UIColor *ps = UIColorFromRGB(0x6EA74A); - UIColor *nt = UIColorFromRGB(0xFEE692); + UIColor *nt = UIColorFromRGB(0xB3B6AD); UIColor *ng = UIColorFromRGB(0xCC2A2E); UIColor *blue = UIColorFromRGB(0x11448B); positiveBackgroundColor = ps; neutralBackgroundColor = nt; positiveBackgroundShadowColor = UIColorFromRGB(0x4E872A); negativeBackgroundColor = ng; - neutralBackgroundShadowColor = UIColorFromRGB(0xDEC672); + neutralBackgroundShadowColor = UIColorFromRGB(0x93968D); blueBackgroundColor = blue; blueBackgroundShadowColor = UIColorFromRGB(0x01346B); // UIColor *psGrad = UIColorFromRGB(0x559F4D); @@ -119,7 +115,7 @@ const int COUNT_HEIGHT = 15; if (blueCount) { [indicatorBlackColor set]; } else { - [indicatorBlackShadowColor set]; + [positiveBackgroundShadowColor set]; } [psStr drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos + 1) @@ -161,12 +157,12 @@ const int COUNT_HEIGHT = 15; float x_pos = (rr.size.width - size.width) / 2; float y_pos = (rr.size.height - size.height) / 2; - [indicatorWhiteShadowColor set]; + [neutralBackgroundShadowColor set]; [ntStr drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos + 1) withFont:indicatorFont]; - [indicatorBlackColor set]; + [indicatorWhiteColor set]; [ntStr drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos) withFont:indicatorFont]; diff --git a/media/ios/NewsBlur.xcodeproj/project.pbxproj b/media/ios/NewsBlur.xcodeproj/project.pbxproj index b9e520883..78bc808be 100755 --- a/media/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/media/ios/NewsBlur.xcodeproj/project.pbxproj @@ -385,6 +385,16 @@ FF85BF6016D5A587002D334D /* nav_icn_activity_hover.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF5E16D5A587002D334D /* nav_icn_activity_hover.png */; }; FF85BF6116D5A587002D334D /* nav_icn_settings.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF5F16D5A587002D334D /* nav_icn_settings.png */; }; FF85BF6316D5A5A8002D334D /* nav_icn_add.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF6216D5A5A8002D334D /* nav_icn_add.png */; }; + FF85BF7116D6A90D002D334D /* ak-icon-global.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7016D6A90D002D334D /* ak-icon-global.png */; }; + FF85BF7416D6A972002D334D /* ak-icon-allstories.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7216D6A972002D334D /* ak-icon-allstories.png */; }; + FF85BF7516D6A972002D334D /* ak-icon-blurblogs.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7316D6A972002D334D /* ak-icon-blurblogs.png */; }; + FF85BF7816D6AB7E002D334D /* ak-icon-folder-closed.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7616D6AB7E002D334D /* ak-icon-folder-closed.png */; }; + FF85BF7916D6AB7E002D334D /* ak-icon-folder-open.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7716D6AB7E002D334D /* ak-icon-folder-open.png */; }; + FF85BF7C16D6AD6F002D334D /* g_icn_folder_rss.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7A16D6AD6F002D334D /* g_icn_folder_rss.png */; }; + FF85BF7D16D6AD6F002D334D /* g_icn_folder.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7B16D6AD6F002D334D /* g_icn_folder.png */; }; + FF85BF8116D6AF43002D334D /* g_icn_focus.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7E16D6AF43002D334D /* g_icn_focus.png */; }; + FF85BF8216D6AF43002D334D /* g_icn_hidden.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF7F16D6AF43002D334D /* g_icn_hidden.png */; }; + FF85BF8316D6AF43002D334D /* g_icn_unread.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF8016D6AF43002D334D /* g_icn_unread.png */; }; FFAD0BE71649EC1800EE33D0 /* StoryPageControl~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FFAD0BE61649EC1800EE33D0 /* StoryPageControl~ipad.xib */; }; FFAD4971144A386100BA6919 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FFAD4970144A386100BA6919 /* libz.dylib */; }; FFD1D7311459B63500E46F89 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFD1D7301459B63500E46F89 /* BaseViewController.m */; }; @@ -929,6 +939,16 @@ FF85BF5E16D5A587002D334D /* nav_icn_activity_hover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nav_icn_activity_hover.png; sourceTree = ""; }; FF85BF5F16D5A587002D334D /* nav_icn_settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nav_icn_settings.png; sourceTree = ""; }; FF85BF6216D5A5A8002D334D /* nav_icn_add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nav_icn_add.png; sourceTree = ""; }; + FF85BF7016D6A90D002D334D /* ak-icon-global.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ak-icon-global.png"; sourceTree = ""; }; + FF85BF7216D6A972002D334D /* ak-icon-allstories.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ak-icon-allstories.png"; sourceTree = ""; }; + FF85BF7316D6A972002D334D /* ak-icon-blurblogs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ak-icon-blurblogs.png"; sourceTree = ""; }; + FF85BF7616D6AB7E002D334D /* ak-icon-folder-closed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ak-icon-folder-closed.png"; sourceTree = ""; }; + FF85BF7716D6AB7E002D334D /* ak-icon-folder-open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ak-icon-folder-open.png"; sourceTree = ""; }; + FF85BF7A16D6AD6F002D334D /* g_icn_folder_rss.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = g_icn_folder_rss.png; sourceTree = ""; }; + FF85BF7B16D6AD6F002D334D /* g_icn_folder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = g_icn_folder.png; sourceTree = ""; }; + FF85BF7E16D6AF43002D334D /* g_icn_focus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = g_icn_focus.png; sourceTree = ""; }; + FF85BF7F16D6AF43002D334D /* g_icn_hidden.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = g_icn_hidden.png; sourceTree = ""; }; + FF85BF8016D6AF43002D334D /* g_icn_unread.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = g_icn_unread.png; sourceTree = ""; }; FFAD0BE61649EC1800EE33D0 /* StoryPageControl~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "StoryPageControl~ipad.xib"; path = "Resources-iPad/Classes/StoryPageControl~ipad.xib"; sourceTree = ""; }; FFAD4970144A386100BA6919 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; FFD1D72F1459B63500E46F89 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = ""; }; @@ -1203,9 +1223,19 @@ 431B857615A132B600DCE497 /* Images */ = { isa = PBXGroup; children = ( + FF85BF7A16D6AD6F002D334D /* g_icn_folder_rss.png */, + FF85BF7B16D6AD6F002D334D /* g_icn_folder.png */, + FF85BF7616D6AB7E002D334D /* ak-icon-folder-closed.png */, + FF85BF7716D6AB7E002D334D /* ak-icon-folder-open.png */, + FF85BF7216D6A972002D334D /* ak-icon-allstories.png */, + FF85BF7316D6A972002D334D /* ak-icon-blurblogs.png */, + FF85BF7016D6A90D002D334D /* ak-icon-global.png */, FF85BF6216D5A5A8002D334D /* nav_icn_add.png */, FF85BF5E16D5A587002D334D /* nav_icn_activity_hover.png */, FF85BF5F16D5A587002D334D /* nav_icn_settings.png */, + FF85BF7E16D6AF43002D334D /* g_icn_focus.png */, + FF85BF7F16D6AF43002D334D /* g_icn_hidden.png */, + FF85BF8016D6AF43002D334D /* g_icn_unread.png */, FF4130AA162F3C2F00DDB6A7 /* archive_white.png */, FF4130A8162F3BD300DDB6A7 /* clock_white.png */, FF4130A4162F3AA900DDB6A7 /* clock.png */, @@ -2228,6 +2258,16 @@ FF85BF6016D5A587002D334D /* nav_icn_activity_hover.png in Resources */, FF85BF6116D5A587002D334D /* nav_icn_settings.png in Resources */, FF85BF6316D5A5A8002D334D /* nav_icn_add.png in Resources */, + FF85BF7116D6A90D002D334D /* ak-icon-global.png in Resources */, + FF85BF7416D6A972002D334D /* ak-icon-allstories.png in Resources */, + FF85BF7516D6A972002D334D /* ak-icon-blurblogs.png in Resources */, + FF85BF7816D6AB7E002D334D /* ak-icon-folder-closed.png in Resources */, + FF85BF7916D6AB7E002D334D /* ak-icon-folder-open.png in Resources */, + FF85BF7C16D6AD6F002D334D /* g_icn_folder_rss.png in Resources */, + FF85BF7D16D6AD6F002D334D /* g_icn_folder.png in Resources */, + FF85BF8116D6AF43002D334D /* g_icn_focus.png in Resources */, + FF85BF8216D6AF43002D334D /* g_icn_hidden.png in Resources */, + FF85BF8316D6AF43002D334D /* g_icn_unread.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/media/ios/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/media/ios/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist index ebc1360f7..e81abe7b2 100644 --- a/media/ios/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ b/media/ios/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -8,11 +8,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Classes/StoryPageControl.m" - timestampString = "379293086.668773" + timestampString = "383167041.119447" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "298" - endingLineNumber = "298" + startingLineNumber = "300" + endingLineNumber = "300" landmarkName = "-applyNewIndex:pageController:" landmarkType = "5"> diff --git a/media/ios/NewsBlur_Prefix.pch b/media/ios/NewsBlur_Prefix.pch index c5166461a..1aca75e15 100644 --- a/media/ios/NewsBlur_Prefix.pch +++ b/media/ios/NewsBlur_Prefix.pch @@ -10,8 +10,8 @@ // #define BACKGROUND_REFRESH_SECONDS -5 #define BACKGROUND_REFRESH_SECONDS -10*60 -// #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"] - #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"] + #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"] +// #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"] #define NEWSBLUR_LINK_COLOR 0x405BA8 #define NEWSBLUR_HIGHLIGHT_COLOR 0xd2e6fd diff --git a/media/ios/Resources/ak-icon-allstories.png b/media/ios/Resources/ak-icon-allstories.png new file mode 100644 index 000000000..483b06c1d Binary files /dev/null and b/media/ios/Resources/ak-icon-allstories.png differ diff --git a/media/ios/Resources/ak-icon-blurblogs.png b/media/ios/Resources/ak-icon-blurblogs.png new file mode 100644 index 000000000..c2d1bf9b9 Binary files /dev/null and b/media/ios/Resources/ak-icon-blurblogs.png differ diff --git a/media/ios/Resources/ak-icon-folder-closed.png b/media/ios/Resources/ak-icon-folder-closed.png new file mode 100644 index 000000000..c5bb0897b Binary files /dev/null and b/media/ios/Resources/ak-icon-folder-closed.png differ diff --git a/media/ios/Resources/ak-icon-folder-open.png b/media/ios/Resources/ak-icon-folder-open.png new file mode 100644 index 000000000..f6af3e5e9 Binary files /dev/null and b/media/ios/Resources/ak-icon-folder-open.png differ diff --git a/media/ios/Resources/ak-icon-global.png b/media/ios/Resources/ak-icon-global.png new file mode 100644 index 000000000..930f65739 Binary files /dev/null and b/media/ios/Resources/ak-icon-global.png differ diff --git a/media/ios/Resources/g_icn_focus.png b/media/ios/Resources/g_icn_focus.png new file mode 100644 index 000000000..a1e971ca5 Binary files /dev/null and b/media/ios/Resources/g_icn_focus.png differ diff --git a/media/ios/Resources/g_icn_folder.png b/media/ios/Resources/g_icn_folder.png new file mode 100644 index 000000000..39f119dda Binary files /dev/null and b/media/ios/Resources/g_icn_folder.png differ diff --git a/media/ios/Resources/g_icn_folder_rss.png b/media/ios/Resources/g_icn_folder_rss.png new file mode 100644 index 000000000..7e2992df6 Binary files /dev/null and b/media/ios/Resources/g_icn_folder_rss.png differ diff --git a/media/ios/Resources/g_icn_hidden.png b/media/ios/Resources/g_icn_hidden.png new file mode 100644 index 000000000..78f1c2021 Binary files /dev/null and b/media/ios/Resources/g_icn_hidden.png differ diff --git a/media/ios/Resources/g_icn_unread.png b/media/ios/Resources/g_icn_unread.png new file mode 100644 index 000000000..bcd0a9bd3 Binary files /dev/null and b/media/ios/Resources/g_icn_unread.png differ