diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout')
5 files changed, 41 insertions, 47 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml index 4a950933..1f0fc38b 100644 --- a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml @@ -11,6 +11,8 @@ <ListView android:id="@+id/feeds" + android:dividerHeight="0dp" + android:divider="@null" android:layoutAnimation="@anim/layout_feeds" android:layout_width="match_parent" android:layout_height="match_parent" > diff --git a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml index aa02ffff..4c5ad73a 100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml @@ -13,6 +13,8 @@ <ListView android:id="@+id/feeds" + android:dividerHeight="0dp" + android:divider="@null" android:layoutAnimation="@anim/layout_feeds" android:layout_width="match_parent" android:layout_height="match_parent" > diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index f2fc286c..38603144 100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -4,17 +4,19 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:descendantFocusability="blocksDescendants" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="6dp" + android:paddingBottom="6dp" + android:baselineAligned="true" android:gravity="center_vertical" - android:orientation="horizontal" - android:paddingBottom="10dip" - android:paddingLeft="8dip" - android:paddingRight="8dip" - android:paddingTop="10dip" > + android:orientation="horizontal"> <ImageView android:id="@+id/icon" - android:layout_width="20dp" - android:layout_height="20dp" + android:layout_gravity="center_vertical" + android:layout_width="16dp" + android:layout_height="16dp" android:layout_weight="0" android:scaleType="fitXY" android:src="@drawable/ic_unpublished" /> @@ -22,34 +24,27 @@ <TextView android:id="@+id/title" android:fontFamily="sans-serif-light" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" + android:gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingLeft="8dip" + android:paddingLeft="12dip" android:singleLine="true" - android:text="{FEED}" + android:text="Feed" + android:paddingBottom="2dp" android:textColor="?feedlistTextColor" android:textSize="18sp" /> <TextView android:id="@+id/unread_counter" - android:layout_width="45dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginRight="6dp" 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:text="3200" android:textColor="?unreadCounterColor" - android:textSize="12sp" + android:textSize="14sp" android:textStyle="bold" /> <ImageButton @@ -59,7 +54,7 @@ android:layout_weight="0" android:background="@null" android:paddingLeft="8dp" - android:paddingRight="4dp" + android:visibility="gone" android:src="@drawable/ic_action_overflow" /> </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml index 6cf43666..734fe637 100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml @@ -3,54 +3,49 @@ android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:background="?feedsSelectedBackground" 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:orientation="horizontal" - android:paddingBottom="10dip" - android:paddingLeft="8dip" - android:paddingRight="8dip" - android:paddingTop="10dip" > + android:orientation="horizontal"> <ImageView android:id="@+id/icon" - android:layout_width="20dp" - android:layout_height="20dp" + android:layout_gravity="center_vertical" + android:layout_width="16dp" + android:layout_height="16dp" android:layout_weight="0" android:scaleType="fitXY" android:src="@drawable/ic_unpublished" /> <TextView - android:fontFamily="sans-serif-light" 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_gravity="center_vertical" + android:gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingLeft="8dip" + android:paddingLeft="12dip" android:singleLine="true" - android:text="{FEED}" + android:text="Feed" + android:paddingBottom="2dp" android:textColor="?feedlistSelectedTextColor" android:textSize="18sp" /> <TextView android:id="@+id/unread_counter" - android:layout_width="45dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginRight="6dp" 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:text="3200" android:textColor="?unreadCounterColor" - android:textSize="12sp" + android:textSize="14sp" android:textStyle="bold" /> <ImageButton @@ -60,7 +55,7 @@ android:layout_weight="0" android:background="@null" android:paddingLeft="8dp" - android:paddingRight="4dp" + android:visibility="gone" android:src="@drawable/ic_action_overflow" /> </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml index 5877aae9..332c9882 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml @@ -10,6 +10,6 @@ android:layout_marginTop="10dp" android:layout_width="128dp" android:layout_height="1dp" - android:background="?unreadCounterBackground"/> + android:background="?feedsSelectedBackground"/> </FrameLayout>
\ No newline at end of file |