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

remove pill counters

Browse Source
This commit is contained in:
Andrew Dolgov 2014-11-01 12:02:01 +04:00
parent 081b98e9c0
commit 2a06e4de30
12 changed files with 48 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="255" android:versionCode="256"
android:versionName="1.52" > android:versionName="1.53" >
<uses-sdk <uses-sdk
android:minSdkVersion="9" android:minSdkVersion="9"

12
org.fox.ttrss/src/main/res/drawable/counter_background.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/unread_counter_background" />
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp"
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
</shape>

12
org.fox.ttrss/src/main/res/drawable/counter_background_dark.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/unread_counter_background_dark" />
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp"
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
</shape>

12
org.fox.ttrss/src/main/res/drawable/counter_background_selected_light.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/unread_counter_background_selected_light" />
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp"
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
</shape>

12
org.fox.ttrss/src/main/res/drawable/counter_background_sepia.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/unread_counter_background_sepia" />
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp"
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
</shape>

2
org.fox.ttrss/src/main/res/layout/cats_fragment.xml
View File

@ -11,6 +11,8 @@
<ListView <ListView
android:id="@+id/feeds" android:id="@+id/feeds"
android:dividerHeight="0dp"
android:divider="@null"
android:layoutAnimation="@anim/layout_feeds" android:layoutAnimation="@anim/layout_feeds"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent" >

2
org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
View File

@ -13,6 +13,8 @@
<ListView <ListView
android:id="@+id/feeds" android:id="@+id/feeds"
android:dividerHeight="0dp"
android:divider="@null"
android:layoutAnimation="@anim/layout_feeds" android:layoutAnimation="@anim/layout_feeds"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent" >

39
org.fox.ttrss/src/main/res/layout/feeds_row.xml
View File

@ -4,17 +4,19 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:baselineAligned="true"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingBottom="10dip"
android:paddingLeft="8dip"
android:paddingRight="8dip"
android:paddingTop="10dip" >
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="20dp" android:layout_gravity="center_vertical"
android:layout_height="20dp" android:layout_width="16dp"
android:layout_height="16dp"
android:layout_weight="0" android:layout_weight="0"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_unpublished" /> android:src="@drawable/ic_unpublished" />
@ -22,34 +24,27 @@
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:gravity="center_vertical"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:paddingLeft="8dip" android:paddingLeft="12dip"
android:singleLine="true" android:singleLine="true"
android:text="{FEED}" android:text="Feed"
android:paddingBottom="2dp"
android:textColor="?feedlistTextColor" android:textColor="?feedlistTextColor"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView <TextView
android:id="@+id/unread_counter" android:id="@+id/unread_counter"
android:layout_width="45dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="6dp"
android:layout_weight="0" android:layout_weight="0"
android:background="?attr/unreadCounterBackground"
android:gravity="center"
android:paddingBottom="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:singleLine="true" android:singleLine="true"
android:text="3200" android:text="3200"
android:textColor="?unreadCounterColor" android:textColor="?unreadCounterColor"
android:textSize="12sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
<ImageButton <ImageButton
@ -59,7 +54,7 @@
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:background="@null"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="4dp" android:visibility="gone"
android:src="@drawable/ic_action_overflow" /> android:src="@drawable/ic_action_overflow" />
</LinearLayout> </LinearLayout>

43
org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
View File

@ -3,54 +3,49 @@
android:id="@+id/feeds_row" android:id="@+id/feeds_row"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:background="?feedsSelectedBackground"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
android:background="?feedsSelectedBackground"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:baselineAligned="true"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingBottom="10dip"
android:paddingLeft="8dip"
android:paddingRight="8dip"
android:paddingTop="10dip" >
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="20dp" android:layout_gravity="center_vertical"
android:layout_height="20dp" android:layout_width="16dp"
android:layout_height="16dp"
android:layout_weight="0" android:layout_weight="0"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_unpublished" /> android:src="@drawable/ic_unpublished" />
<TextView <TextView
android:fontFamily="sans-serif-light"
android:id="@+id/title" android:id="@+id/title"
android:layout_width="0dp" android:fontFamily="sans-serif-light"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:gravity="center_vertical"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:paddingLeft="8dip" android:paddingLeft="12dip"
android:singleLine="true" android:singleLine="true"
android:text="{FEED}" android:text="Feed"
android:paddingBottom="2dp"
android:textColor="?feedlistSelectedTextColor" android:textColor="?feedlistSelectedTextColor"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView <TextView
android:id="@+id/unread_counter" android:id="@+id/unread_counter"
android:layout_width="45dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="6dp"
android:layout_weight="0" android:layout_weight="0"
android:background="?attr/unreadSelectedCounterBackground"
android:gravity="center"
android:paddingBottom="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:singleLine="true" android:singleLine="true"
android:text="3200" android:text="3200"
android:textColor="?unreadCounterColor" android:textColor="?unreadCounterColor"
android:textSize="12sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
<ImageButton <ImageButton
@ -60,7 +55,7 @@
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:background="@null"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="4dp" android:visibility="gone"
android:src="@drawable/ic_action_overflow" /> android:src="@drawable/ic_action_overflow" />
</LinearLayout> </LinearLayout>

2
org.fox.ttrss/src/main/res/layout/headlines_footer.xml
View File

@ -10,6 +10,6 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?unreadCounterBackground"/> android:background="?feedsSelectedBackground"/>
</FrameLayout> </FrameLayout>

