app: minor ui fixes (#43)

* app: set correct overflow popup offset

Signed-off-by: BlackMesa123 <[email protected]>

* app/ViewPager: move new stuff into dedicated class

Signed-off-by: BlackMesa123 <[email protected]>

* app/ToolbarLayout: set corrent toolbar bottom margin

Signed-off-by: BlackMesa123 <[email protected]>

Author: salvogiangri

README.md

@@ -839,14 +839,14 @@ If you want to set it up with a ViewPager you'll have to use the [ViewPager](#Vi
 ViewPager working with [BottomNavigationView](#BottomNavigationView) and [TabLayout](#TabLayout).
 
 ```xml
-<androidx.viewpager.widget.SeslViewPager
+<de.dlyt.yanndroid.oneui.view.ViewPager
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</androidx.viewpager.widget.SeslViewPager>
+</de.dlyt.yanndroid.oneui.view.ViewPager>
 ```
 
-The Adapter for this ViewPager has to extend [androidx.fragment.app.FragmentPagerAdapter](https://developer.android.com/reference/androidx/fragment/app/FragmentPagerAdapter).
+The Adapter for this ViewPager has to extend [androidx.fragment.app.PagerAdapter](https://developer.android.com/reference/androidx/fragment/app/PagerAdapter) or a subclass.
 
 ### AlertDialog
 Samsung's AlertDialogs.

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

@@ -8,9 +8,9 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.SeslViewPager;
 
 import de.dlyt.yanndroid.oneui.view.TabLayout;
+import de.dlyt.yanndroid.oneui.view.ViewPager;
 import de.dlyt.yanndroid.oneuiexample.R;
 import de.dlyt.yanndroid.oneuiexample.tabs.ViewPagerAdapter;
 
@@ -41,7 +41,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 
         // TabLayout and ViewPager
         TabLayout tabLayout = mRootView.findViewById(R.id.tabLayout);
-        SeslViewPager viewPager = mRootView.findViewById(R.id.viewPager);
+        ViewPager viewPager = mRootView.findViewById(R.id.viewPager);
         viewPager.setAdapter(new ViewPagerAdapter(getChildFragmentManager()));
         tabLayout.setupWithViewPager(viewPager);
         tabLayout.updateWidget();

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

@@ -18,7 +18,6 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.util.SeslRoundedCorner;
 import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.SeslViewPager;
 
 import java.util.HashMap;
 
@@ -27,6 +26,7 @@
 import de.dlyt.yanndroid.oneui.view.BottomNavigationView;
 import de.dlyt.yanndroid.oneui.view.RecyclerView;
 import de.dlyt.yanndroid.oneui.view.TabLayout;
+import de.dlyt.yanndroid.oneui.view.ViewPager;
 import de.dlyt.yanndroid.oneuiexample.R;
 
 public class IconsTab extends Fragment {
@@ -295,7 +295,7 @@ public void setSelecting(boolean enabled) {
         DrawerLayout drawerLayout = getActivity().findViewById(R.id.drawer_view);
         TabLayout tabLayout = getActivity().findViewById(R.id.tabLayout);
         BottomNavigationView bnv = getActivity().findViewById(R.id.main_samsung_tabs);
-        SeslViewPager seslViewPager = getActivity().findViewById(R.id.viewPager);
+        ViewPager viewPager = getActivity().findViewById(R.id.viewPager);
 
         if (enabled) {
             mSelecting = true;
@@ -314,7 +314,7 @@ public void setSelecting(boolean enabled) {
             });
             tabLayout.setEnabled(false);
             bnv.setEnabled(false);
-            seslViewPager.setPagingEnabled(false);
+            viewPager.setPagingEnabled(false);
             onBackPressedCallback.setEnabled(true);
         } else {
             mSelecting = false;
@@ -325,7 +325,7 @@ public void setSelecting(boolean enabled) {
             drawerLayout.showSelectAllMode(false);
             tabLayout.setEnabled(true);
             bnv.setEnabled(true);
-            seslViewPager.setPagingEnabled(true);
+            viewPager.setPagingEnabled(true);
             onBackPressedCallback.setEnabled(false);
         }
     }

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

@@ -16,7 +16,7 @@
         android:orientation="vertical"
         app:roundedCorners="top_left|top_right">
 
-        <androidx.viewpager.widget.SeslViewPager
+        <de.dlyt.yanndroid.oneui.view.ViewPager
             android:id="@+id/viewPager"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

yanndroid/oneui/src/main/java/androidx/viewpager/widget/SeslViewPager.java

@@ -127,7 +127,6 @@ public void run() {
     public float mTouchSlopRatio = 0.5F;
     public boolean mUsePagingTouchSlopForStylus = false;
     public VelocityTracker mVelocityTracker;
-    private boolean pagingEnabled = true;
 
     public SeslViewPager(Context var1) {
         super(var1);
@@ -1445,14 +1444,6 @@ public void onDraw(Canvas var1) {
 
     }
 
-    public void setPagingEnabled(boolean pagingEnabled){
-        this.pagingEnabled = pagingEnabled;
-    }
-
-    public boolean isPagingEnabled(){
-        return this.pagingEnabled;
-    }
-
     public boolean onGenericMotionEvent(MotionEvent var1) {
         if (this.mIsMouseWheelEventSupport && (var1.getSource() & 2) != 0 && var1.getAction() == 8) {
             float var2 = var1.getAxisValue(9);
@@ -1471,7 +1462,6 @@ public boolean onGenericMotionEvent(MotionEvent var1) {
     }
 
     public boolean onInterceptTouchEvent(MotionEvent var1) {
-        if (!pagingEnabled) return false;
         int var2 = var1.getAction() & 255;
         if (var2 != 3 && var2 != 1) {
             if (var2 != 0) {
@@ -1985,7 +1975,6 @@ public void onSizeChanged(int var1, int var2, int var3, int var4) {
     }
 
     public boolean onTouchEvent(MotionEvent var1) {
-        if (!pagingEnabled) return false;
         if (this.mFakeDragging) {
             return true;
         } else {

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/view/ViewPager.java

@@ -0,0 +1,37 @@
+package de.dlyt.yanndroid.oneui.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+import androidx.viewpager.widget.SeslViewPager;
+
+public class ViewPager extends SeslViewPager {
+    private boolean mIsPagingEnabled = true;
+
+    public ViewPager(Context context) {
+        super(context);
+    }
+
+    public ViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        return mIsPagingEnabled && super.onInterceptTouchEvent(ev);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        return mIsPagingEnabled && super.onTouchEvent(ev);
+    }
+
+    public void setPagingEnabled(boolean enabled){
+        mIsPagingEnabled = enabled;
+    }
+
+    public boolean isPagingEnabled(){
+        return mIsPagingEnabled;
+    }
+}

yanndroid/oneui/src/main/res/layout/samsung_appbar_toolbarlayout.xml

@@ -113,7 +113,7 @@
                                 android:layout_height="1.0px"
                                 android:layout_alignParentEnd="true"
                                 android:layout_gravity="center|top"
-                                android:layout_marginEnd="12.0dip" />
+                                android:layout_marginEnd="10.0dip" />
                         </RelativeLayout>
 
                     </LinearLayout>

yanndroid/oneui/src/main/res/layout/samsung_toolbar_toolbarlayout.xml

@@ -10,6 +10,7 @@
         android:id="@+id/toolbar_layout_toolbar"
         android:layout_width="fill_parent"
         android:layout_height="?actionBarSize"
+        android:layout_marginBottom="@dimen/sesl_extended_appbar_bottom_padding"
         android:paddingStart="@dimen/sesl_action_bar_content_inset"
         app:popupTheme="@style/OneUIStyleMain">
 
@@ -90,7 +91,7 @@
                     android:layout_height="1.0px"
                     android:layout_alignParentEnd="true"
                     android:layout_gravity="center|top"
-                    android:layout_marginEnd="12.0dip" />
+                    android:layout_marginEnd="10.0dip" />
             </RelativeLayout>
 
         </LinearLayout>