jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395117 )
Change subject: Fix collapsed toolbar style in On This Day.
......................................................................
Fix collapsed toolbar style in On This Day.
Change-Id: Ic0cff9ed526be0c9acf1d3ce3031e7cee28a7061
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
M app/src/main/res/layout/fragment_on_this_day.xml
2 files changed, 10 insertions(+), 26 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
index a9d8e03..8dd4193 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
@@ -1,9 +1,11 @@
package org.wikipedia.feed.onthisday;
+import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.CollapsingToolbarLayout;
import android.support.v4.app.Fragment;
import android.support.v4.widget.NestedScrollView;
import android.support.v7.app.AppCompatActivity;
@@ -45,7 +47,7 @@
public class OnThisDayFragment extends Fragment {
@BindView(R.id.day) TextView dayText;
- @BindView(R.id.day_text_view) TextView dayTextView;
+ @BindView(R.id.collapsing_toolbar_layout) CollapsingToolbarLayout
collapsingToolbarLayout;
@BindView(R.id.day_info_text_view) TextView dayInfoTextView;
@BindView(R.id.events_recycler) RecyclerView eventsRecycler;
@BindView(R.id.progress) ProgressBar progressBar;
@@ -116,20 +118,15 @@
getAppCompatActivity().setSupportActionBar(toolbar);
getAppCompatActivity().getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getAppCompatActivity().getSupportActionBar().setTitle("");
- dayTextView.setText(DateUtil.getMonthOnlyDateString(date.getTime()));
+ collapsingToolbarLayout.setCollapsedTitleTextColor(Color.WHITE);
dayText.setText(DateUtil.getMonthOnlyDateString(date.getTime()));
appBarLayout.addOnOffsetChangedListener(new
AppBarLayout.OnOffsetChangedListener() {
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int
verticalOffset) {
- if (Math.abs(verticalOffset) ==
appBarLayout.getTotalScrollRange()) {
- // Collapsed
- dayTextView.setVisibility(View.VISIBLE);
- } else if (verticalOffset == 0) {
- // Expanded
- dayTextView.setVisibility(View.GONE);
- } else {
- // In Transition
- dayTextView.setVisibility(View.GONE);
+ if (verticalOffset > -appBarLayout.getTotalScrollRange()) {
+ collapsingToolbarLayout.setTitle("");
+ } else if (verticalOffset <=
-appBarLayout.getTotalScrollRange()) {
+
collapsingToolbarLayout.setTitle(DateUtil.getMonthOnlyDateString(date.getTime()));
}
}
});
diff --git a/app/src/main/res/layout/fragment_on_this_day.xml
b/app/src/main/res/layout/fragment_on_this_day.xml
index 79c3b5f..428c45e 100644
--- a/app/src/main/res/layout/fragment_on_this_day.xml
+++ b/app/src/main/res/layout/fragment_on_this_day.xml
@@ -14,6 +14,7 @@
android:fitsSystemWindows="true">
<android.support.design.widget.CollapsingToolbarLayout
+ android:id="@+id/collapsing_toolbar_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
@@ -84,21 +85,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/ToolbarTheme"
- app:layout_collapseMode="pin">
-
- <TextView
- android:id="@+id/day_text_view"
- style="@style/RtlAwareTextView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
- android:layout_marginStart="12dp"
- android:layout_marginTop="12dp"
- android:fontFamily="serif"
- android:textColor="@color/base100"
- android:textSize="24sp"
- tools:text="January 1" />
- </android.support.v7.widget.Toolbar>
+ app:layout_collapseMode="pin" />
</android.support.design.widget.CollapsingToolbarLayout>
--
To view, visit https://gerrit.wikimedia.org/r/395117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0cff9ed526be0c9acf1d3ce3031e7cee28a7061
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
