mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Styling feeds, folders, and stories in both feeds and folders. Still need to style the story detail header. Fixes #181.
This commit is contained in:
Samuel Clay
parent
e451554d8d
commit
8c708d5c46
10 changed files with 426 additions and 206 deletions
329
clients/android/NewsBlur/.idea/workspace.xml
generated
329
clients/android/NewsBlur/.idea/workspace.xml
generated
|
|
@ -1,5 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AndroidLayoutPreviewToolWindow">
|
||||
<option name="state">
|
||||
<GlobalState>
|
||||
<option name="visible" value="false" />
|
||||
</GlobalState>
|
||||
</option>
|
||||
</component>
|
||||
<component name="AndroidLayouts">
|
||||
<shared>
|
||||
<config />
|
||||
|
|
@ -17,7 +24,8 @@
|
|||
</component>
|
||||
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
||||
<component name="CompilerWorkspaceConfiguration">
|
||||
<option name="USE_COMPILE_SERVER" value="false" />
|
||||
<option name="MAKE_PROJECT_ON_SAVE" value="true" />
|
||||
<option name="PARALLEL_COMPILATION" value="true" />
|
||||
</component>
|
||||
<component name="CreatePatchCommitExecutor">
|
||||
<option name="PATCH_PATH" value="" />
|
||||
|
|
@ -72,37 +80,52 @@
|
|||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<file leaf-file-name="AndroidManifest.xml" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
|
||||
<file leaf-file-name="row_item.xml" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_item.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="22" column="44" selection-start="827" selection-end="827" vertical-scroll-proportion="0.46348315" vertical-offset="0" max-vertical-offset="2070">
|
||||
<state line="39" column="16" selection-start="1475" selection-end="1475" vertical-scroll-proportion="-10.0" vertical-offset="315" max-vertical-offset="1305">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="project.properties" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/project.properties">
|
||||
<file leaf-file-name="row_folderitem.xml" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_folderitem.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
|
||||
<state line="62" column="51" selection-start="2462" selection-end="2476" vertical-scroll-proportion="-10.777778" vertical-offset="639" max-vertical-offset="1650">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="proguard-project.txt" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/proguard-project.txt">
|
||||
<file leaf-file-name="FeedItemsAdapter.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/com/newsblur/database/FeedItemsAdapter.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
|
||||
<state line="71" column="37" selection-start="2775" selection-end="2775" vertical-scroll-proportion="0.0" vertical-offset="555" max-vertical-offset="1500">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/libs/ActionBarSherlock/pom.xml">
|
||||
<file leaf-file-name="MultipleFeedItemsAdapter.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/com/newsblur/database/MultipleFeedItemsAdapter.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="41" column="20" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.0" vertical-offset="600" max-vertical-offset="2340">
|
||||
<state line="28" column="104" selection-start="1010" selection-end="1010" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1815">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="colors.xml" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/res/values/colors.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="12" column="45" selection-start="495" selection-end="495" vertical-scroll-proportion="0.40723982" vertical-offset="0" max-vertical-offset="1050">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -125,6 +148,14 @@
|
|||
<list>
|
||||
<option value="$PROJECT_DIR$/libs/ActionBarSherlock/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/AndroidManifest.xml" />
|
||||
<option value="$PROJECT_DIR$/res/layout/row_feed.xml" />
|
||||
<option value="$PROJECT_DIR$/res/layout/row_folder_collapsed.xml" />
|
||||
<option value="$PROJECT_DIR$/res/layout/row_all_stories.xml" />
|
||||
<option value="$PROJECT_DIR$/res/layout/row_all_shared_stories.xml" />
|
||||
<option value="$PROJECT_DIR$/res/values/colors.xml" />
|
||||
<option value="$PROJECT_DIR$/res/layout/row_item.xml" />
|
||||
<option value="$PROJECT_DIR$/res/layout/row_folderitem.xml" />
|
||||
<option value="$PROJECT_DIR$/src/com/newsblur/database/FeedItemsAdapter.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -160,8 +191,6 @@
|
|||
<sortByType />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<PATH>
|
||||
|
|
@ -201,9 +230,87 @@
|
|||
<option name="myItemId" value="newsblur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="view" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="NewsBlur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="NewsBlur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="src" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="newsblur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="util" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="NewsBlur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="NewsBlur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="src" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="newsblur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="NewsBlur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="NewsBlur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="res" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="NewsBlur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="NewsBlur" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="res" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="layout" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
|
|
@ -213,7 +320,7 @@
|
|||
<property name="options.splitter.main.proportions" value="0.3" />
|
||||
<property name="ExportedApkPath" value="$USER_HOME$/Dropbox/NewsBlur/Android/Builds/NewsBlur 2.1.3.apk" />
|
||||
<property name="recentsLimit" value="5" />
|
||||
<property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
|
||||
<property name="options.lastSelected" value="preferences.keymap" />
|
||||
<property name="MemberChooser.sorted" value="false" />
|
||||
<property name="ExportedModule" value="NewsBlur" />
|
||||
<property name="last_opened_file_path" value="$USER_HOME$/Dropbox/NewsBlur Business/Secrets/Android Keystore/newsblur_android_key" />
|
||||
|
|
@ -344,15 +451,15 @@
|
|||
<option name="ACTIVITY_CLASS" value="" />
|
||||
<option name="MODE" value="default_activity" />
|
||||
<option name="DEPLOY" value="true" />
|
||||
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
|
||||
<option name="PREFERRED_AVD" value="MyAvd0" />
|
||||
<option name="TARGET_SELECTION_MODE" value="USB_DEVICE" />
|
||||
<option name="PREFERRED_AVD" value="" />
|
||||
<option name="USE_COMMAND_LINE" value="true" />
|
||||
<option name="COMMAND_LINE" value="" />
|
||||
<option name="WIPE_USER_DATA" value="false" />
|
||||
<option name="DISABLE_BOOT_ANIMATION" value="false" />
|
||||
<option name="NETWORK_SPEED" value="full" />
|
||||
<option name="NETWORK_LATENCY" value="none" />
|
||||
<option name="CLEAR_LOGCAT" value="false" />
|
||||
<option name="CLEAR_LOGCAT" value="true" />
|
||||
<RunnerSettings RunnerId="AndroidDebugRunner" />
|
||||
<ConfigurationWrapper RunnerId="AndroidDebugRunner" />
|
||||
<method />
|
||||
|
|
@ -411,28 +518,31 @@
|
|||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32910448" sideWeight="0.67027026" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Problems" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21216217" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.67027026" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19925374" sideWeight="0.67027026" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32972974" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
</layout>
|
||||
</component>
|
||||
<component name="VcsContentAnnotationSettings">
|
||||
|
|
@ -496,96 +606,157 @@
|
|||
<breakpoint-manager />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
|
||||
<entry file="file://$PROJECT_DIR$/src/com/newsblur/util/ReadFilter.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="3" column="27" selection-start="162" selection-end="162" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2070">
|
||||
<state line="6" column="12" selection-start="117" selection-end="117" vertical-scroll-proportion="0.1923077" vertical-offset="0" max-vertical-offset="468">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/project.properties">
|
||||
<entry file="file://$PROJECT_DIR$/src/com/newsblur/view/FeedItemViewBinder.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
|
||||
<state line="19" column="13" selection-start="534" selection-end="534" vertical-scroll-proportion="-1.2820513" vertical-offset="660" max-vertical-offset="1200">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/proguard-project.txt">
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_feedresult.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
|
||||
<state line="14" column="51" selection-start="544" selection-end="544" vertical-scroll-proportion="-1.1306819" vertical-offset="807" max-vertical-offset="1335">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/libs/ActionBarSherlock/pom.xml">
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/fragment_itemlist.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="41" column="20" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.0" vertical-offset="600" max-vertical-offset="2340">
|
||||
<state line="11" column="44" selection-start="465" selection-end="465" vertical-scroll-proportion="0.37414965" vertical-offset="0" max-vertical-offset="465">
|
||||
<folding>
|
||||
<element signature="e#520#547#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/activity_itemslist.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="441">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/fragment_folderfeedlist.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="10" column="16" selection-start="305" selection-end="305" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2070">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="441">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/project.properties">
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_all_shared_stories.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
|
||||
<state line="14" column="51" selection-start="618" selection-end="618" vertical-scroll-proportion="0.39772728" vertical-offset="0" max-vertical-offset="1560">
|
||||
<folding>
|
||||
<element signature="e#998#1035#0" expanded="true" />
|
||||
<element signature="e#3222#3250#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_all_stories.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="13" column="38" selection-start="563" selection-end="563" vertical-scroll-proportion="0.3693182" vertical-offset="0" max-vertical-offset="1425">
|
||||
<folding>
|
||||
<element signature="e#602#639#0" expanded="false" />
|
||||
<element signature="e#1039#1070#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_folder_collapsed.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="76" column="44" selection-start="3022" selection-end="3022" vertical-scroll-proportion="2.1496212" vertical-offset="5" max-vertical-offset="1575">
|
||||
<folding>
|
||||
<element signature="e#597#634#0" expanded="false" />
|
||||
<element signature="e#992#1029#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_feed.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="29" column="44" selection-start="1208" selection-end="1208" vertical-scroll-proportion="-0.42045453" vertical-offset="657" max-vertical-offset="1230">
|
||||
<folding>
|
||||
<element signature="e#2237#2266#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_item.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="39" column="16" selection-start="1475" selection-end="1475" vertical-scroll-proportion="-10.0" vertical-offset="315" max-vertical-offset="1305">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/proguard-project.txt">
|
||||
<entry file="file://$PROJECT_DIR$/res/layout/row_folderitem.xml">
|
||||
<provider editor-type-id="android-designer">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
|
||||
<state line="62" column="51" selection-start="2462" selection-end="2476" vertical-scroll-proportion="-10.777778" vertical-offset="639" max-vertical-offset="1650">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/libs/ActionBarSherlock/pom.xml">
|
||||
<entry file="file://$PROJECT_DIR$/src/com/newsblur/fragment/FeedItemListFragment.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="41" column="20" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.0" vertical-offset="600" max-vertical-offset="2340">
|
||||
<state line="87" column="45" selection-start="3658" selection-end="3658" vertical-scroll-proportion="1.5774908" vertical-offset="0" max-vertical-offset="2265">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.project">
|
||||
<entry file="file://$PROJECT_DIR$/src/com/newsblur/database/MultipleFeedItemsAdapter.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="600" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.classpath">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="8" column="0" selection-start="372" selection-end="372" vertical-scroll-proportion="0.25641027" vertical-offset="0" max-vertical-offset="468" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/project.properties">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="468">
|
||||
<state line="28" column="104" selection-start="1010" selection-end="1010" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1815">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/proguard-project.txt">
|
||||
<entry file="file://$PROJECT_DIR$/src/com/newsblur/database/FeedItemsAdapter.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
|
||||
<state line="71" column="37" selection-start="2775" selection-end="2775" vertical-scroll-proportion="0.0" vertical-offset="555" max-vertical-offset="1500">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/libs/ActionBarSherlock/pom.xml">
|
||||
<entry file="file://$PROJECT_DIR$/res/values/colors.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="41" column="20" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.0" vertical-offset="600" max-vertical-offset="2340">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="22" column="44" selection-start="827" selection-end="827" vertical-scroll-proportion="0.46348315" vertical-offset="0" max-vertical-offset="2070">
|
||||
<state line="12" column="45" selection-start="495" selection-end="495" vertical-scroll-proportion="0.40723982" vertical-offset="0" max-vertical-offset="1050">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
|
|||
|
|
@ -6,22 +6,22 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/row_everything_icon"
|
||||
android:layout_width="23dp"
|
||||
android:layout_height="23dp"
|
||||
android:layout_width="19dp"
|
||||
android:layout_height="19dp"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:contentDescription="@string/description_row_folder_icon"
|
||||
android:src="@drawable/ak_icon_blurblogs" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/row_folder_indicator"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="12dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:contentDescription="@string/description_row_folder_icon"
|
||||
android:src="@drawable/indicator_collapsed" />
|
||||
|
||||
|
|
@ -37,10 +37,13 @@
|
|||
android:id="@+id/row_foldersumneu"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="3dp"
|
||||
android:background="@drawable/neutral_count_rect"
|
||||
android:gravity="center"
|
||||
android:padding="3dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
android:paddingTop="1dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:shadowColor="@color/neutral_drop_shadow"
|
||||
android:shadowDy="1"
|
||||
android:shadowRadius="1"
|
||||
|
|
@ -52,10 +55,13 @@
|
|||
android:id="@+id/row_foldersumpos"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="3dp"
|
||||
android:background="@drawable/positive_count_rect"
|
||||
android:gravity="center"
|
||||
android:padding="3dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
android:paddingTop="1dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:shadowColor="@color/positive_drop_shadow"
|
||||
android:shadowDy="1"
|
||||
android:shadowRadius="1"
|
||||
|
|
@ -75,7 +81,7 @@
|
|||
android:paddingTop="10dp"
|
||||
android:text="@string/all_shared_stories"
|
||||
android:textColor="@color/folder_text"
|
||||
android:textSize="16dp"
|
||||
android:textSize="14dp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<View
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/row_everything_icon"
|
||||
android:layout_width="23dp"
|
||||
android:layout_height="23dp"
|
||||
android:layout_width="19dp"
|
||||
android:layout_height="19dp"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:contentDescription="@string/description_row_folder_icon"
|
||||
android:src="@drawable/ak_icon_allstories" />
|
||||
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
android:paddingTop="10dp"
|
||||
android:text="@string/all_stories_row_title"
|
||||
android:textColor="@color/folder_text"
|
||||
android:textSize="16dp"
|
||||
android:textSize="14dp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -34,17 +34,20 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="5dp" >
|
||||
android:layout_marginRight="6dp" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_foldersumneu"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="3dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:background="@drawable/neutral_count_rect"
|
||||
android:gravity="center"
|
||||
android:padding="3dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
android:paddingTop="1dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:shadowColor="@color/neutral_drop_shadow"
|
||||
android:shadowDy="1"
|
||||
android:shadowRadius="1"
|
||||
|
|
@ -56,11 +59,14 @@
|
|||
android:id="@+id/row_foldersumpos"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="3dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:background="@drawable/positive_count_rect"
|
||||
android:gravity="center"
|
||||
android:padding="3dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
android:paddingTop="1dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:shadowColor="@color/positive_drop_shadow"
|
||||
android:shadowDy="1"
|
||||
android:shadowRadius="1"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="8dp"
|
||||
android:gravity="right"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
|
|
@ -19,11 +19,9 @@
|
|||
android:id="@+id/row_feedneutral"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="3dp"
|
||||
android:background="@drawable/neutral_count_rect"
|
||||
android:gravity="center"
|
||||
android:paddingTop="2dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
android:shadowColor="@color/neutral_drop_shadow"
|
||||
|
|
@ -37,11 +35,9 @@
|
|||
android:id="@+id/row_feedpositive"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="3dp"
|
||||
android:background="@drawable/positive_count_rect"
|
||||
android:gravity="center"
|
||||
android:paddingTop="2dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
android:shadowColor="@color/positive_drop_shadow"
|
||||
|
|
@ -54,11 +50,11 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/row_feedfavicon"
|
||||
android:layout_width="23dp"
|
||||
android:layout_height="23dp"
|
||||
android:layout_width="19dp"
|
||||
android:layout_height="19dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:contentDescription="@string/description_favicon" />
|
||||
|
||||
<TextView
|
||||
|
|
@ -74,7 +70,7 @@
|
|||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/folder_text"
|
||||
android:textSize="16dp"
|
||||
android:textSize="14dp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
|
|||
|
|
@ -6,22 +6,22 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/row_folder_icon"
|
||||
android:layout_width="23dp"
|
||||
android:layout_height="23dp"
|
||||
android:layout_width="19dp"
|
||||
android:layout_height="19dp"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:contentDescription="@string/description_row_folder_icon"
|
||||
android:src="@drawable/g_icn_folder_rss" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/row_folder_indicator"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="12dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:contentDescription="@string/description_row_folder_icon"
|
||||
android:src="@drawable/indicator_collapsed" />
|
||||
|
||||
|
|
@ -31,16 +31,19 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="38dp" >
|
||||
android:layout_marginRight="36dp" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_foldersumneu"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="3dp"
|
||||
android:background="@drawable/neutral_count_rect"
|
||||
android:gravity="center"
|
||||
android:padding="3dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
android:paddingTop="1dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:shadowColor="@color/neutral_drop_shadow"
|
||||
android:shadowDy="1"
|
||||
android:shadowRadius="1"
|
||||
|
|
@ -52,10 +55,13 @@
|
|||
android:id="@+id/row_foldersumpos"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginRight="3dp"
|
||||
android:background="@drawable/positive_count_rect"
|
||||
android:gravity="center"
|
||||
android:padding="3dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
android:paddingTop="1dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:shadowColor="@color/positive_drop_shadow"
|
||||
android:shadowDy="1"
|
||||
android:shadowRadius="1"
|
||||
|
|
@ -70,12 +76,14 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toRightOf="@id/row_folder_icon"
|
||||
android:layout_alignRight="@id/row_foldersums"
|
||||
android:textColor="@color/folder_text"
|
||||
android:paddingBottom="10dp"
|
||||
android:paddingTop="10dp"
|
||||
android:textSize="16dp"
|
||||
android:textStyle="bold" />
|
||||
android:textSize="14dp"
|
||||
android:textStyle="bold"
|
||||
android:maxLines="1"
|
||||
android:ellipsize="marquee"
|
||||
android:layout_toLeftOf="@+id/row_foldersums"/>
|
||||
|
||||
<View
|
||||
android:layout_height="1dp"
|
||||
|
|
|
|||
|
|
@ -11,63 +11,77 @@
|
|||
|
||||
<View
|
||||
android:id="@+id/row_item_favicon_borderbar_1"
|
||||
android:layout_width="8dp"
|
||||
android:layout_width="6dp"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/row_item_favicon_borderbar_2"
|
||||
android:layout_width="8dp"
|
||||
android:layout_width="6dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_toRightOf="@id/row_item_favicon_borderbar_1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_sidebar"
|
||||
android:layout_width="10dp"
|
||||
android:layout_height="10dp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toRightOf="@id/row_item_favicon_borderbar_2" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/row_item_feedicon"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_toRightOf="@id/row_item_sidebar" />
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_marginLeft="22dp"
|
||||
android:layout_toRightOf="@id/row_item_favicon_borderbar_2" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_feedtitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginLeft="6dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_toRightOf="@id/row_item_feedicon"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/darkgray"
|
||||
android:textColor="@color/lightgray"
|
||||
android:textSize="14dp" />
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/row_item_title_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toRightOf="@id/row_item_favicon_borderbar_2"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_below="@id/row_item_feedicon">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_sidebar"
|
||||
android:layout_width="9dp"
|
||||
android:layout_height="9dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginLeft="7dp"
|
||||
android:layout_marginRight="7dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toRightOf="@+id/row_item_sidebar"
|
||||
android:layout_marginRight="8dp"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:maxLines="2"
|
||||
android:ellipsize="marquee"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignLeft="@id/row_item_feedicon"
|
||||
android:layout_below="@id/row_item_feedicon"
|
||||
android:layout_marginRight="8dp"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="12dp"
|
||||
android:textColor="@color/darkgray"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_below="@+id/row_item_title"
|
||||
android:layout_marginRight="8dp"
|
||||
android:paddingBottom="12dp"
|
||||
android:layout_below="@+id/row_item_title_container"
|
||||
android:layout_marginRight="12dp"
|
||||
android:paddingTop="2dp"
|
||||
android:paddingBottom="6dp"
|
||||
android:textColor="@color/darkgray"
|
||||
android:textSize="11dp" />
|
||||
|
||||
|
|
@ -75,10 +89,12 @@
|
|||
android:id="@+id/row_item_author"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/row_item_title"
|
||||
android:paddingBottom="12dp"
|
||||
android:layout_below="@+id/row_item_title_container"
|
||||
android:paddingTop="2dp"
|
||||
android:paddingBottom="6dp"
|
||||
android:layout_toLeftOf="@id/row_item_date"
|
||||
android:layout_toRightOf="@id/row_item_sidebar"
|
||||
android:layout_toRightOf="@id/row_item_favicon_borderbar_2"
|
||||
android:layout_marginLeft="22dp"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/darkgray"
|
||||
|
|
|
|||
|
|
@ -11,54 +11,67 @@
|
|||
|
||||
<View
|
||||
android:id="@+id/row_item_favicon_borderbar_1"
|
||||
android:layout_width="8dp"
|
||||
android:layout_width="6dp"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/row_item_favicon_borderbar_2"
|
||||
android:layout_width="8dp"
|
||||
android:layout_width="6dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_toRightOf="@id/row_item_favicon_borderbar_1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_sidebar"
|
||||
android:layout_width="10dp"
|
||||
android:layout_height="10dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_toRightOf="@id/row_item_favicon_borderbar_2" />
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/row_item_title_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toRightOf="@id/row_item_favicon_borderbar_2"
|
||||
android:layout_marginTop="4dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_sidebar"
|
||||
android:layout_width="9dp"
|
||||
android:layout_height="9dp"
|
||||
android:layout_marginLeft="7dp"
|
||||
android:layout_marginRight="7dp"
|
||||
android:layout_centerVertical="true"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_toRightOf="@+id/row_item_sidebar"
|
||||
android:maxLines="2"
|
||||
android:ellipsize="marquee"
|
||||
android:gravity="left"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingTop="8dp"
|
||||
android:textSize="14sp" />
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_toRightOf="@id/row_item_sidebar"
|
||||
android:paddingBottom="12dp"
|
||||
android:paddingTop="8dp"
|
||||
android:textColor="@color/darkgray"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_below="@+id/row_item_title"
|
||||
android:layout_marginRight="8dp"
|
||||
android:paddingBottom="12dp"
|
||||
android:textColor="@color/darkgray"
|
||||
android:textSize="11dp" />
|
||||
android:id="@+id/row_item_date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_below="@+id/row_item_title_container"
|
||||
android:layout_marginRight="12dp"
|
||||
android:paddingBottom="2dp"
|
||||
android:textColor="@color/darkgray"
|
||||
android:textSize="11dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/row_item_author"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/row_item_title"
|
||||
android:paddingBottom="12dp"
|
||||
android:layout_below="@+id/row_item_title_container"
|
||||
android:paddingBottom="2dp"
|
||||
android:layout_marginLeft="24dp"
|
||||
android:layout_toLeftOf="@id/row_item_date"
|
||||
android:layout_toRightOf="@id/row_item_sidebar"
|
||||
android:layout_alignLeft="@id/row_item_title_container"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/darkgray"
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
<color name="folder_border_bottom">#B7BBAA</color>
|
||||
<color name="feed_background">#F7F8F5</color>
|
||||
|
||||
<color name="story_title_unread">#606060</color>
|
||||
<color name="story_title_read">#C0C0C0</color>
|
||||
<color name="story_feed_unread">#333333</color>
|
||||
<color name="story_feed_read">#C0C0C0</color>
|
||||
<color name="story_title_unread">#333333</color>
|
||||
<color name="story_title_read">#808080</color>
|
||||
<color name="story_feed_unread">#606060</color>
|
||||
<color name="story_feed_read">#A0A0A0</color>
|
||||
<color name="story_author_unread">#959595</color>
|
||||
<color name="story_author_read">#C0C0C0</color>
|
||||
<color name="story_date_unread">#262C6C</color>
|
||||
|
|
|
|||
|
|
@ -21,14 +21,16 @@ public class FeedItemsAdapter extends SimpleCursorAdapter implements StoryItemsA
|
|||
|
||||
private Cursor cursor;
|
||||
private final Feed feed;
|
||||
private int storyAuthorUnread, storyAuthorRead, storyDateUnread, storyDateRead;
|
||||
private int storyTitleUnread, storyTitleRead, storyAuthorUnread, storyAuthorRead, storyDateUnread, storyDateRead;
|
||||
|
||||
public FeedItemsAdapter(Context context, Feed feed, int layout, Cursor c, String[] from, int[] to, int flags) {
|
||||
super(context, layout, c, from, to, flags);
|
||||
this.feed = feed;
|
||||
this.cursor = c;
|
||||
|
||||
storyAuthorUnread = context.getResources().getColor(R.color.story_author_unread);
|
||||
|
||||
storyTitleUnread = context.getResources().getColor(R.color.story_title_unread);
|
||||
storyTitleRead = context.getResources().getColor(R.color.story_title_read);
|
||||
storyAuthorUnread = context.getResources().getColor(R.color.story_author_unread);
|
||||
storyAuthorRead = context.getResources().getColor(R.color.story_author_read);
|
||||
storyDateUnread = context.getResources().getColor(R.color.story_date_unread);
|
||||
storyDateRead = context.getResources().getColor(R.color.story_date_read);
|
||||
|
|
@ -63,8 +65,9 @@ public class FeedItemsAdapter extends SimpleCursorAdapter implements StoryItemsA
|
|||
if (! Story.fromCursor(cursor).read) {
|
||||
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(storyAuthorUnread);
|
||||
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(storyDateUnread);
|
||||
((TextView) v.findViewById(R.id.row_item_title)).setTextColor(storyTitleUnread);
|
||||
|
||||
((TextView) v.findViewById(R.id.row_item_date)).setTypeface(null, Typeface.NORMAL);
|
||||
((TextView) v.findViewById(R.id.row_item_date)).setTypeface(null, Typeface.BOLD);
|
||||
((TextView) v.findViewById(R.id.row_item_author)).setTypeface(null, Typeface.BOLD);
|
||||
((TextView) v.findViewById(R.id.row_item_title)).setTypeface(null, Typeface.BOLD);
|
||||
|
||||
|
|
@ -73,6 +76,7 @@ public class FeedItemsAdapter extends SimpleCursorAdapter implements StoryItemsA
|
|||
} else {
|
||||
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(storyAuthorRead);
|
||||
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(storyDateRead);
|
||||
((TextView) v.findViewById(R.id.row_item_title)).setTextColor(storyTitleRead);
|
||||
|
||||
((TextView) v.findViewById(R.id.row_item_date)).setTypeface(null, Typeface.NORMAL);
|
||||
((TextView) v.findViewById(R.id.row_item_author)).setTypeface(null, Typeface.NORMAL);
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ static UIFont *indicatorFont = nil;
|
|||
|
||||
}
|
||||
if (highlighted) {
|
||||
textColor = UIColorFromRGB(0x686868); //0x686868
|
||||
textColor = UIColorFromRGB(0x686868);
|
||||
}
|
||||
[textColor set];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue