diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-28 20:14:50 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-28 20:14:50 +0300 |
| commit | b150696e7912c6f1732102953e1206d5d82f7189 (patch) | |
| tree | 666d73e5f700ffb0fd4bd3f310cb0e2f015ad13e /res | |
| parent | 8771803965cea6202a84b937ef27981411f6370c (diff) | |
implement categories for smallscreen view
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/cats_fragment.xml | 13 | ||||
| -rw-r--r-- | res/layout/main_small.xml | 84 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 5 |
4 files changed, 72 insertions, 31 deletions
diff --git a/res/layout/cats_fragment.xml b/res/layout/cats_fragment.xml new file mode 100644 index 00000000..4101e5c8 --- /dev/null +++ b/res/layout/cats_fragment.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" ?>
+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/cats_fragment.xml"
+ android:layout_width="match_parent"
+ android:layout_height="fill_parent" >
+ + <LinearLayout android:id="@+id/loading_container" android:gravity="center" android:layout_height="match_parent" android:layout_width="match_parent"> + <ProgressBar android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:id="@+id/loading_progress" android:layout_height="wrap_content"></ProgressBar> + <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:layout_height="wrap_content" ></TextView> + </LinearLayout> + <ListView android:id="@+id/feeds" android:layout_height="match_parent" android:layout_width="match_parent"></ListView>
+ + </FrameLayout>
diff --git a/res/layout/main_small.xml b/res/layout/main_small.xml index 7fd46add..0215f270 100644 --- a/res/layout/main_small.xml +++ b/res/layout/main_small.xml @@ -1,30 +1,56 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" android:id="@+id/main_flipper"> - <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:id="@+id/loading_container"> - <ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" ></ProgressBar> - <TextView android:text="@string/loading_message" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message"></TextView> - </LinearLayout> - <LinearLayout android:layout_height="fill_parent" android:orientation="horizontal" android:id="@+id/main" android:layout_width="fill_parent"> - - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" > -</FrameLayout> - - <FrameLayout - android:id="@+id/headlines_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" > -</FrameLayout> - - <FrameLayout - android:id="@+id/article_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" > -</FrameLayout> - </LinearLayout> - - +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/main_flipper"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+
+ <LinearLayout
+ android:id="@+id/loading_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center" >
+
+ <ProgressBar
+ android:id="@+id/loading_progress"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" >
+ </ProgressBar>
+
+ <TextView
+ android:id="@+id/loading_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/loading_message" >
+ </TextView>
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/main"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" > +
+ <FrameLayout
+ android:id="@+id/feeds_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/cats_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/headlines_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/article_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+ </LinearLayout>
+
</FrameLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index ed26b0df..0f3b089f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -55,4 +55,5 @@ <string name="enable_ads_summary">Showing ads to you supports the project</string> <string name="ttrss_url_summary">URL of your tt-rss installation directory, e.g. http://site.com/tt-rss/</string> <string name="download_feed_icons">Download and display feed icons</string> + <string name="enable_cats">Enable feed categories</string> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 190a706f..dff4afdf 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -24,8 +24,9 @@ android:entries="@array/pref_theme_names"
android:entryValues="@array/pref_theme_values" android:summary="@string/pref_theme_long"/>
- <CheckBoxPreference android:title="@string/sort_feeds_by_unread" android:key="sort_feeds_by_unread"/>
- <CheckBoxPreference android:title="@string/download_feed_icons" android:key="download_feed_icons"/>
+ <CheckBoxPreference android:defaultValue="false" android:title="@string/sort_feeds_by_unread" android:key="sort_feeds_by_unread"/>
+ <CheckBoxPreference android:defaultValue="false" android:title="@string/download_feed_icons" android:key="download_feed_icons"/>
+ <CheckBoxPreference android:defaultValue="false" android:title="@string/enable_cats" android:key="enable_cats" />
<CheckBoxPreference android:defaultValue="false" android:summary="@string/enable_ads_summary" android:title="@string/enable_ads" android:key="enable_ads" />
</PreferenceCategory>
|