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

some initial stuff

Browse Source
This commit is contained in:
Andrew Dolgov 2015-07-10 19:34:21 +03:00
parent 7c7ce0f544
commit a0118d6832
3 changed files with 169 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -667,6 +667,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
public View headlineFooter; public View headlineFooter;
public ImageView textImage; public ImageView textImage;
public ImageView textChecked; public ImageView textChecked;
public View headlineHeader;
} }
private class ArticleListAdapter extends ArrayAdapter<Article> { private class ArticleListAdapter extends ArrayAdapter<Article> {
@ -859,6 +860,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.headlineFooter = v.findViewById(R.id.headline_footer); holder.headlineFooter = v.findViewById(R.id.headline_footer);
holder.textImage = (ImageView) v.findViewById(R.id.text_image); holder.textImage = (ImageView) v.findViewById(R.id.text_image);
holder.textChecked = (ImageView) v.findViewById(R.id.text_checked); holder.textChecked = (ImageView) v.findViewById(R.id.text_checked);
holder.headlineHeader = v.findViewById(R.id.headline_header);
v.setTag(holder); v.setTag(holder);
@ -1283,6 +1285,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
} else { } else {
holder.flavorImageView.setVisibility(View.VISIBLE); holder.flavorImageView.setVisibility(View.VISIBLE);
} }
} }

159
org.fox.ttrss/src/main/res/layout/headlines_row.xml
View File

@ -1,69 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="HardcodedText" > tools:ignore="HardcodedText">
<TableLayout <TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/activity_horizontal_margin"
android:baselineAligned="false" android:baselineAligned="false"
android:shrinkColumns="0,1" android:shrinkColumns="0,1"
android:stretchColumns="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="?headlineExcerptTextColor"
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="?headlineSecondaryTextColor"
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="?headlineSecondaryTextColor"
android:textSize="12sp"
android:layout_weight="0.5" />
</TableRow>
<TableRow <TableRow
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -72,23 +22,24 @@
android:id="@+id/flavorImageHolder" android:id="@+id/flavorImageHolder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_span="2" android:layout_span="2">
android:paddingTop="8dp">
<ProgressBar <ProgressBar
android:id="@+id/flavorImageLoadingBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center" />
android:id="@+id/flavorImageLoadingBar" />
<org.fox.ttrss.util.EnlargingImageView <org.fox.ttrss.util.EnlargingImageView
android:id="@+id/flavor_image" android:id="@+id/flavor_image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/headline_header"
android:layout_gravity="center" android:layout_gravity="center"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:cropToPadding="true" android:cropToPadding="true"
android:scaleType="fitCenter"
android:src="@drawable/drawer_header"
android:visibility="visible" /> android:visibility="visible" />
<ImageView <ImageView
@ -101,16 +52,71 @@
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/flavor_image_prompt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center"
android:textColor="@android:color/primary_text_dark"
android:text="@string/flavor_image_prompt"
android:background="#90000000" android:background="#90000000"
android:visibility="gone" android:gravity="center"
android:id="@+id/flavor_image_prompt" /> android:text="@string/flavor_image_prompt"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@android:color/primary_text_dark"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/headline_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ccffffff"
android:padding="16dp">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_span="2"
android:gravity="center_vertical"
android:paddingBottom="8dp"
android:singleLine="false"
android:text="Sample entry title"
android:textColor="?headlineExcerptTextColor"
android:textSize="18sp"
android:textStyle="normal" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/title"
android:orientation="horizontal">
<TextView
android:id="@+id/feed_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
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="?headlineSecondaryTextColor"
android:textSize="12sp" />
<TextView
android:id="@+id/date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:ellipsize="none"
android:fontFamily="sans-serif-light"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="Jan 01, 12:00, 1970"
android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
</LinearLayout>
</RelativeLayout>
</FrameLayout> </FrameLayout>
</TableRow> </TableRow>
@ -123,15 +129,14 @@
android:id="@+id/excerpt" android:id="@+id/excerpt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_span="2"
android:ellipsize="end"
android:lineSpacingExtra="2sp" android:lineSpacingExtra="2sp"
android:maxLines="5" android:maxLines="5"
android:ellipsize="end" android:padding="16dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" android:textSize="13sp" />
android:layout_span="2"
android:paddingBottom="8dp"
android:paddingTop="8dp" />
</TableRow> </TableRow>
<TableRow <TableRow
@ -142,8 +147,10 @@
android:id="@+id/headline_footer" android:id="@+id/headline_footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_span="2"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_span="2"> android:paddingBottom="8dp"
android:paddingLeft="8dp">
<CheckBox <CheckBox
android:id="@+id/selected" android:id="@+id/selected"
@ -168,32 +175,32 @@
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/marked"
android:background="@drawable/ripple"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_weight="0"
android:background="@drawable/ripple"
android:clickable="true"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:layout_weight="0"
android:clickable="true"
android:src="?ic_star_outline" /> android:src="?ic_star_outline" />
<ImageView <ImageView
android:id="@+id/published" android:id="@+id/published"
android:background="@drawable/ripple"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_weight="0"
android:background="@drawable/ripple"
android:clickable="true"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:layout_weight="0"
android:clickable="true"
android:src="?ic_rss_box" /> android:src="?ic_rss_box" />
<ImageView <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:background="@drawable/ripple"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_weight="0" android:layout_weight="0"
android:background="@drawable/ripple"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:src="?ic_dots_vertical" /> android:src="?ic_dots_vertical" />

