From 0506b5dfa011a467704bd93920e0e5f86af19838 Mon Sep 17 00:00:00 2001 From: akaessens <24660231+akaessens@users.noreply.github.com> Date: Thu, 24 Sep 2020 23:28:32 +0200 Subject: [PATCH] re-add banner --- .../akdev/nofbeventscraper/MainActivity.java | 41 +++++++++--- .../res/drawable/ic_channel_foreground.xml | 63 ------------------ app/src/main/res/layout/activity_main.xml | 6 +- .../main/res/mipmap-anydpi-v26/ic_channel.xml | 5 -- app/src/main/res/mipmap-xhdpi/ic_channel.png | Bin 1751 -> 0 bytes 5 files changed, 35 insertions(+), 80 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_channel_foreground.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_channel.xml delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_channel.png diff --git a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java index 05267d0..9d37657 100644 --- a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java +++ b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java @@ -6,10 +6,12 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.text.Layout; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.widget.ImageView; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.view.menu.MenuBuilder; @@ -17,9 +19,12 @@ import androidx.appcompat.widget.Toolbar; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.appbar.CollapsingToolbarLayout; import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; +import com.squareup.picasso.Picasso; import java.lang.ref.WeakReference; import java.util.List; @@ -85,6 +90,30 @@ public class MainActivity extends AppCompatActivity { recycler_view.setHasFixedSize(true); + /* + * Display title only when toolbar is collapsed + */ + AppBarLayout app_bar_layout = findViewById(R.id.app_bar); + + app_bar_layout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() { + boolean show = true; + int scroll_range = -1; + CollapsingToolbarLayout layout_toolbar = findViewById(R.id.layout_toolbar); + + @Override + public void onOffsetChanged(AppBarLayout app_bar_layout, int vertical_offset) { + if (scroll_range == -1) { + scroll_range = app_bar_layout.getTotalScrollRange(); + } + if (scroll_range + vertical_offset == 0) { + layout_toolbar.setTitle(getString(R.string.app_name)); + show = true; + } else if (show) { + layout_toolbar.setTitle(" "); + show = false; + } + } + }); /* * Paste button: get last entry from clipboard */ @@ -153,6 +182,9 @@ public class MainActivity extends AppCompatActivity { startScraping(); } + + + } /** @@ -195,8 +227,6 @@ public class MainActivity extends AppCompatActivity { this.events.clear(); adapter.notifyDataSetChanged(); - - //ok_button.setEnabled(false); } /** @@ -211,13 +241,6 @@ public class MainActivity extends AppCompatActivity { this.events.addAll(events); adapter.notifyDataSetChanged(); - - /*Picasso.get() - .load(event.image_url) - .placeholder(R.drawable.ic_banner_foreground) - .into(image_view_toolbar);*/ - - //ok_button.setEnabled(true); } @SuppressLint("RestrictedApi") diff --git a/app/src/main/res/drawable/ic_channel_foreground.xml b/app/src/main/res/drawable/ic_channel_foreground.xml deleted file mode 100644 index a84a8ac..0000000 --- a/app/src/main/res/drawable/ic_channel_foreground.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b5e2013..a7265ca 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,10 +20,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/colorPrimary" - android:fitsSystemWindows="true" - app:contentScrim="?attr/colorPrimary" app:expandedTitleGravity="center" + app:contentScrim="?attr/colorPrimary" app:layout_scrollFlags="scroll|exitUntilCollapsed" + app:title=" " app:toolbarId="@+id/toolbar"> @@ -31,8 +31,8 @@ android:id="@+id/image_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true" android:scaleType="centerCrop" + android:src="@drawable/ic_banner_foreground" app:layout_collapseMode="parallax" /> - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/ic_channel.png b/app/src/main/res/mipmap-xhdpi/ic_channel.png deleted file mode 100644 index de2872c18e31f734ac6200bb346d129274f761f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1751 zcma)6do=l<PRC z08oxZI~RCoEKNmuc#Y+F8v!7n;b^z-*p=?Dy>mxSp9S@jdE986^X^Z3G@I3oe+%pL z+@pDMYyCWhx5Xqak<8UL4covE95CZWbG3UQ6UwT3prNR^YNgg?`Aa3iKNB3BsGkFn zsk3Sad>>;NP^u41qu+(7He$=*vQ~&~=aq5>>z&um)*^ zv>^Z@ASwbSp!6S)eD-t|*$%}H6+_C;Eu$MO-1w{1z1hhgCYZh6GnSePI8hIzE>Ljw3^IJIC$iZa&6)4DJI@m?|9Cba->17Fx*pN zpfWlzcrhjHF$qCjE>+@Ev1BRh!n{V;OWq|I0%U6j4>Nh=(8zk&Jv`Tny;oNz&T_mC zpWe(#@=X`r^$9Vm5Qy`6I<_~Jr)L5KsE#!jX?Xh23ft+2jVW-!^g33%97t()@Laaf z_;n+B6AO|x0J+PwdN*$Eu3vv2HG?zFzI;G;4n4eP3qbf#e_8C)4D$#w8h~Srib4&i zH>WfhoQ6L+Hrt&Ql_*Uzhi!KF@J&4d*8}GUY{04a2|b^F;9nAtp8>LrnFvXP^aZcO z%v|0Er1eLnriF2WnuXeM9&Wk$r1kUaIZr(}k;i9j+Aa4n9eGNj4EOj)G>O-0jL4#fy-&<~dQlVDyTieEy4+Zu87&k~DvR;Sd*|V1P6V8O+J|HFBJ#_0 zAh61#a^QJ#Fpbr?lfTkN&Omg)BxyM0=f#0KBHnR_0veR1_I{vQx%CmngE8%oYHq7c zZZgjd_<}?OnH~E^V(7!;_e31u;xy}#j1ND#K9oa)R7_E>m0&KVfDs)|BI3b^a6f&4 zxxq4iYA?BIqR^F|;+#KcUGm$s-kx*RA`J+*kET1?@9X#DKM0o8y|jGob)aNC&vnOg zkXHJ!;%Z_4jGxs)=(WYm+>3Kkdr`@hRdfi`2_Q+Ky)`GF9PwutVZL_V-rUd(1u(iT zqQJ2q2X!l(gtIam4n}UA5#RD|shF_9%GU$M+OS2J^Re55LT@%)$|%1OKSD4uH>sWo z_xm=CY{f$wLob_s%PW{c?;@*M*VSV>X_gDm@AQ1-;VLOxq@eCFybf0%xs~ z_jiXJk+xC7moa<^hAc4lo$8-%#4=D_Nk