Skip to content
This repository was archived by the owner on Jul 7, 2024. It is now read-only.

Commit 076fc5c

Browse files
committed
Added lift on scroll for Appbars 🎨
1 parent 669e189 commit 076fc5c

11 files changed

+36
-53
lines changed

‎app/src/main/java/com/shalchian/sarrafi/activity/DetailActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import androidx.appcompat.app.AppCompatActivity;
2222
import androidx.appcompat.app.AppCompatDelegate;
2323
import androidx.appcompat.widget.Toolbar;
24+
import androidx.core.widget.NestedScrollView;
2425

2526
import android.content.Context;
2627
import android.graphics.Color;
@@ -31,7 +32,6 @@
3132
import android.view.MotionEvent;
3233
import android.view.View;
3334
import android.widget.ProgressBar;
34-
import android.widget.ScrollView;
3535
import android.widget.TextView;
3636

3737
import com.androidnetworking.AndroidNetworking;
@@ -69,7 +69,7 @@
6969

7070
public class DetailActivity extends AppCompatActivity {
7171

72-
ScrollView scrollView;
72+
NestedScrollView scrollView;
7373
View parent_chart_frame;
7474
LineChart chart;
7575
ProgressBar table_progressbar;

‎app/src/main/java/com/shalchian/sarrafi/activity/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
9494
toolbar = findViewById(R.id.toolbar);
9595
toolbar.inflateMenu(R.menu.main_menu);
9696

97-
recycler_view = findViewById(R.id.classroom_news_rcv);
97+
recycler_view = findViewById(R.id.price_rcv);
9898
status_layout = findViewById(R.id.status_layout);
9999
status_animation = findViewById(R.id.status_animation);
100100
status_text = findViewById(R.id.status_text);

‎app/src/main/java/com/shalchian/sarrafi/fragment/CurrencyListFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
6666
@Override
6767
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
6868
View root = inflater.inflate(R.layout.fragment_overview, container, false);
69-
recycler_view = root.findViewById(R.id.classroom_news_rcv);
69+
recycler_view = root.findViewById(R.id.price_rcv);
7070
recycler_view.setHasFixedSize(true);
7171

7272
swipeRefreshLayout = root.findViewById(R.id.main_page_refresh);

‎app/src/main/java/com/shalchian/sarrafi/fragment/DigitalCurrencyListFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
6666
@Override
6767
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
6868
View root = inflater.inflate(R.layout.fragment_overview, container, false);
69-
recycler_view = root.findViewById(R.id.classroom_news_rcv);
69+
recycler_view = root.findViewById(R.id.price_rcv);
7070
recycler_view.setHasFixedSize(true);
7171

7272
swipeRefreshLayout = root.findViewById(R.id.main_page_refresh);

‎app/src/main/java/com/shalchian/sarrafi/fragment/GoldListFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
6666
@Override
6767
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
6868
View root = inflater.inflate(R.layout.fragment_overview, container, false);
69-
recycler_view = root.findViewById(R.id.classroom_news_rcv);
69+
recycler_view = root.findViewById(R.id.price_rcv);
7070
recycler_view.setHasFixedSize(true);
7171

7272
swipeRefreshLayout = root.findViewById(R.id.main_page_refresh);

‎app/src/main/java/com/shalchian/sarrafi/fragment/OilListFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
6666
@Override
6767
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
6868
View root = inflater.inflate(R.layout.fragment_overview, container, false);
69-
recycler_view = root.findViewById(R.id.classroom_news_rcv);
69+
recycler_view = root.findViewById(R.id.price_rcv);
7070
recycler_view.setHasFixedSize(true);
7171

7272
swipeRefreshLayout = root.findViewById(R.id.main_page_refresh);

‎app/src/main/res/layout/activity_detail.xml

+22-6
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,38 @@
1616
~ along with Sarrafi. If not, see <https://www.gnu.org/licenses/>.
1717
-->
1818

19-
<LinearLayout
19+
<androidx.coordinatorlayout.widget.CoordinatorLayout
2020
xmlns:android="http://schemas.android.com/apk/res/android"
21+
xmlns:app="http://schemas.android.com/apk/res-auto"
2122
xmlns:tools="http://schemas.android.com/tools"
2223
android:layout_width="match_parent"
2324
android:layout_height="match_parent"
2425
android:layoutDirection="rtl"
2526
android:orientation="vertical"
2627
tools:context=".activity.DetailActivity">
2728

28-
<include layout="@layout/toolbar"/>
29+
<com.google.android.material.appbar.AppBarLayout
30+
android:id="@+id/appbar"
31+
android:layout_width="match_parent"
32+
android:layout_height="wrap_content"
33+
android:background="@color/colorPrimary"
34+
app:liftOnScroll="true"
35+
app:liftOnScrollTargetViewId="@id/detail_scrollview"
36+
android:overScrollMode="always">
37+
38+
<androidx.appcompat.widget.Toolbar
39+
android:id="@+id/toolbar"
40+
android:layout_width="match_parent"
41+
android:layout_height="?attr/actionBarSize"/>
42+
43+
</com.google.android.material.appbar.AppBarLayout>
2944

30-
<ScrollView
45+
<androidx.core.widget.NestedScrollView
3146
android:id="@+id/detail_scrollview"
3247
android:layout_width="match_parent"
33-
android:layout_height="match_parent">
48+
android:layout_height="match_parent"
49+
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
3450
<include layout="@layout/content_detail" />
35-
</ScrollView>
51+
</androidx.core.widget.NestedScrollView>
3652

37-
</LinearLayout>
53+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎app/src/main/res/layout/activity_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
android:layout_height="match_parent">
6464

6565
<com.shalchian.sarrafi.utils.AutoFitRecyclerView
66-
android:id="@+id/classroom_news_rcv"
66+
android:id="@+id/price_rcv"
6767
android:layout_width="match_parent"
6868
android:layout_height="match_parent"
6969
android:clipToPadding="false"

‎app/src/main/res/layout/activity_main_tab.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@
3030
android:layout_width="match_parent"
3131
android:layout_height="wrap_content"
3232
android:background="@color/colorPrimary"
33-
app:elevation="0dp">
33+
app:liftOnScroll="true"
34+
app:liftOnScrollTargetViewId="@id/price_rcv"
35+
android:overScrollMode="always" >
3436

3537
<androidx.appcompat.widget.Toolbar
3638
android:id="@+id/toolbar"
3739
android:layout_width="match_parent"
38-
android:layout_height="wrap_content"
39-
app:elevation="0dp">
40+
android:layout_height="wrap_content">
4041

4142
<TextView
4243
android:layout_width="wrap_content"

‎app/src/main/res/layout/fragment_overview.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
android:layout_height="match_parent">
2424

2525
<com.shalchian.sarrafi.utils.AutoFitRecyclerView
26-
android:id="@+id/classroom_news_rcv"
26+
android:id="@+id/price_rcv"
2727
android:layout_width="match_parent"
2828
android:layout_height="match_parent"
2929
android:clipToPadding="false"
3030
android:columnWidth="@dimen/column_width"
31-
android:padding="@dimen/activity_horizontal_margin"/>
31+
android:padding="@dimen/activity_horizontal_margin" />
3232

3333
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

‎app/src/main/res/layout/toolbar.xml

-34
This file was deleted.

0 commit comments

Comments
 (0)