Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fling fix #20933

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

fling fix #20933

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
320ac5f
fling fix
0xRe1nk0 Sep 27, 2024
18f72b1
Merge branch 'master' into edit_poi_fling_fix
0xRe1nk0 Dec 11, 2024
982e55f
init refactor commit
0xRe1nk0 Dec 12, 2024
39c73d1
refactor advanced fragment tab
0xRe1nk0 Dec 12, 2024
a4fe6fa
refactor basic fragment tab
0xRe1nk0 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OsmAnd/res/layout/fragment_edit_poi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
app:tabTextColor="@android:color/darker_gray" />
</com.google.android.material.appbar.AppBarLayout>

<net.osmand.plus.plugins.osmedit.EditPoiViewPager
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
Expand Down
4 changes: 2 additions & 2 deletions OsmAnd/res/layout/fragment_edit_poi_advanced.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView
<ScrollView
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't use ScrollView / NestedScrollView coudln't be used here cause it's already inside scrollview. Also we need to use recyclerview for tag/ values on advanced tabs

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"
Expand Down Expand Up @@ -129,4 +129,4 @@
android:layout_marginStart="12dp" />
</LinearLayout>
</FrameLayout>
</androidx.core.widget.NestedScrollView>
</ScrollView>
4 changes: 2 additions & 2 deletions OsmAnd/res/layout/fragment_edit_poi_normal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here was no problem as I remember

<ScrollView
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"
Expand Down Expand Up @@ -136,4 +136,4 @@

</RelativeLayout>

</androidx.core.widget.NestedScrollView>
</ScrollView>
75 changes: 32 additions & 43 deletions OsmAnd/src/net/osmand/plus/plugins/osmedit/dialogs/EditPoiDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
import androidx.appcompat.widget.AppCompatImageButton;
import androidx.appcompat.widget.Toolbar;
import androidx.core.view.ViewCompat;
import androidx.core.widget.NestedScrollView;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.fragment.app.FragmentTransaction;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;

import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;

import net.osmand.CallbackWithObject;
import net.osmand.PlatformUtil;
Expand All @@ -54,7 +54,6 @@
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.BaseOsmAndDialogFragment;
import net.osmand.plus.plugins.PluginsHelper;
import net.osmand.plus.plugins.osmedit.EditPoiViewPager;
import net.osmand.plus.plugins.osmedit.OsmEditingPlugin;
import net.osmand.plus.plugins.osmedit.data.EditPoiData;
import net.osmand.plus.plugins.osmedit.data.OpenstreetmapPoint;
Expand Down Expand Up @@ -105,7 +104,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
private OpenstreetmapUtil openstreetmapUtil;

private EditPoiData editPoiData;
private EditPoiViewPager viewPager;
private ViewPager2 viewPager;
private ExtendedEditText poiTypeEditText;

private OnSaveButtonClickListener onSaveButtonClickListener;
Expand Down Expand Up @@ -151,17 +150,18 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
viewPager = view.findViewById(R.id.viewpager);
String basicTitle = getResources().getString(R.string.tab_title_basic);
String extendedTitle = getResources().getString(R.string.tab_title_advanced);
PoiInfoPagerAdapter pagerAdapter = new PoiInfoPagerAdapter(getChildFragmentManager(), basicTitle, extendedTitle);
TabLayout tabLayout = view.findViewById(R.id.tab_layout);
PoiInfoPagerAdapter pagerAdapter = new PoiInfoPagerAdapter(this, basicTitle, extendedTitle);
viewPager.setAdapter(pagerAdapter);
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@Override
public void onPageScrolled(int i, float v, int i1) {

public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
super.onPageScrolled(position, positionOffset, positionOffsetPixels);
}

@Override
public void onPageSelected(int i) {
Fragment pageFragment = pagerAdapter.getItem(i);
public void onPageSelected(int position) {
Fragment pageFragment = pagerAdapter.createFragment(position);
((OnFragmentActivatedListener) pageFragment).onFragmentActivated();
if (pageFragment instanceof OnSaveButtonClickListener) {
onSaveButtonClickListener = (OnSaveButtonClickListener) pageFragment;
Expand All @@ -171,40 +171,29 @@ public void onPageSelected(int i) {
}

@Override
public void onPageScrollStateChanged(int i) {

public void onPageScrollStateChanged(int state) {
super.onPageScrollStateChanged(state);
}
});

TabLayout tabLayout = view.findViewById(R.id.tab_layout);

tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);

// tabLayout.setupWithViewPager(viewPager);
// Hack due to bug in design support library v22.2.1
// https://code.google.com/p/android/issues/detail?id=180462
// TODO remove in new version
if (Build.VERSION.SDK_INT >= 11) {
if (ViewCompat.isLaidOut(tabLayout)) {
tabLayout.setupWithViewPager(viewPager);
} else {
tabLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
@Override
public void onLayoutChange(View v, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom) {
tabLayout.setupWithViewPager(viewPager);
tabLayout.removeOnLayoutChangeListener(this);
}
});
}
if (ViewCompat.isLaidOut(tabLayout)) {
TabLayoutMediator mediator = new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position)));
mediator.attach();
} else {
ViewTreeObserver vto = view.getViewTreeObserver();
vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {

tabLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
@Override
public void onGlobalLayout() {
if (getActivity() != null) {
tabLayout.setupWithViewPager(viewPager);
}
public void onLayoutChange(View v, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom) {
TabLayoutMediator mediator = new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position)));
mediator.attach();
tabLayout.removeOnLayoutChangeListener(this);
}
});
}
Expand Down Expand Up @@ -714,29 +703,29 @@ private Entity getExistingOsmEditEntity(@NonNull OsmEditingPlugin osmEditingPlug
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}

public static class PoiInfoPagerAdapter extends FragmentPagerAdapter {
public static class PoiInfoPagerAdapter extends FragmentStateAdapter {

private final Fragment[] fragments = {new BasicEditPoiFragment(), new AdvancedEditPoiFragment()};
private final String[] titles;

PoiInfoPagerAdapter(FragmentManager fm, String basicTitle, String extendedTitle) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
PoiInfoPagerAdapter(Fragment fm, String basicTitle, String extendedTitle) {
super(fm);
titles = new String[] {basicTitle, extendedTitle};
}

@Override
public int getCount() {
return fragments.length;
public CharSequence getPageTitle(int position) {
return titles[position];
}

@NonNull
@Override
public Fragment getItem(int position) {
public Fragment createFragment(int position) {
return fragments[position];
}

@Override
public CharSequence getPageTitle(int position) {
return titles[position];
public int getItemCount() {
return fragments.length;
}
}

Expand Down
Loading