Added lift on scroll for Appbars 🎨

Rminsh · Sep 3, 2020 · 076fc5c · 076fc5c
1 parent 669e189
commit 076fc5c
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 53 deletions.
diff --git a/app/src/main/java/com/shalchian/sarrafi/activity/DetailActivity.java b/app/src/main/java/com/shalchian/sarrafi/activity/DetailActivity.java
@@ -21,6 +21,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.widget.NestedScrollView;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -31,7 +32,6 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ProgressBar;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.androidnetworking.AndroidNetworking;
@@ -69,7 +69,7 @@
 
 public class DetailActivity extends AppCompatActivity {
 
-  ScrollView scrollView;
+  NestedScrollView scrollView;
   View parent_chart_frame;
   LineChart chart;
   ProgressBar table_progressbar;

diff --git a/app/src/main/java/com/shalchian/sarrafi/activity/MainActivity.java b/app/src/main/java/com/shalchian/sarrafi/activity/MainActivity.java
@@ -94,7 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
     toolbar = findViewById(R.id.toolbar);
     toolbar.inflateMenu(R.menu.main_menu);
 
-    recycler_view = findViewById(R.id.classroom_news_rcv);
+    recycler_view = findViewById(R.id.price_rcv);
     status_layout = findViewById(R.id.status_layout);
     status_animation = findViewById(R.id.status_animation);
     status_text = findViewById(R.id.status_text);

diff --git a/app/src/main/java/com/shalchian/sarrafi/fragment/CurrencyListFragment.java b/app/src/main/java/com/shalchian/sarrafi/fragment/CurrencyListFragment.java
@@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View root = inflater.inflate(R.layout.fragment_overview, container, false);
-    recycler_view = root.findViewById(R.id.classroom_news_rcv);
+    recycler_view = root.findViewById(R.id.price_rcv);
     recycler_view.setHasFixedSize(true);
 
     swipeRefreshLayout = root.findViewById(R.id.main_page_refresh);

diff --git a/app/src/main/java/com/shalchian/sarrafi/fragment/DigitalCurrencyListFragment.java b/app/src/main/java/com/shalchian/sarrafi/fragment/DigitalCurrencyListFragment.java
@@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View root = inflater.inflate(R.layout.fragment_overview, container, false);
-    recycler_view = root.findViewById(R.id.classroom_news_rcv);
+    recycler_view = root.findViewById(R.id.price_rcv);
     recycler_view.setHasFixedSize(true);
 
     swipeRefreshLayout = root.findViewById(R.id.main_page_refresh);

diff --git a/app/src/main/java/com/shalchian/sarrafi/fragment/GoldListFragment.java b/app/src/main/java/com/shalchian/sarrafi/fragment/GoldListFragment.java
@@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View root = inflater.inflate(R.layout.fragment_overview, container, false);
-    recycler_view = root.findViewById(R.id.classroom_news_rcv);
+    recycler_view = root.findViewById(R.id.price_rcv);
     recycler_view.setHasFixedSize(true);
 
     swipeRefreshLayout = root.findViewById(R.id.main_page_refresh);

diff --git a/app/src/main/java/com/shalchian/sarrafi/fragment/OilListFragment.java b/app/src/main/java/com/shalchian/sarrafi/fragment/OilListFragment.java
@@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View root = inflater.inflate(R.layout.fragment_overview, container, false);
-    recycler_view = root.findViewById(R.id.classroom_news_rcv);
+    recycler_view = root.findViewById(R.id.price_rcv);
     recycler_view.setHasFixedSize(true);
 
     swipeRefreshLayout = root.findViewById(R.id.main_page_refresh);

diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
@@ -16,22 +16,38 @@
   ~     along with Sarrafi.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<LinearLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layoutDirection="rtl"
     android:orientation="vertical"
     tools:context=".activity.DetailActivity">
 
-    <include layout="@layout/toolbar"/>
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimary"
+        app:liftOnScroll="true"
+        app:liftOnScrollTargetViewId="@id/detail_scrollview"
+        android:overScrollMode="always">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/detail_scrollview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" >
         <include layout="@layout/content_detail" />
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -63,7 +63,7 @@
             android:layout_height="match_parent">
 
             <com.shalchian.sarrafi.utils.AutoFitRecyclerView
-                android:id="@+id/classroom_news_rcv"
+                android:id="@+id/price_rcv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clipToPadding="false"

diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml
@@ -30,13 +30,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/colorPrimary"
-        app:elevation="0dp">
+        app:liftOnScroll="true"
+        app:liftOnScrollTargetViewId="@id/price_rcv"
+        android:overScrollMode="always" >
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:elevation="0dp">
+            android:layout_height="wrap_content">
 
             <TextView
                 android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
@@ -23,11 +23,11 @@
     android:layout_height="match_parent">
 
     <com.shalchian.sarrafi.utils.AutoFitRecyclerView
-        android:id="@+id/classroom_news_rcv"
+        android:id="@+id/price_rcv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:columnWidth="@dimen/column_width"
-        android:padding="@dimen/activity_horizontal_margin"/>
+        android:padding="@dimen/activity_horizontal_margin" />
 
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml