diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/anim/slide_in_left.xml | 16 | ||||
| -rw-r--r-- | res/layout/feeds_row_selected.xml | 26 | ||||
| -rw-r--r-- | res/layout/headlines_fragment.xml | 2 | ||||
| -rw-r--r-- | res/layout/headlines_row.xml | 20 | ||||
| -rw-r--r-- | res/layout/headlines_row_selected.xml | 24 | ||||
| -rw-r--r-- | res/layout/headlines_row_unread.xml | 24 | ||||
| -rw-r--r-- | res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | res/values/style.xml | 26 |
8 files changed, 104 insertions, 36 deletions
diff --git a/res/anim/slide_in_left.xml b/res/anim/slide_in_left.xml index 10a16677..11991019 100644 --- a/res/anim/slide_in_left.xml +++ b/res/anim/slide_in_left.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> - <set> - <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:propertyName="width" - android:duration="500" - android:valueFrom="400" - android:valueTo="0" - android:valueType="intType"/> -</set> - + <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" + android:propertyName="x" + android:valueType="floatType" + android:valueFrom="-1280" + android:valueTo="0" + android:duration="500"/> +</set>
\ No newline at end of file diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml new file mode 100644 index 00000000..7ee526f7 --- /dev/null +++ b/res/layout/feeds_row_selected.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:background="?feedsSelectedBackground" + android:gravity="center_vertical" + android:id="@+id/feeds_row" android:layout_width="match_parent" android:paddingBottom="4dip" android:paddingLeft="8dip" android:paddingRight="8dip" android:paddingTop="4dip"> + <TextView + android:id="@+id/title" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:paddingLeft="6dip" + android:text="{FEED}" android:layout_width="wrap_content" android:textSize="21dp"/> + <TextView + android:id="@+id/unread_counter" + android:gravity="right" + android:textStyle="bold" + android:paddingRight="6dip" + android:textColor="?unreadCounterColor" + android:layout_gravity="center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="{123}" android:textSize="16dp"/> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml index c5536c5c..83174697 100644 --- a/res/layout/headlines_fragment.xml +++ b/res/layout/headlines_fragment.xml @@ -3,7 +3,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:id="@+id/headlines_fragment"> - <ListView android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines" android:background="?headlinesBackground"></ListView> + <ListView android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines"></ListView> <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>
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index 656ff80a..b47528d0 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -2,14 +2,20 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:gravity="center_vertical"
- android:padding="3dip" android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content">
+ android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content">
+ <ImageView android:background="?feedsSelectedBackground" android:paddingRight="4dip" android:layout_height="match_parent" android:layout_width="wrap_content"></ImageView>
<CheckBox android:focusable="false"
android:paddingLeft="6dip" android:paddingRight="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/selected"></CheckBox> - <ImageView android:layout_width="wrap_content" android:id="@+id/imageView1" android:layout_height="wrap_content" android:src="@android:drawable/star_off" android:paddingRight="5dip" android:clickable="true"></ImageView>
- - <LinearLayout android:layout_weight="1" android:layout_height="wrap_content" android:id="@+id/linearLayout1" android:orientation="vertical" android:layout_width="match_parent"> - <TextView android:id="@+id/title" android:textSize="16sp" android:text="{Title...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView> - <TextView android:id="@+id/excerpt" android:textSize="13sp" android:textColor="#909090" android:text="{Content excerpt...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView> - </LinearLayout>
+ <LinearLayout android:orientation="vertical" android:id="@+id/linearLayout1" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="wrap_content"> + <TextView android:singleLine="true" android:ellipsize="end" android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/title" android:text="{Title...}" android:textSize="16sp"></TextView> + <TextView android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/excerpt" android:text="{Content excerpt...}" android:textSize="13sp" android:textColor="#909090"></TextView> + </LinearLayout> + <LinearLayout + android:id="@+id/linerLayout3" + android:layout_width="wrap_content" android:gravity="center" + android:layout_height="wrap_content" android:orientation="vertical"> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/date" android:text="Jan 01"></TextView> + <ImageView android:clickable="true" android:id="@+id/imageView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView> + </LinearLayout>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml new file mode 100644 index 00000000..81760bc4 --- /dev/null +++ b/res/layout/headlines_row_selected.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:gravity="center_vertical"
+ android:background="?headlinesSelectedBackground"
+ android:padding="3dip" android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content">
+ <ImageView android:background="?feedsSelectedBackground" android:paddingRight="4dip" android:layout_height="match_parent" android:layout_width="wrap_content"></ImageView>
+ <CheckBox android:focusable="false"
+ android:paddingLeft="6dip" android:paddingRight="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/selected"></CheckBox> + + <LinearLayout android:layout_weight="1" android:layout_height="wrap_content" android:id="@+id/linearLayout1" android:orientation="vertical" android:layout_width="match_parent"> + <TextView android:singleLine="true" android:ellipsize="end" android:id="@+id/title" android:textSize="16sp" android:text="{Title...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView> + <TextView android:id="@+id/excerpt" android:textSize="13sp" android:textColor="#909090" android:text="{Content excerpt...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView> + </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/linerLayout3"
+ android:layout_width="wrap_content" android:gravity="center"
+ android:layout_height="wrap_content" android:orientation="vertical">
+ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/date" android:text="Jan 01"></TextView>
+ <ImageView android:clickable="true" android:id="@+id/imageView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView>
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml new file mode 100644 index 00000000..e139cfad --- /dev/null +++ b/res/layout/headlines_row_unread.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:gravity="center_vertical"
+ android:background="@android:color/white"
+ android:padding="3dip" android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content">
+ <ImageView android:background="?feedsSelectedBackground" android:paddingRight="4dip" android:layout_height="match_parent" android:layout_width="wrap_content"></ImageView>
+ <CheckBox android:focusable="false"
+ android:paddingLeft="6dip" android:paddingRight="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/selected"></CheckBox> + + <LinearLayout android:layout_weight="1" android:layout_height="wrap_content" android:id="@+id/linearLayout1" android:orientation="vertical" android:layout_width="match_parent"> + <TextView android:singleLine="true" android:ellipsize="end" android:id="@+id/title" android:textSize="16sp" android:text="{Title...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView> + <TextView android:id="@+id/excerpt" android:textSize="13sp" android:textColor="#909090" android:text="{Content excerpt...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView> + </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/linerLayout3"
+ android:layout_width="wrap_content" android:gravity="center"
+ android:layout_height="wrap_content" android:orientation="vertical">
+ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/date" android:text="Jan 01"></TextView>
+ <ImageView android:clickable="true" android:id="@+id/imageView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView>
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 76647f0e..9a6bbea0 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -6,4 +6,6 @@ <attr name="headlinesBackground" format="reference|color" />
<attr name="articleHeader" format="reference|color" />
<attr name="articleDivider" format="reference|color" />
+ <attr name="headlinesSelectedBackground" format="reference|color" />
+ <attr name="feedsSelectedBackground" format="reference|color" />
</resources>
\ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index 4bc343e1..69c2e1d6 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -4,8 +4,10 @@ <item name="feedlistBackground">#fafafa</item>
<item name="unreadCounterColor">#0000ff</item>
<item name="headlinesBackground">#ffffff</item>
- <item name="articleDivider">#f0f0f0</item>
- <item name="articleHeader">#E8F2FF</item>
+ <item name="articleDivider">#96c5ff</item>
+ <item name="articleHeader">#ffffff</item>
+ <item name="headlinesSelectedBackground">#fff7d5</item>
+ <item name="feedsSelectedBackground">#96C5FF</item>
</style>
<style name="DarkTheme" parent="android:Theme.Holo">
@@ -15,22 +17,8 @@ <item name="headlinesBackground">#000000</item>
<item name="articleDivider">#303030</item>
<item name="articleHeader">#101010</item>
+ <item name="headlinesSelectedBackground">#303060</item>
+ <item name="feedsSelectedBackground">#303060</item>
</style>
-
- <style name="SelectedFeed">
- <item name="android:textStyle">bold</item>
- </style>
-
- <style name="Feed">
- <item name="android:textStyle">normal</item>
- </style>
-
- <style name="UnreadArticle">
- <item name="android:textStyle">bold</item>
- </style>
-
- <style name="Article">
- <item name="android:textStyle">normal</item>
- </style>
-
+
</resources>
\ No newline at end of file |