summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-11-23 15:51:15 +0300
committerAndrew Dolgov <[email protected]>2011-11-23 15:51:15 +0300
commitacd27869614a60610a93f59dbf6869059ee5dc81 (patch)
tree7726d8814e0dced0ccf9efcbc3dfba4c8b1bad23 /res
parentfd99cbdd0c087299d5d3aac691d71f782f23d1ba (diff)
implement displaying articlefragment
Diffstat (limited to 'res')
-rw-r--r--res/anim/slide_in_left.xml4
-rw-r--r--res/anim/slide_out_right.xml11
-rw-r--r--res/layout/main.xml16
3 files changed, 21 insertions, 10 deletions
diff --git a/res/anim/slide_in_left.xml b/res/anim/slide_in_left.xml
index 1018058f..10a16677 100644
--- a/res/anim/slide_in_left.xml
+++ b/res/anim/slide_in_left.xml
@@ -2,9 +2,9 @@
<set>
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
- android:propertyName="x"
+ android:propertyName="width"
android:duration="500"
- android:valueFrom="-400"
+ android:valueFrom="400"
android:valueTo="0"
android:valueType="intType"/>
</set>
diff --git a/res/anim/slide_out_right.xml b/res/anim/slide_out_right.xml
new file mode 100644
index 00000000..cc43178e
--- /dev/null
+++ b/res/anim/slide_out_right.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set>
+ <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+ android:propertyName="x"
+ android:duration="500"
+ android:valueFrom="0"
+ android:valueTo="-400"
+ android:valueType="intType"/>
+</set>
+
diff --git a/res/layout/main.xml b/res/layout/main.xml
index d8fb875f..fb049eeb 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,20 +1,20 @@
<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:id="@+id/main_flipper">
- <FrameLayout android:layout_gravity="center_vertical" android:layout_width="match_parent" android:id="@+id/sync_splash" android:layout_height="match_parent">
- <LinearLayout android:id="@+id/linearLayout1" android:gravity="center" android:layout_width="match_parent" android:layout_height="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:text="@string/loading_message" android:layout_height="wrap_content"></TextView>
+ <FrameLayout android:layout_height="match_parent" android:layout_width="match_parent" android:layout_gravity="center_vertical" android:id="@+id/sync_splash">
+ <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/linearLayout1" android:gravity="center">
+ <ProgressBar android:id="@+id/loading_progress" style="?android:attr/progressBarStyleLarge" android:layout_height="wrap_content" android:layout_width="wrap_content"></ProgressBar>
+ <TextView android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:text="@string/loading_message" android:id="@+id/loading_message"></TextView>
</LinearLayout>
</FrameLayout>
- <LinearLayout android:id="@+id/main" android:layout_width="fill_parent" android:orientation="horizontal" android:layout_height="fill_parent">
- <fragment android:id="@+id/feeds_fragment" android:name="org.fox.ttrss.FeedsFragment" android:layout_height="match_parent" android:layout_width="300dp">
+ <LinearLayout android:layout_height="fill_parent" android:layout_width="fill_parent" android:id="@+id/main" android:orientation="horizontal">
+ <fragment android:layout_weight="0" android:id="@+id/feeds_fragment" android:layout_height="match_parent" android:layout_width="300dp" android:name="org.fox.ttrss.FeedsFragment">
<!-- Preview: layout=@layout/feeds_fragment -->
</fragment>
- <fragment android:id="@+id/headlines_fragment" android:name="org.fox.ttrss.HeadlinesFragment" android:layout_height="match_parent" android:layout_width="wrap_content">
+ <fragment android:layout_weight="1" android:id="@+id/headlines_fragment" android:layout_height="match_parent" android:layout_width="wrap_content" android:name="org.fox.ttrss.HeadlinesFragment">
<!-- Preview: layout=@layout/headlines_fragment -->
</fragment>
- <fragment android:id="@+id/article_fragment" android:name="org.fox.ttrss.ArticleFragment" android:layout_height="match_parent" android:layout_width="wrap_content">
+ <fragment android:layout_weight="0" android:id="@+id/article_fragment" android:layout_height="match_parent" android:name="org.fox.ttrss.ArticleFragment" android:layout_width="500dp">
<!-- Preview: layout=@layout/article_fragment -->
</fragment>
</LinearLayout>