diff options
Diffstat (limited to 'org.fox.ttrss/src/main/java/org')
4 files changed, 14 insertions, 6 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 621238c1..959ef7bf 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -179,7 +179,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { view.findViewById(R.id.article_scrollview).setVisibility(View.INVISIBLE); } */ - m_contentView = view.findViewById(R.id.article_scrollview); m_customViewContainer = view.findViewById(R.id.article_fullscreen_video); /* if (m_article.id == HeadlinesFragment.ARTICLE_SPECIAL_TOP_CHANGED) { @@ -346,8 +345,12 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { host.setText(outhost.replaceFirst("^www\\.", "")); host.setTextSize(TypedValue.COMPLEX_UNIT_SP, m_articleSmallFontSize); host.setVisibility(View.VISIBLE); + } else { + host.setVisibility(View.GONE); } - } catch (MalformedURLException ignored) {} + } catch (MalformedURLException ignored) { + host.setVisibility(View.GONE); + } } TextView note = view.findViewById(R.id.note); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index cdaca2dd..c94f0c3a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -135,7 +135,7 @@ public class ArticlePager extends androidx.fragment.app.Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.article_pager, container, false); + View view = inflater.inflate(R.layout.fragment_article_pager, container, false); if (savedInstanceState != null) { if (m_activity instanceof DetailActivity) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 9451f8f6..3b199d2a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -199,7 +199,6 @@ public class OfflineArticleFragment extends Fragment { m_cursor.moveToFirst(); if (m_cursor.isFirst()) { - m_contentView = view.findViewById(R.id.article_scrollview); m_customViewContainer = view.findViewById(R.id.article_fullscreen_video); final String link = m_cursor.getString(m_cursor.getColumnIndex("link")); @@ -265,7 +264,13 @@ public class OfflineArticleFragment extends Fragment { if (comments != null) { comments.setVisibility(View.GONE); } - + + View host = view.findViewById(R.id.host); + + if (host != null) { + host.setVisibility(View.GONE); + } + TextView note = view.findViewById(R.id.note); if (note != null) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java index 20c2fd0c..ce4f6f72 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java @@ -136,7 +136,7 @@ public class OfflineArticlePager extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.article_pager, container, false); + View view = inflater.inflate(R.layout.fragment_article_pager, container, false); if (savedInstanceState != null) { m_articleId = savedInstanceState.getInt("articleId", 0); |