159
org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
View File

@ -1,71 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
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:background="?headlineUnreadBackground" android:background="?headlineUnreadBackground"
tools:ignore="HardcodedText" > tools:ignore="HardcodedText">
<TableLayout <TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/activity_horizontal_margin"
android:baselineAligned="false" android:baselineAligned="false"
android:shrinkColumns="0,1" android:shrinkColumns="0,1"
android:stretchColumns="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="?headlineUnreadTextColor"
android:textSize="18sp"
android:textStyle="bold"
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="?headlineSecondaryTextColor"
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="?headlineSecondaryTextColor"
android:textSize="12sp"
android:layout_weight="0.5" />
</TableRow>
<TableRow <TableRow
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -74,14 +23,13 @@
android:id="@+id/flavorImageHolder" android:id="@+id/flavorImageHolder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp"
android:layout_span="2"> android:layout_span="2">
<ProgressBar <ProgressBar
android:id="@+id/flavorImageLoadingBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center" />
android:id="@+id/flavorImageLoadingBar" />
<org.fox.ttrss.util.EnlargingImageView <org.fox.ttrss.util.EnlargingImageView
android:id="@+id/flavor_image" android:id="@+id/flavor_image"
@ -89,8 +37,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:cropToPadding="true" android:cropToPadding="true"
android:scaleType="fitCenter"
android:src="@drawable/drawer_header"
android:visibility="visible" /> android:visibility="visible" />
<ImageView <ImageView
@ -103,16 +52,71 @@
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/flavor_image_prompt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center"
android:textColor="@android:color/primary_text_dark"
android:text="@string/flavor_image_prompt"
android:background="#90000000" android:background="#90000000"
android:visibility="gone" android:gravity="center"
android:id="@+id/flavor_image_prompt" /> android:text="@string/flavor_image_prompt"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@android:color/primary_text_dark"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/headline_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ccffffff"
android:padding="16dp">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_span="2"
android:gravity="center_vertical"
android:paddingBottom="8dp"
android:singleLine="false"
android:text="Sample entry title"
android:textColor="?headlineUnreadTextColor"
android:textSize="18sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/title"
android:orientation="horizontal">
<TextView
android:id="@+id/feed_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
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="?headlineSecondaryTextColor"
android:textSize="12sp" />
<TextView
android:id="@+id/date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:ellipsize="none"
android:fontFamily="sans-serif-light"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="Jan 01, 12:00, 1970"
android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
</LinearLayout>
</RelativeLayout>
</FrameLayout> </FrameLayout>
</TableRow> </TableRow>
@ -124,15 +128,16 @@
android:id="@+id/excerpt" android:id="@+id/excerpt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_span="2"
android:ellipsize="end"
android:lineSpacingExtra="2sp" android:lineSpacingExtra="2sp"
android:maxLines="5" android:maxLines="5"
android:ellipsize="end" android:padding="16dp"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" android:textSize="13sp" />
android:layout_span="2"
android:paddingBottom="8dp"
android:paddingTop="8dp" />
</TableRow> </TableRow>
<TableRow <TableRow
@ -143,8 +148,10 @@
android:id="@+id/headline_footer" android:id="@+id/headline_footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_span="2"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_span="2"> android:paddingBottom="8dp"
android:paddingLeft="8dp">
<CheckBox <CheckBox
android:id="@+id/selected" android:id="@+id/selected"
@ -169,32 +176,32 @@
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/marked"
android:background="@drawable/ripple"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_weight="0"
android:background="@drawable/ripple"
android:clickable="true"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:layout_weight="0"
android:clickable="true"
android:src="?ic_star_outline" /> android:src="?ic_star_outline" />
<ImageView <ImageView
android:id="@+id/published" android:id="@+id/published"
android:background="@drawable/ripple"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_weight="0"
android:background="@drawable/ripple"
android:clickable="true"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:layout_weight="0"
android:clickable="true"
android:src="?ic_checkbox_marked" /> android:src="?ic_checkbox_marked" />
<ImageView <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:background="@drawable/ripple"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_weight="0" android:layout_weight="0"
android:background="@drawable/ripple"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:src="?ic_dots_vertical" /> android:src="?ic_dots_vertical" />