iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sepia theme fixes; update overflow icons to use modern holo style;

Browse Source 
enable overflow icons for feed items
This commit is contained in:
Andrew Dolgov 2013-09-09 13:34:53 +04:00
parent 736c2233cf
commit 92d63150a0
22 changed files with 152 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_action_overflow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 274 B

BIN
res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 350 B

19
res/drawable/headline_row.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#f0f0f0" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_selected.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#88b0f0" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_selected_sepia.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#E5B0A0" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_sepia.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#f0f0f0" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_unread.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#ffffff" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_unread_sepia.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#ffffff" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

5
res/layout/feeds_row.xml
View File

@ -58,9 +58,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:background="@null"
android:paddingLeft="6dp" android:src="@drawable/ic_action_overflow" />
android:paddingTop="6dp"
android:visibility="gone"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

5
res/layout/feeds_row_selected.xml
View File

@ -58,9 +58,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:background="@null"
android:paddingLeft="6dp" android:src="@drawable/ic_action_overflow" />
android:paddingTop="6dp"
android:visibility="gone"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

17
res/layout/headlines_row.xml
View File

@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp" android:paddingRight="6dp"
android:paddingTop="3dp" > android:paddingTop="3dp"
tools:ignore="HardcodedText" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
@ -14,7 +16,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineNormalBackground" android:background="?headlineNormalBackground"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
@ -117,17 +122,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:clickable="true" android:clickable="true"
android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
<ImageButton <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:src="@drawable/ic_action_overflow" />
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

10
res/layout/headlines_row_selected.xml
View File

@ -14,7 +14,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineSelectedBackground" android:background="?headlineSelectedBackground"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
@ -117,17 +117,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:clickable="true" android:clickable="true"
android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
<ImageButton <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:src="@drawable/ic_action_overflow" />
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

10
res/layout/headlines_row_selected_unread.xml
View File

@ -14,7 +14,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineSelectedBackground" android:background="?headlineSelectedBackground"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
@ -118,17 +118,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:clickable="true" android:clickable="true"
android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
<ImageButton <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:src="@drawable/ic_action_overflow" />
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

10
res/layout/headlines_row_unread.xml
View File

@ -14,7 +14,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineUnreadBackground" android:background="?headlineUnreadBackground"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
@ -118,17 +118,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:clickable="true" android:clickable="true"
android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
<ImageButton <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:src="@drawable/ic_action_overflow" />
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

11
res/values-v11/style.xml
View File

@ -7,9 +7,9 @@
<item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item> <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
<item name="headlinesBackgroundSolid">#f0f0f0</item> <item name="headlinesBackgroundSolid">#f0f0f0</item>
<item name="articleBackground">@android:color/transparent</item> <item name="articleBackground">@android:color/transparent</item>
<item name="headlineSelectedBackground">#88b0f0</item> <item name="headlineSelectedBackground">@drawable/headline_row_selected</item>
<item name="headlineUnreadBackground">#ffffff</item> <item name="headlineUnreadBackground">@drawable/headline_row_unread</item>
<item name="headlineNormalBackground">#f0f0f0</item> <item name="headlineNormalBackground">@drawable/headline_row</item>
<item name="feedsSelectedBackground">#88b0f0</item> <item name="feedsSelectedBackground">#88b0f0</item>
<item name="feedlistTextColor">@android:color/primary_text_light</item> <item name="feedlistTextColor">@android:color/primary_text_light</item>
<item name="feedlistSelectedTextColor">#ffffff</item> <item name="feedlistSelectedTextColor">#ffffff</item>
@ -32,8 +32,9 @@
<item name="feedlistBackground">@drawable/shadow_feeds_sepia</item> <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
<item name="headlinesBackground">@drawable/shadow_headlines_sepia</item> <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item>
<item name="headlinesBackgroundSolid">@drawable/paper_sepia</item> <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
<item name="headlineUnreadBackground">#f2eae8</item> <!-- #F2EAE8 --> <item name="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 -->
<item name="headlineSelectedBackground">#E5B0A0</item> <item name="headlineNormalBackground">@drawable/headline_row_sepia</item>
<item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item> <!-- #E5B0A0 -->
<item name="feedsSelectedBackground">#E5B0A0</item> <item name="feedsSelectedBackground">#E5B0A0</item>
<item name="articleBackground">@drawable/paper_sepia</item> <item name="articleBackground">@drawable/paper_sepia</item>
<item name="unreadCounterBackground">@drawable/counter_background_sepia</item> <item name="unreadCounterBackground">@drawable/counter_background_sepia</item>

3
src/org/fox/ttrss/FeedCategoriesFragment.java
View File

@ -415,9 +415,6 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

3
src/org/fox/ttrss/FeedsFragment.java
View File

@ -542,9 +542,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

10
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -795,13 +795,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
}); });
} }
ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button); ImageView iv = (ImageView) v.findViewById(R.id.article_menu_button);
if (ib != null) { if (iv != null) {
if (m_activity.isDarkTheme()) //if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); // ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { iv.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
getActivity().openContextMenu(v); getActivity().openContextMenu(v);

3
src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
View File

@ -288,9 +288,6 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

3
src/org/fox/ttrss/offline/OfflineFeedsFragment.java
View File

@ -322,9 +322,6 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

6
src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
View File

@ -645,11 +645,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
}); });
} }
ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button); ImageView ib = (ImageView) v.findViewById(R.id.article_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme()) //if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); // ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override