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

Commit 0779fc5

Browse files
authored
app: update AppBarLayout, rework folder hierarchy (#80)
this fixes RecyclerView nested scroll, scroll behavior maybe needs some tuning Signed-off-by: BlackMesa123 <giangrecosalvo9@gmail.com>
1 parent bcc25a7 commit 0779fc5

File tree

81 files changed

+3875
-2148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3875
-2148
lines changed

app/src/main/java/de/dlyt/yanndroid/oneuiexample/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import de.dlyt.yanndroid.oneui.sesl.utils.ReflectUtils;
3838
import de.dlyt.yanndroid.oneui.utils.CustomButtonClickListener;
3939
import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
40-
import de.dlyt.yanndroid.oneui.view.BottomNavigationView;
40+
import de.dlyt.yanndroid.oneui.widget.BottomNavigationView;
4141
import de.dlyt.yanndroid.oneui.view.Snackbar;
4242
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
4343
import de.dlyt.yanndroid.oneuiexample.utils.TabsManager;

app/src/main/java/de/dlyt/yanndroid/oneuiexample/SwitchBarActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import de.dlyt.yanndroid.oneui.layout.SwitchBarLayout;
99
import de.dlyt.yanndroid.oneui.layout.ToolbarLayout;
10-
import de.dlyt.yanndroid.oneui.view.Switch;
11-
import de.dlyt.yanndroid.oneui.view.SwitchBar;
10+
import de.dlyt.yanndroid.oneui.widget.Switch;
11+
import de.dlyt.yanndroid.oneui.widget.SwitchBar;
1212
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
1313

1414
public class SwitchBarActivity extends BaseThemeActivity implements SwitchBar.OnSwitchChangeListener {

app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivityFirstFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import androidx.fragment.app.Fragment;
1010

11-
import de.dlyt.yanndroid.oneui.view.TabLayout;
11+
import de.dlyt.yanndroid.oneui.widget.TabLayout;
1212
import de.dlyt.yanndroid.oneui.view.ViewPager;
1313
import de.dlyt.yanndroid.oneuiexample.R;
1414
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;

app/src/main/java/de/dlyt/yanndroid/oneuiexample/tabs/IconsTab.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import de.dlyt.yanndroid.oneui.layout.DrawerLayout;
2626
import de.dlyt.yanndroid.oneui.layout.ToolbarLayout;
2727
import de.dlyt.yanndroid.oneui.sesl.recyclerview.LinearLayoutManager;
28-
import de.dlyt.yanndroid.oneui.view.BottomNavigationView;
28+
import de.dlyt.yanndroid.oneui.widget.BottomNavigationView;
2929
import de.dlyt.yanndroid.oneui.view.RecyclerView;
30-
import de.dlyt.yanndroid.oneui.view.TabLayout;
30+
import de.dlyt.yanndroid.oneui.widget.TabLayout;
3131
import de.dlyt.yanndroid.oneui.view.ViewPager;
3232
import de.dlyt.yanndroid.oneuiexample.R;
3333

app/src/main/java/de/dlyt/yanndroid/oneuiexample/tabs/NothingTab.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import android.os.Handler;
65
import android.view.LayoutInflater;
76
import android.view.View;
87
import android.view.ViewGroup;
@@ -12,7 +11,7 @@
1211
import androidx.annotation.Nullable;
1312
import androidx.fragment.app.Fragment;
1413

15-
import de.dlyt.yanndroid.oneui.layout.SwipeRefreshLayout;
14+
import de.dlyt.yanndroid.oneui.widget.SwipeRefreshLayout;
1615
import de.dlyt.yanndroid.oneuiexample.R;
1716

1817
public class NothingTab extends Fragment {

app/src/main/java/de/dlyt/yanndroid/oneuiexample/tabs/ViewsTab.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import java.util.ArrayList;
1818
import java.util.List;
1919

20-
import de.dlyt.yanndroid.oneui.view.SeekBar;
21-
import de.dlyt.yanndroid.oneui.view.SwitchBar;
20+
import de.dlyt.yanndroid.oneui.widget.SeekBar;
21+
import de.dlyt.yanndroid.oneui.widget.SwitchBar;
2222
import de.dlyt.yanndroid.oneuiexample.R;
2323

2424
public class ViewsTab extends Fragment {

app/src/main/res/layout-land/activity_switchbar.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_height="match_parent"
77
app:toolbar_title="SwitchBarLayout">
88

9-
<de.dlyt.yanndroid.oneui.view.RoundNestedScrollView
9+
<de.dlyt.yanndroid.oneui.widget.RoundNestedScrollView
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"
1212
android:background="?roundedCornerColor"
@@ -20,7 +20,7 @@
2020
android:descendantFocusability="afterDescendants"
2121
android:orientation="horizontal">
2222

23-
<de.dlyt.yanndroid.oneui.layout.RoundFrameLayout
23+
<de.dlyt.yanndroid.oneui.widget.RoundFrameLayout
2424
android:layout_width="0dp"
2525
android:layout_height="wrap_content"
2626
android:layout_weight="4.0"
@@ -34,7 +34,7 @@
3434
android:adjustViewBounds="true"
3535
android:scaleType="fitXY"
3636
android:src="@mipmap/ic_launcher" />
37-
</de.dlyt.yanndroid.oneui.layout.RoundFrameLayout>
37+
</de.dlyt.yanndroid.oneui.widget.RoundFrameLayout>
3838

3939
<TextView
4040
android:layout_width="0dp"
@@ -52,6 +52,6 @@
5252

5353
</LinearLayout>
5454

55-
</de.dlyt.yanndroid.oneui.view.RoundNestedScrollView>
55+
</de.dlyt.yanndroid.oneui.widget.RoundNestedScrollView>
5656

5757
</de.dlyt.yanndroid.oneui.layout.SwitchBarLayout>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
android:layout_height="match_parent"
1414
app:layout_location="main_content" />
1515

16-
<de.dlyt.yanndroid.oneui.view.BottomNavigationView
16+
<de.dlyt.yanndroid.oneui.widget.BottomNavigationView
1717
android:id="@+id/main_samsung_tabs"
1818
android:layout_width="match_parent"
1919
android:layout_height="60.0dip"

app/src/main/res/layout/activity_switchbar.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_height="match_parent"
77
app:toolbar_title="SwitchBarLayout">
88

9-
<de.dlyt.yanndroid.oneui.view.RoundNestedScrollView
9+
<de.dlyt.yanndroid.oneui.widget.RoundNestedScrollView
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"
1212
android:background="?roundedCornerColor"
@@ -23,7 +23,7 @@
2323
android:descendantFocusability="afterDescendants"
2424
android:orientation="vertical">
2525

26-
<de.dlyt.yanndroid.oneui.layout.RoundFrameLayout
26+
<de.dlyt.yanndroid.oneui.widget.RoundFrameLayout
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"
2929
android:background="@color/item_background_color">
@@ -36,7 +36,7 @@
3636
android:adjustViewBounds="true"
3737
android:scaleType="fitXY"
3838
android:src="@mipmap/ic_launcher" />
39-
</de.dlyt.yanndroid.oneui.layout.RoundFrameLayout>
39+
</de.dlyt.yanndroid.oneui.widget.RoundFrameLayout>
4040

4141
<TextView
4242
android:layout_width="match_parent"
@@ -53,6 +53,6 @@
5353

5454
</LinearLayout>
5555

56-
</de.dlyt.yanndroid.oneui.view.RoundNestedScrollView>
56+
</de.dlyt.yanndroid.oneui.widget.RoundNestedScrollView>
5757

5858
</de.dlyt.yanndroid.oneui.layout.SwitchBarLayout>

app/src/main/res/layout/content_drawer.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
android:layout_height="wrap_content"
2323
app:selectedOptionButton="@id/ob2">
2424

25-
<de.dlyt.yanndroid.oneui.view.OptionButton
25+
<de.dlyt.yanndroid.oneui.widget.OptionButton
2626
android:id="@+id/ob1"
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"
2929
app:icon="@drawable/ic_samsung_info_2"
3030
app:text="Option 1" />
3131

32-
<de.dlyt.yanndroid.oneui.view.OptionButton
32+
<de.dlyt.yanndroid.oneui.widget.OptionButton
3333
android:id="@+id/ob2"
3434
android:layout_width="match_parent"
3535
android:layout_height="wrap_content"
3636
app:icon="@drawable/ic_samsung_info_2"
3737
app:text="Option 2" />
3838

39-
<de.dlyt.yanndroid.oneui.view.OptionButton
39+
<de.dlyt.yanndroid.oneui.widget.OptionButton
4040
android:id="@+id/ob3"
4141
android:layout_width="match_parent"
4242
android:layout_height="wrap_content"
@@ -48,15 +48,15 @@
4848

4949
<View style="@style/DrawerDividerStyle" />
5050

51-
<de.dlyt.yanndroid.oneui.view.OptionButton
51+
<de.dlyt.yanndroid.oneui.widget.OptionButton
5252
android:layout_width="match_parent"
5353
android:layout_height="wrap_content"
5454
app:counter="4"
5555
app:counterEnabled="true"
5656
app:icon="@drawable/ic_samsung_plus"
5757
app:text="Add" />
5858

59-
<de.dlyt.yanndroid.oneui.view.OptionButton
59+
<de.dlyt.yanndroid.oneui.widget.OptionButton
6060
android:id="@+id/ob_help"
6161
android:layout_width="match_parent"
6262
android:layout_height="wrap_content"
@@ -69,13 +69,13 @@
6969
android:gravity="center"
7070
android:orientation="horizontal">
7171

72-
<de.dlyt.yanndroid.oneui.view.SeekBar
72+
<de.dlyt.yanndroid.oneui.widget.SeekBar
7373
android:layout_width="wrap_content"
7474
android:layout_height="match_parent"
7575
android:layout_marginHorizontal="10dp"
7676
app:seslSeekBarMode="expand_vertical" />
7777

78-
<de.dlyt.yanndroid.oneui.view.SeekBar
78+
<de.dlyt.yanndroid.oneui.widget.SeekBar
7979
android:layout_width="wrap_content"
8080
android:layout_height="match_parent"
8181
android:layout_marginHorizontal="10dp"

0 commit comments

Comments
 (0)