2
org.fox.ttrss/src/main/res/values/attrs.xml
View File

@ -23,8 +23,6 @@
<attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" /> <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
<attr name="linkColor" format="reference|color" /> <attr name="linkColor" format="reference|color" />
<attr name="loadingBackground" format="reference|color" /> <attr name="loadingBackground" format="reference|color" />
<attr name="unreadCounterBackground" format="reference|color" />
<attr name="unreadSelectedCounterBackground" format="reference|color" />
<attr name="articleNoteBackground" format="reference|color" /> <attr name="articleNoteBackground" format="reference|color" />
<attr name="articleNoteTextColor" format="reference|color" /> <attr name="articleNoteTextColor" format="reference|color" />
<attr name="statusBarHintColor" format="reference|color" /> <attr name="statusBarHintColor" format="reference|color" />

17
org.fox.ttrss/src/main/res/values/style.xml
View File

@ -5,14 +5,14 @@
<item name="smallScreenBackground">#eeeeee</item> <item name="smallScreenBackground">#eeeeee</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item> <item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item>
<item name="unreadCounterColor">#ffffff</item> <item name="unreadCounterColor">#909090</item>
<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">#88b0f0</item>
<item name="headlineUnreadBackground">@android:color/white</item> <item name="headlineUnreadBackground">@android:color/white</item>
<item name="headlineNormalBackground">#f5f5f5</item> <item name="headlineNormalBackground">#f5f5f5</item>
<item name="feedsSelectedBackground">#88b0f0</item> <item name="feedsSelectedBackground">#526a8e</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>
<item name="headlineTextColor">@android:color/secondary_text_light</item> <item name="headlineTextColor">@android:color/secondary_text_light</item>
@ -25,8 +25,6 @@
<item name="headlineTitleHighScoreUnreadTextColor">#008000</item> <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
<item name="linkColor">#4684ff</item> <item name="linkColor">#4684ff</item>
<item name="loadingBackground">@android:color/white</item> <item name="loadingBackground">@android:color/white</item>
<item name="unreadCounterBackground">@drawable/counter_background</item>
<item name="unreadSelectedCounterBackground">@drawable/counter_background_selected_light</item>
<item name="articleNoteTextColor">#9a8c59</item> <item name="articleNoteTextColor">#9a8c59</item>
<item name="articleNoteBackground">#fff7d5</item> <item name="articleNoteBackground">#fff7d5</item>
<item name="parentBtnBackground">#dddddd</item> <item name="parentBtnBackground">#dddddd</item>
@ -46,10 +44,8 @@
<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="headlineSelectedBackground">#E5B0A0</item> <item name="headlineSelectedBackground">#E5B0A0</item>
<item name="feedsSelectedBackground">#E5B0A0</item> <item name="feedsSelectedBackground">#7F3F3F</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="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item>
<item name="feedlistTextColor">#35281C</item> <item name="feedlistTextColor">#35281C</item>
<item name="linkColor">#C46262</item> <item name="linkColor">#C46262</item>
@ -66,7 +62,7 @@
<item name="smallScreenBackground">@android:color/transparent</item> <item name="smallScreenBackground">@android:color/transparent</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">@android:color/transparent</item> <item name="feedlistBackground">@android:color/transparent</item>
<item name="unreadCounterColor">#ffffff</item> <item name="unreadCounterColor">#909090</item>
<item name="headlinesBackground">@android:color/black</item> <item name="headlinesBackground">@android:color/black</item>
<item name="headlinesBackgroundSolid">@android:color/black</item> <item name="headlinesBackgroundSolid">@android:color/black</item>
<item name="articleBackground">@android:color/black</item> <item name="articleBackground">@android:color/black</item>
@ -86,8 +82,6 @@
<item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item> <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
<item name="linkColor">@color/ics_cyan</item> <item name="linkColor">@color/ics_cyan</item>
<item name="loadingBackground">@android:color/black</item> <item name="loadingBackground">@android:color/black</item>
<item name="unreadCounterBackground">@drawable/counter_background_dark</item>
<item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
<item name="articleNoteTextColor">@android:color/secondary_text_dark</item> <item name="articleNoteTextColor">@android:color/secondary_text_dark</item>
<item name="articleNoteBackground">#303030</item> <item name="articleNoteBackground">#303030</item>
<item name="parentBtnBackground">#101010</item> <item name="parentBtnBackground">#101010</item>
@ -106,11 +100,10 @@
<item name="articleBackground">@color/feeds_dark_gray</item> <item name="articleBackground">@color/feeds_dark_gray</item>
<item name="headlineSelectedBackground">#51698E</item> <item name="headlineSelectedBackground">#51698E</item>
<item name="headlineUnreadBackground">#383c42</item> <item name="headlineUnreadBackground">#383c42</item>
<item name="feedsSelectedBackground">#51698E</item> <item name="feedsSelectedBackground">#445877</item>
<item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item> <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item> <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
<item name="headlineTextColor">@android:color/secondary_text_dark</item> <item name="headlineTextColor">@android:color/secondary_text_dark</item>
<!-- <item name="actionBarStyle">@style/ActionBarDarkGray</item> -->
<item name="headlineSelectedSecondaryTextColor">#a0a0a0</item> <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
<item name="colorPrimary">#51698E</item> <item name="colorPrimary">#51698E</item>