diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/layout/feeds_row.xml | 59 | ||||
| -rw-r--r-- | res/layout/feeds_row_selected.xml | 60 |
3 files changed, 70 insertions, 53 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8c700005..0216550c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="143" - android:versionName="1.20" > + android:versionCode="144" + android:versionName="1.21" > <uses-sdk android:minSdkVersion="8" diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml index 0fde2d33..bd033b25 100644 --- a/res/layout/feeds_row.xml +++ b/res/layout/feeds_row.xml @@ -1,36 +1,45 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/feeds_row" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" 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"> + android:orientation="horizontal" + android:paddingBottom="10dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" + android:paddingTop="10dip" > <ImageView android:id="@+id/icon" - android:layout_width="16dp" - android:layout_height="16dp" - android:scaleType="fitXY" + android:layout_width="20dp" + android:layout_height="20dp" android:layout_weight="0" + android:scaleType="fitXY" android:src="@drawable/ic_rss_bw" /> - <TextView - android:id="@+id/title" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:paddingLeft="6dip" - android:textColor="?feedlistTextColor" - android:text="{FEED}" android:layout_width="0dp" android:textSize="18dip"/> - <TextView - android:id="@+id/unread_counter" - android:gravity="right" - android:textStyle="bold" - android:paddingRight="12dip" - android:textColor="?unreadCounterColor" - android:layout_gravity="center_vertical" - android:layout_width="wrap_content" - android:layout_weight="0" - android:layout_height="wrap_content" - android:text="{123}" android:textSize="13sp"/> - + <TextView + android:id="@+id/title" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:paddingLeft="8dip" + android:text="{FEED}" + android:textColor="?feedlistTextColor" + android:textSize="18dip" /> + + <TextView + android:id="@+id/unread_counter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="0" + android:gravity="right" + android:paddingRight="12dip" + android:text="{123}" + android:textColor="?unreadCounterColor" + android:textSize="13sp" + android:textStyle="bold" /> + </LinearLayout>
\ No newline at end of file diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml index 7b920858..cb95a819 100644 --- a/res/layout/feeds_row_selected.xml +++ b/res/layout/feeds_row_selected.xml @@ -1,38 +1,46 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/feeds_row" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" android:background="?feedsSelectedBackgroundSolid" 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"> + android:orientation="horizontal" + android:paddingBottom="10dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" + android:paddingTop="10dip" > <ImageView android:id="@+id/icon" - android:layout_width="16dp" - android:layout_height="16dp" - android:scaleType="fitXY" - + android:layout_width="20dp" + android:layout_height="20dp" android:layout_weight="0" + android:scaleType="fitXY" android:src="@drawable/ic_rss_bw" /> - <TextView - android:id="@+id/title" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:paddingLeft="6dip" - android:textColor="?feedlistSelectedTextColor" - android:text="{FEED}" android:layout_width="0dp" android:textSize="18dip"/> - <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_weight="0" - android:layout_height="wrap_content" - android:text="{123}" android:textSize="13sp"/> - + <TextView + android:id="@+id/title" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:paddingLeft="6dip" + android:text="{FEED}" + android:textColor="?feedlistSelectedTextColor" + android:textSize="18dip" /> + + <TextView + android:id="@+id/unread_counter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="0" + android:gravity="right" + android:paddingRight="8dip" + android:text="{123}" + android:textColor="?unreadCounterColor" + android:textSize="13sp" + android:textStyle="bold" /> + </LinearLayout>
\ No newline at end of file |