remove selected variants for card layouts (unused)
This commit is contained in:
Andrew Dolgov
parent
a7e86f29de
commit
f88e647b40
@ -720,10 +720,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
|
|||||||
layoutId = m_compactLayoutMode ? R.layout.headlines_row_unread_compact : R.layout.headlines_row_unread;
|
layoutId = m_compactLayoutMode ? R.layout.headlines_row_unread_compact : R.layout.headlines_row_unread;
|
||||||
break;
|
break;
|
||||||
case VIEW_SELECTED:
|
case VIEW_SELECTED:
|
||||||
layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_compact : R.layout.headlines_row_selected;
|
layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_compact : R.layout.headlines_row;
|
||||||
break;
|
break;
|
||||||
case VIEW_SELECTED_UNREAD:
|
case VIEW_SELECTED_UNREAD:
|
||||||
layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_unread_compact : R.layout.headlines_row_selected_unread;
|
layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_unread_compact : R.layout.headlines_row_unread;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
4
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
Normal file → Executable file
4
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
Normal file → Executable file
@ -538,10 +538,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
|
|||||||
layoutId = m_compactLayoutMode ? R.layout.headlines_row_unread_compact : R.layout.headlines_row_unread;
|
layoutId = m_compactLayoutMode ? R.layout.headlines_row_unread_compact : R.layout.headlines_row_unread;
|
||||||
break;
|
break;
|
||||||
case VIEW_SELECTED:
|
case VIEW_SELECTED:
|
||||||
layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_compact : R.layout.headlines_row_selected;
|
layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_compact : R.layout.headlines_row;
|
||||||
break;
|
break;
|
||||||
case VIEW_SELECTED_UNREAD:
|
case VIEW_SELECTED_UNREAD:
|
||||||
layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_unread_compact : R.layout.headlines_row_selected_unread;
|
layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_unread_compact : R.layout.headlines_row_unread;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,192 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<android.support.v7.widget.CardView
|
|
||||||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/headlines_row"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
card_view:cardElevation="2dp"
|
|
||||||
card_view:cardUseCompatPadding="true"
|
|
||||||
card_view:cardBackgroundColor="?headlineSelectedBackground"
|
|
||||||
tools:ignore="HardcodedText" >
|
|
||||||
|
|
||||||
<TableLayout
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="8dp"
|
|
||||||
android:baselineAligned="false"
|
|
||||||
android:shrinkColumns="0,1"
|
|
||||||
android:stretchColumns="0,1">
|
|
||||||
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/title"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:singleLine="false"
|
|
||||||
android:text="Sample entry title"
|
|
||||||
android:textColor="?headlineSelectedTextColor"
|
|
||||||
android:textSize="18sp"
|
|
||||||
android:paddingBottom="8dp"
|
|
||||||
android:layout_span="2" />
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/feed_title"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
|
|
||||||
android:textColor="?headlineSelectedSecondaryTextColor"
|
|
||||||
android:textSize="12sp"
|
|
||||||
android:layout_weight="0.5" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/date"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:gravity="right|center_vertical"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:ellipsize="none"
|
|
||||||
android:text="Jan 01, 12:00, 1970"
|
|
||||||
android:textColor="?headlineSelectedSecondaryTextColor"
|
|
||||||
android:textSize="12sp"
|
|
||||||
android:layout_weight="0.5" />
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:id="@+id/flavorImageHolder"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_span="2"
|
|
||||||
android:paddingTop="8dp">
|
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:id="@+id/flavorImageLoadingBar" />
|
|
||||||
|
|
||||||
<org.fox.ttrss.util.EnlargingImageView
|
|
||||||
android:id="@+id/flavor_image"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:adjustViewBounds="true"
|
|
||||||
android:scaleType="fitCenter"
|
|
||||||
android:cropToPadding="true"
|
|
||||||
android:visibility="visible" />
|
|
||||||
|
|
||||||
<org.fox.ttrss.util.ArrowRight
|
|
||||||
android:layout_marginRight="4dp"
|
|
||||||
android:id="@+id/flavorImageArrow"
|
|
||||||
android:layout_width="64dp"
|
|
||||||
android:layout_gravity="center|right"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_height="64dp" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/excerpt"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:lineSpacingExtra="2sp"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
android:maxLines="5"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
|
|
||||||
android:textColor="?headlineSelectedExcerptTextColor"
|
|
||||||
android:textSize="13sp"
|
|
||||||
android:layout_span="2"
|
|
||||||
android:paddingBottom="8dp" />
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/headline_footer"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:layout_span="2">
|
|
||||||
|
|
||||||
<CheckBox
|
|
||||||
android:id="@+id/selected"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="0"
|
|
||||||
android:focusable="false" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/author"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:text="by Author"
|
|
||||||
android:textColor="?headlineSelectedSecondaryTextColor"
|
|
||||||
android:textSize="12sp"
|
|
||||||
android:textStyle="italic" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/marked"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:paddingLeft="4dp"
|
|
||||||
android:paddingRight="4dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
android:clickable="true"
|
|
||||||
android:src="@drawable/ic_star_empty" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/published"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:paddingLeft="4dp"
|
|
||||||
android:paddingRight="4dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
android:clickable="true"
|
|
||||||
android:src="@drawable/ic_unpublished" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/article_menu_button"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
android:paddingLeft="4dp"
|
|
||||||
android:paddingRight="4dp"
|
|
||||||
android:src="@drawable/ic_action_overflow" />
|
|
||||||
</LinearLayout>
|
|
||||||
</TableRow>
|
|
||||||
</TableLayout>
|
|
||||||
|
|
||||||
</android.support.v7.widget.CardView>
|
|
||||||
@ -1,193 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<android.support.v7.widget.CardView
|
|
||||||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/headlines_row"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
card_view:cardElevation="2dp"
|
|
||||||
card_view:cardUseCompatPadding="true"
|
|
||||||
card_view:cardBackgroundColor="?headlineSelectedBackground"
|
|
||||||
tools:ignore="HardcodedText" >
|
|
||||||
|
|
||||||
<TableLayout
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="8dp"
|
|
||||||
android:baselineAligned="false"
|
|
||||||
android:shrinkColumns="0,1"
|
|
||||||
android:stretchColumns="0,1">
|
|
||||||
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/title"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:singleLine="false"
|
|
||||||
android:text="Sample entry title"
|
|
||||||
android:textColor="?headlineSelectedTextColor"
|
|
||||||
android:textSize="18sp"
|
|
||||||
android:fontFamily="sans-serif-medium"
|
|
||||||
android:paddingBottom="8dp"
|
|
||||||
android:layout_span="2" />
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/feed_title"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
|
|
||||||
android:textColor="?headlineSelectedSecondaryTextColor"
|
|
||||||
android:textSize="12sp"
|
|
||||||
android:layout_weight="0.5" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/date"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:gravity="right|center_vertical"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:ellipsize="none"
|
|
||||||
android:text="Jan 01, 12:00, 1970"
|
|
||||||
android:textColor="?headlineSelectedSecondaryTextColor"
|
|
||||||
android:textSize="12sp"
|
|
||||||
android:layout_weight="0.5" />
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:id="@+id/flavorImageHolder"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
android:layout_span="2">
|
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:id="@+id/flavorImageLoadingBar" />
|
|
||||||
|
|
||||||
<org.fox.ttrss.util.EnlargingImageView
|
|
||||||
android:id="@+id/flavor_image"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:adjustViewBounds="true"
|
|
||||||
android:scaleType="fitCenter"
|
|
||||||
android:cropToPadding="true"
|
|
||||||
android:visibility="visible" />
|
|
||||||
|
|
||||||
<org.fox.ttrss.util.ArrowRight
|
|
||||||
android:layout_marginRight="4dp"
|
|
||||||
android:id="@+id/flavorImageArrow"
|
|
||||||
android:layout_width="64dp"
|
|
||||||
android:layout_gravity="center|right"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_height="64dp" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/excerpt"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:lineSpacingExtra="2sp"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
android:maxLines="5"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
|
|
||||||
android:textColor="?headlineSelectedExcerptTextColor"
|
|
||||||
android:textSize="13sp"
|
|
||||||
android:layout_span="2"
|
|
||||||
android:paddingBottom="8dp" />
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/headline_footer"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:layout_span="2">
|
|
||||||
|
|
||||||
<CheckBox
|
|
||||||
android:id="@+id/selected"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="0"
|
|
||||||
android:focusable="false" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/author"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:text="by Author"
|
|
||||||
android:textColor="?headlineSelectedSecondaryTextColor"
|
|
||||||
android:textSize="12sp"
|
|
||||||
android:textStyle="italic" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/marked"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:paddingLeft="4dp"
|
|
||||||
android:paddingRight="4dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
android:clickable="true"
|
|
||||||
android:src="@drawable/ic_star_empty" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/published"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:paddingLeft="4dp"
|
|
||||||
android:paddingRight="4dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
android:clickable="true"
|
|
||||||
android:src="@drawable/ic_unpublished" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/article_menu_button"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
android:paddingLeft="4dp"
|
|
||||||
android:paddingRight="4dp"
|
|
||||||
android:src="@drawable/ic_action_overflow" />
|
|
||||||
</LinearLayout>
|
|
||||||
</TableRow>
|
|
||||||
</TableLayout>
|
|
||||||
|
|
||||||
</android.support.v7.widget.CardView>
|
|
||||||
Loading…
Reference in New Issue
Block a user