diff options
35 files changed, 120 insertions, 622 deletions
diff --git a/res/anim/right_slide_in.xml b/res/anim/right_slide_in.xml new file mode 100644 index 00000000..2bb5acc1 --- /dev/null +++ b/res/anim/right_slide_in.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_decelerate_interpolator"> + <translate + android:fromXDelta="100%p" + android:toXDelta="0" + android:duration="200" + /> +</set> + diff --git a/res/anim/right_slide_out.xml b/res/anim/right_slide_out.xml new file mode 100644 index 00000000..134467f5 --- /dev/null +++ b/res/anim/right_slide_out.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_decelerate_interpolator"> + <translate + android:fromXDelta="0" + android:toXDelta="100%p" + android:duration="200" + /> +</set> + diff --git a/res/anim/slide_left.xml b/res/anim/slide_left.xml deleted file mode 100644 index 80caa7d7..00000000 --- a/res/anim/slide_left.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
- <translate android:fromXDelta="100%p" android:toXDelta="0"
- android:duration="@android:integer/config_shortAnimTime" />
-</set>
\ No newline at end of file diff --git a/res/anim/slide_right.xml b/res/anim/slide_right.xml deleted file mode 100644 index a5617eae..00000000 --- a/res/anim/slide_right.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
- <translate android:fromXDelta="-100%p" android:toXDelta="0"
- android:duration="@android:integer/config_shortAnimTime" />
-</set>
\ No newline at end of file diff --git a/res/drawable-hdpi/arrowhead_sepia.png b/res/drawable-hdpi/arrowhead_sepia.png Binary files differnew file mode 100644 index 00000000..78e276a0 --- /dev/null +++ b/res/drawable-hdpi/arrowhead_sepia.png diff --git a/res/drawable-hdpi/paper_sepia_bitmap.png b/res/drawable-hdpi/paper_sepia_bitmap.png Binary files differnew file mode 100644 index 00000000..68ff3d66 --- /dev/null +++ b/res/drawable-hdpi/paper_sepia_bitmap.png diff --git a/res/drawable/headline_row_selected_sepia.xml b/res/drawable/headline_row_selected_sepia.xml new file mode 100644 index 00000000..04d82723 --- /dev/null +++ b/res/drawable/headline_row_selected_sepia.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item android:drawable="@color/headline_row_selected_sepia"/>
+ <item android:drawable="@drawable/shadow"/>
+ <item><bitmap
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/arrowhead_sepia"
+ android:gravity="center_vertical|right" /></item>
+
+</layer-list>
\ No newline at end of file diff --git a/res/drawable/paper_sepia.xml b/res/drawable/paper_sepia.xml new file mode 100644 index 00000000..cbb02489 --- /dev/null +++ b/res/drawable/paper_sepia.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>
+ <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/paper_sepia_bitmap"
+ android:tileMode="repeat" />
\ No newline at end of file diff --git a/res/drawable/shadow_feeds_sepia.xml b/res/drawable/shadow_feeds_sepia.xml new file mode 100644 index 00000000..8f0ebbbb --- /dev/null +++ b/res/drawable/shadow_feeds_sepia.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item android:drawable="@color/feeds_sepia"/>
+ <item android:drawable="@drawable/shadow"/>
+
+</layer-list>
\ No newline at end of file diff --git a/res/drawable/shadow_headlines_sepia.xml b/res/drawable/shadow_headlines_sepia.xml new file mode 100644 index 00000000..88093571 --- /dev/null +++ b/res/drawable/shadow_headlines_sepia.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item android:drawable="@drawable/paper_sepia"/>
+ <item android:drawable="@drawable/shadow"/>
+
+</layer-list>
\ No newline at end of file diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml index 4a6679bc..4dd8de2d 100644 --- a/res/layout-port/headlines_row.xml +++ b/res/layout-port/headlines_row.xml @@ -96,40 +96,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1" />
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml index ad5ab33f..46df3f71 100644 --- a/res/layout-port/headlines_row_selected.xml +++ b/res/layout-port/headlines_row_selected.xml @@ -96,41 +96,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:text="Article content" />
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml index ce0cf9a3..f19ebe06 100644 --- a/res/layout-port/headlines_row_unread.xml +++ b/res/layout-port/headlines_row_unread.xml @@ -96,40 +96,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1" />
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout-sw600dp-port/headlines_row_selected.xml b/res/layout-sw600dp-port/headlines_row_selected.xml index 0b74394c..eb953b91 100644 --- a/res/layout-sw600dp-port/headlines_row_selected.xml +++ b/res/layout-sw600dp-port/headlines_row_selected.xml @@ -93,42 +93,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:padding="3dip" >
- </TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml index 7055bdda..b32302fd 100644 --- a/res/layout-sw600dp/headlines_row.xml +++ b/res/layout-sw600dp/headlines_row.xml @@ -93,42 +93,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:padding="3dip" >
- </TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml index 7774357f..5da7e175 100644 --- a/res/layout-sw600dp/headlines_row_selected.xml +++ b/res/layout-sw600dp/headlines_row_selected.xml @@ -93,42 +93,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:padding="3dip" >
- </TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml index 27b33cce..47b81721 100644 --- a/res/layout-sw600dp/headlines_row_unread.xml +++ b/res/layout-sw600dp/headlines_row_unread.xml @@ -93,42 +93,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:padding="3dip" >
- </TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout/feeds.xml b/res/layout/feeds.xml index c3f7be59..102dd07e 100644 --- a/res/layout/feeds.xml +++ b/res/layout/feeds.xml @@ -20,6 +20,7 @@ <FrameLayout
android:id="@+id/feeds_fragment"
+ android:background="?smallScreenBackground"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</FrameLayout>
diff --git a/res/layout/headlines.xml b/res/layout/headlines.xml index c3027217..f00b8d38 100644 --- a/res/layout/headlines.xml +++ b/res/layout/headlines.xml @@ -20,6 +20,7 @@ <FrameLayout
android:id="@+id/headlines_container"
+ android:background="?smallScreenBackground"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</FrameLayout>
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index b76909e3..4f003505 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -105,42 +105,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:padding="3dip" >
- </TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index ae24d5d8..ced2e03c 100644 --- a/res/layout/headlines_row_selected.xml +++ b/res/layout/headlines_row_selected.xml @@ -105,42 +105,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:padding="3dip" >
- </TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml index 088e468b..fafe39b5 100644 --- a/res/layout/headlines_row_unread.xml +++ b/res/layout/headlines_row_unread.xml @@ -105,42 +105,6 @@ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:padding="3dip" >
- </TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
-
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
-
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml index 6b3d9e2c..9ded814e 100644 --- a/res/values-v11/style.xml +++ b/res/values-v11/style.xml @@ -1,5 +1,6 @@ -<resources>
- <style name="LightTheme" parent="android:Theme.Holo.Light">
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+ <item name="smallScreenBackground">@android:color/transparent</item>
<item name="horizontalDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item>
<item name="unreadCounterColor">#0000ff</item>
@@ -23,7 +24,23 @@ <item name="loadingBackground">@android:color/white</item>
</style>
+ <style name="SepiaTheme" parent="LightTheme">
+ <item name="smallScreenBackground">@drawable/paper_sepia</item>
+ <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
+ <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item>
+ <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
+ <item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item>
+ <item name="headlineSelectedBackgroundSolid">@color/headline_row_selected_sepia</item>
+ <item name="feedsSelectedBackground">@drawable/headline_row_selected_sepia</item>
+ <item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_sepia</item>
+ <item name="articleBackground">@drawable/paper_sepia</item>
+ <item name="unreadCounterColor">#C46262</item>
+ <item name="feedlistTextColor">#35281C</item>
+ <item name="linkColor">#C46262</item>
+ </style>
+
<style name="DarkTheme" parent="android:Theme.Holo">
+ <item name="smallScreenBackground">@android:color/transparent</item>
<item name="horizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">@drawable/ics_divider_vertical</item>
<item name="unreadCounterColor">#303030</item>
diff --git a/res/values-v15/style.xml b/res/values-v15/style.xml deleted file mode 100644 index 89ccf673..00000000 --- a/res/values-v15/style.xml +++ /dev/null @@ -1,50 +0,0 @@ -<resources>
- <style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
- <item name="horizontalDivider">@android:drawable/divider_horizontal_bright</item>
- <item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item>
- <item name="unreadCounterColor">#0000ff</item>
- <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
- <item name="headlinesBackgroundSolid">#f0f0f0</item>
- <item name="articleBackground">#ffffff</item>
- <item name="headlineSelectedBackground">@drawable/headline_row_selected_light</item>
- <item name="headlineSelectedBackgroundSolid">@color/headline_row_selected_light</item>
- <item name="headlineUnreadBackground">@android:color/transparent</item>
- <item name="headlineNormalBackground">@android:color/transparent</item>
- <item name="feedsSelectedBackground">@drawable/headline_row_selected_light</item>
- <item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_light</item>
- <item name="feedlistTextColor">@android:color/primary_text_light</item>
- <item name="feedlistSelectedTextColor">#ffffff</item>
- <item name="headlineTextColor">#909090</item>
- <item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
- <item name="headlineSelectedTextColor">#ffffff</item>
- <item name="headlineExcerptTextColor">#909090</item>
- <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
- <item name="linkColor">#30B0E0</item>
- <item name="loadingBackground">@android:color/white</item>
- </style>
-
- <style name="DarkTheme" parent="android:Theme.Holo">
- <item name="horizontalDivider">@android:drawable/divider_horizontal_dark</item>
- <item name="feedlistBackground">@drawable/ics_divider_vertical</item>
- <item name="unreadCounterColor">#303030</item>
- <item name="headlinesBackground">@drawable/headlines_dark</item>
- <item name="headlinesBackgroundSolid">@drawable/headlines_dark</item>
- <item name="articleBackground">@android:color/black</item>
- <item name="headlineSelectedBackground">@drawable/headline_row_selected_dark</item>
- <item name="headlineSelectedBackgroundSolid">@color/ics_cyan</item>
- <item name="headlineUnreadBackground">@android:color/transparent</item>
- <item name="headlineNormalBackground">@android:color/transparent</item>
- <item name="feedsSelectedBackground">@drawable/headline_row_selected_dark</item>
- <item name="feedsSelectedBackgroundSolid">@color/ics_cyan</item>
- <item name="feedlistTextColor">@android:color/primary_text_dark</item>
- <item name="feedlistSelectedTextColor">@android:color/black</item>
- <item name="headlineTextColor">@android:color/secondary_text_dark</item>
- <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item>
- <item name="headlineSelectedTextColor">@android:color/white</item>
- <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
- <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
- <item name="linkColor">@color/ics_cyan</item>
- <item name="loadingBackground">@android:color/black</item>
- </style>
-
-</resources>
\ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 4a2ac390..0ee7ef8d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -2,10 +2,12 @@ <string-array name="pref_theme_names"> <item>@string/theme_dark</item> <item>@string/theme_light</item> + <item>@string/theme_sepia</item> </string-array> <string-array name="pref_theme_values"> <item>THEME_DARK</item> <item>THEME_LIGHT</item> + <item>THEME_SEPIA</item> </string-array> <string-array name="pref_font_size_names"> <item>@string/font_size_small</item> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 78ff45b4..29eff356 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -2,6 +2,7 @@ <resources>
<attr name="horizontalDivider" format="reference|color" />
<attr name="feedlistBackground" format="reference|color" />
+ <attr name="smallScreenBackground" format="reference|color" />
<attr name="unreadCounterColor" format="reference|color" />
<attr name="headlinesBackground" format="reference|color" />
<attr name="headlinesBackgroundSolid" format="reference|color" />
diff --git a/res/values/resources.xml b/res/values/resources.xml index 9016d532..f3c3cda3 100644 --- a/res/values/resources.xml +++ b/res/values/resources.xml @@ -3,7 +3,10 @@ <color name="feeds_light">#e0e0e0</color>
<color name="headlines_light">#ffffff</color>
+ <color name="headlines_sepia">#EAE2DC</color>
+ <color name="feeds_sepia">#D3C6BA</color>
<color name="headline_row_selected_light">#33b5e5</color>
+ <color name="headline_row_selected_sepia">#E5B0A0</color>
<color name="ics_cyan">#33b5e5</color>
</resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 7b1ab5fb..057f5f1d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -151,5 +151,6 @@ <string name="trial_purchase">Unlock full version</string> <string name="trial_expired">Trial expired</string> <string name="trial_expired_message">To continue using Tiny Tiny RSS please unlock the full version by purchasing the key.</string> + <string name="theme_sepia">Sepia</string> <string name="trial_thanks">Full version, thank you for support!</string> </resources>
\ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index 2ac03da2..09963fc4 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -1,6 +1,7 @@ <resources>
<style name="LightTheme" parent="android:Theme.Light">
+ <item name="smallScreenBackground">@android:color/white</item>
<item name="horizontalDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground">#fafafa</item>
<item name="unreadCounterColor">#0000ff</item>
@@ -23,8 +24,24 @@ <item name="linkColor">#5858F8</item>
<item name="loadingBackground">@android:color/white</item>
</style>
+
+ <style name="SepiaTheme" parent="LightTheme">
+ <item name="smallScreenBackground">@color/headlines_sepia</item>
+ <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
+ <item name="headlinesBackground">@color/headlines_sepia</item>
+ <item name="headlinesBackgroundSolid">@color/headlines_sepia</item>
+ <item name="headlineSelectedBackground">@color/headline_row_selected_sepia</item>
+ <item name="headlineSelectedBackgroundSolid">@color/headlines_sepia</item>
+ <item name="feedsSelectedBackground">@color/headline_row_selected_sepia</item>
+ <item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_sepia</item>
+ <item name="articleBackground">@color/headlines_sepia</item>
+ <item name="unreadCounterColor">#C46262</item>
+ <item name="feedlistTextColor">#35281C</item>
+ <item name="linkColor">#C46262</item>
+ </style>
<style name="DarkTheme" parent="android:Theme.Black">
+ <item name="smallScreenBackground">@android:color/black</item>
<item name="horizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">#101010</item>
<item name="unreadCounterColor">#303030</item>
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index e74b2468..282fb7f4 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -210,11 +210,10 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
cssOverride = "body { background : transparent; color : #e0e0e0}";
- //view.setBackgroundColor(android.R.color.black);
- web.setBackgroundColor(getResources().getColor(android.R.color.transparent));
} else {
- cssOverride = "";
+ cssOverride = "body { background : transparent; }";
}
+ web.setBackgroundColor(getResources().getColor(android.R.color.transparent));
String hexColor = String.format("#%06X", (0xFFFFFF & tv.data));
cssOverride += " a:link {color: "+hexColor+";} a:visited { color: "+hexColor+";}";
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index a129c10c..7d95e317 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -104,6 +104,10 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe ft.replace(R.id.feeds_fragment, new FeedsFragment(), FRAG_FEEDS);
}
+ /* if (!isSmallScreen()) {
+ ft.replace(R.id.headlines_fragment, new HeadlinesFragment(new Feed(-3, "Fresh articles", false)));
+ } */
+
ft.commit();
AppRater.appLaunched(this);
@@ -315,6 +319,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe intent.putExtra("searchQuery", hf.getSearchQuery());
startActivityForResult(intent, 0);
+ overridePendingTransition(R.anim.right_slide_in, 0);
}
} else {
initMenu();
diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java index 9b5d8a1f..81dd1043 100644 --- a/src/org/fox/ttrss/HeadlinesActivity.java +++ b/src/org/fox/ttrss/HeadlinesActivity.java @@ -234,4 +234,10 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL }
}
}
+
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ overridePendingTransition(0, R.anim.right_slide_out);
+ }
}
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 7379c099..d9298b10 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -63,7 +63,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, private Feed m_feed;
private Article m_activeArticle;
- private boolean m_combinedMode = true;
private String m_searchQuery = "";
private boolean m_refreshInProgress = false;
@@ -263,7 +262,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, //m_articles = savedInstanceState.getParcelable("articles");
m_activeArticle = savedInstanceState.getParcelable("activeArticle");
m_selectedArticles = savedInstanceState.getParcelable("selectedArticles");
- m_combinedMode = savedInstanceState.getBoolean("combinedMode");
m_searchQuery = (String) savedInstanceState.getCharSequence("searchQuery");
}
@@ -314,8 +312,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
m_activity = (OnlineActivity) activity;
m_listener = (HeadlinesEventListener) activity;
-
- m_combinedMode = false; /* m_prefs.getBoolean("combined_mode", false); */
}
@Override
@@ -327,12 +323,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (list != null) {
Article article = (Article)list.getItemAtPosition(position);
if (article.id >= 0) {
- if (m_combinedMode) {
- article.unread = false;
- m_activity.saveArticleUnread(article);
- } else {
- m_listener.onArticleSelected(article);
- }
+ m_listener.onArticleSelected(article);
// only set active article when it makes sense (in HeadlinesActivity)
if (getActivity().findViewById(R.id.article_fragment) != null) {
@@ -443,7 +434,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, //out.putParcelable("articles", m_articles);
out.putParcelable("activeArticle", m_activeArticle);
out.putParcelable("selectedArticles", m_selectedArticles);
- out.putBoolean("combinedMode", m_combinedMode);
out.putCharSequence("searchQuery", m_searchQuery);
}
@@ -591,12 +581,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, TextView tt = (TextView)v.findViewById(R.id.title);
if (tt != null) {
- if (m_combinedMode) {
- tt.setMovementMethod(LinkMovementMethod.getInstance());
- tt.setText(Html.fromHtml("<a href=\""+article.link.trim().replace("\"", "\\\"")+"\">" + article.title + "</a>"));
- } else {
- tt.setText(Html.fromHtml(article.title));
- }
+ tt.setText(Html.fromHtml(article.title));
}
TextView ft = (TextView)v.findViewById(R.id.feed_title);
@@ -654,16 +639,12 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, String articleContent = article.content != null ? article.content : "";
if (te != null) {
- if (!m_combinedMode) {
- String excerpt = Jsoup.parse(articleContent).text();
+ String excerpt = Jsoup.parse(articleContent).text();
- if (excerpt.length() > 100)
- excerpt = excerpt.substring(0, 100) + "...";
+ if (excerpt.length() > 100)
+ excerpt = excerpt.substring(0, 100) + "...";
- te.setText(excerpt);
- } else {
- te.setVisibility(View.GONE);
- }
+ te.setText(excerpt);
}
/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
@@ -671,97 +652,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (separator != null && m_onlineServices.isSmallScreen()) {
separator.setVisibility(View.GONE);
} */
-
- TextView content = (TextView)v.findViewById(R.id.content);
-
- if (content != null) {
- if (m_combinedMode) {
- content.setMovementMethod(LinkMovementMethod.getInstance());
-
- final Spinner spinner = (Spinner) v.findViewById(R.id.attachments);
-
- ArrayList<Attachment> spinnerArray = new ArrayList<Attachment>();
-
- ArrayAdapter<Attachment> spinnerArrayAdapter = new ArrayAdapter<Attachment>(
- getActivity(), android.R.layout.simple_spinner_item, spinnerArray);
-
- spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
- if (article.attachments != null && article.attachments.size() != 0) {
- for (Attachment a : article.attachments) {
- if (a.content_type != null && a.content_url != null) {
-
- try {
- URL url = new URL(a.content_url.trim());
-
- if (a.content_type.indexOf("image") != -1) {
- articleContent += "<br/><img src=\"" + url.toString().trim().replace("\"", "\\\"") + "\">";
- }
-
- spinnerArray.add(a);
-
- } catch (MalformedURLException e) {
- //
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- spinner.setAdapter(spinnerArrayAdapter);
-
- Button attachmentsView = (Button) v.findViewById(R.id.attachment_view);
-
- attachmentsView.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- Attachment attachment = (Attachment) spinner.getSelectedItem();
-
- Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(attachment.content_url));
- startActivity(browserIntent);
- }
- });
-
- Button attachmentsCopy = (Button) v.findViewById(R.id.attachment_copy);
-
- attachmentsCopy.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- Attachment attachment = (Attachment) spinner.getSelectedItem();
-
- if (attachment != null) {
- m_activity.copyToClipboard(attachment.content_url);
- }
- }
- });
-
- } else {
- v.findViewById(R.id.attachments_holder).setVisibility(View.GONE);
- }
-
- //content.setText(Html.fromHtml(article.content, new URLImageGetter(content, getActivity()), null));
- content.setText(Html.fromHtml(articleContent, m_dummyGetter, null));
-
- switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) {
- case 0:
- content.setTextSize(15F);
- break;
- case 1:
- content.setTextSize(18F);
- break;
- case 2:
- content.setTextSize(21F);
- break;
- }
-
- } else {
- content.setVisibility(View.GONE);
- v.findViewById(R.id.attachments_holder).setVisibility(View.GONE);
- }
-
- }
TextView dv = (TextView) v.findViewById(R.id.date);
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index 47ad86c0..004fab6e 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -135,6 +135,8 @@ public class OnlineActivity extends CommonActivity { if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
setTheme(R.style.DarkTheme);
+ } else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_SEPIA")) {
+ setTheme(R.style.SepiaTheme);
} else {
setTheme(R.style.LightTheme);
}
@@ -440,6 +442,7 @@ public class OnlineActivity extends CommonActivity { intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivityForResult(intent, 0);
+ overridePendingTransition(0, 0);
if (hasPendingOfflineData())
syncOfflineData();
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index f49e634d..a5494ed5 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -49,7 +49,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis private int m_feedId;
private boolean m_feedIsCat = false;
private int m_activeArticleId;
- private boolean m_combinedMode = true;
private String m_searchQuery = "";
private SharedPreferences m_prefs;
@@ -266,7 +265,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis m_feedId = savedInstanceState.getInt("feedId");
m_activeArticleId = savedInstanceState.getInt("activeArticleId");
//m_selectedArticles = savedInstanceState.getParcelableArrayList("selectedArticles");
- m_combinedMode = savedInstanceState.getBoolean("combinedMode");
m_searchQuery = (String) savedInstanceState.getCharSequence("searchQuery");
m_feedIsCat = savedInstanceState.getBoolean("feedIsCat");
} else {
@@ -324,7 +322,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis m_activity = (OfflineActivity) activity;
m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
- m_combinedMode = false; /* m_prefs.getBoolean("combined_mode", false); */
}
@Override
@@ -344,17 +341,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis m_activeArticleId = articleId;
}
- if (!m_combinedMode) {
- m_listener.onArticleSelected(articleId);
- } else {
- SQLiteStatement stmt = m_activity.getWritableDb().compileStatement(
- "UPDATE articles SET modified = 1, unread = 0 " + "WHERE " + BaseColumns._ID
- + " = ?");
-
- stmt.bindLong(1, articleId);
- stmt.execute();
- stmt.close();
- }
+ m_listener.onArticleSelected(articleId);
refresh();
}
@@ -367,7 +354,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis out.putInt("feedId", m_feedId);
out.putInt("activeArticleId", m_activeArticleId);
//out.putParcelableArrayList("selectedArticles", m_selectedArticles);
- out.putBoolean("combinedMode", m_combinedMode);
out.putCharSequence("searchQuery", m_searchQuery);
out.putBoolean("feedIsCat", m_feedIsCat);
}
@@ -451,13 +437,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis TextView tt = (TextView)v.findViewById(R.id.title);
if (tt != null) {
- if (m_combinedMode) {
- tt.setMovementMethod(LinkMovementMethod.getInstance());
- tt.setText(Html.fromHtml("<a href=\""+article.getString(article.getColumnIndex("link")).trim().replace("\"", "\\\"")+"\">" +
- article.getString(article.getColumnIndex("title")) + "</a>"));
- } else {
- tt.setText(Html.fromHtml(article.getString(article.getColumnIndex("title"))));
- }
+ tt.setText(Html.fromHtml(article.getString(article.getColumnIndex("title"))));
}
TextView ft = (TextView)v.findViewById(R.id.feed_title);
@@ -524,16 +504,12 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis TextView te = (TextView)v.findViewById(R.id.excerpt);
if (te != null) {
- if (!m_combinedMode) {
- String excerpt = Jsoup.parse(article.getString(article.getColumnIndex("content"))).text();
+ String excerpt = Jsoup.parse(article.getString(article.getColumnIndex("content"))).text();
- if (excerpt.length() > 100)
- excerpt = excerpt.substring(0, 100) + "...";
+ if (excerpt.length() > 100)
+ excerpt = excerpt.substring(0, 100) + "...";
- te.setText(excerpt);
- } else {
- te.setVisibility(View.GONE);
- }
+ te.setText(excerpt);
}
/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
@@ -542,32 +518,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis separator.setVisibility(View.GONE);
} */
- TextView content = (TextView)v.findViewById(R.id.content);
-
- if (content != null) {
- if (m_combinedMode) {
- content.setMovementMethod(LinkMovementMethod.getInstance());
-
- content.setText(Html.fromHtml(article.getString(article.getColumnIndex("content")), m_dummyGetter, null));
-
- switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) {
- case 0:
- content.setTextSize(15F);
- break;
- case 1:
- content.setTextSize(18F);
- break;
- case 2:
- content.setTextSize(21F);
- break;
- }
- } else {
- content.setVisibility(View.GONE);
- }
- }
-
- v.findViewById(R.id.attachments_holder).setVisibility(View.GONE);
-
TextView dv = (TextView) v.findViewById(R.id.date);
if (dv != null) {
|
