mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes #4287 "Tapping multiple items in explore should not be allowed" (#4310)

Browse source 
* only one media detail at a time

* requested changes

* disabled multitap on screen

* requested changes
This commit is contained in:
Aditya-Srivastav 2021-04-01 19:54:48 +05:30 • committed by GitHub
parent 4dfad52685
commit ff96f5047e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/fr/free/nrw/commons/explore/ExploreListRootFragment.java
View file

@ -2,7 +2,7 @@ package fr.free.nrw.commons.explore;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.os.Handler;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -10,20 +10,16 @@ import android.widget.FrameLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import com.google.android.material.tabs.TabLayout;
import fr.free.nrw.commons.Media; import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.category.CategoryImagesCallback; import fr.free.nrw.commons.category.CategoryImagesCallback;
import fr.free.nrw.commons.contributions.ContributionsListFragment;
import fr.free.nrw.commons.contributions.MainActivity; import fr.free.nrw.commons.contributions.MainActivity;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.categories.media.CategoriesMediaFragment; import fr.free.nrw.commons.explore.categories.media.CategoriesMediaFragment;
import fr.free.nrw.commons.media.MediaDetailPagerFragment; import fr.free.nrw.commons.media.MediaDetailPagerFragment;
import fr.free.nrw.commons.navtab.NavTab; import fr.free.nrw.commons.navtab.NavTab;
import fr.free.nrw.commons.settings.SettingsFragment;
public class ExploreListRootFragment extends CommonsDaggerSupportFragment implements public class ExploreListRootFragment extends CommonsDaggerSupportFragment implements
MediaDetailPagerFragment.MediaDetailProvider, CategoryImagesCallback { MediaDetailPagerFragment.MediaDetailProvider, CategoryImagesCallback {
@ -80,7 +76,7 @@ public class ExploreListRootFragment extends CommonsDaggerSupportFragment implem
.addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG") .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
.commit(); .commit();
getChildFragmentManager().executePendingTransactions(); getChildFragmentManager().executePendingTransactions();
}else if (!fragment.isAdded() && otherFragment != null ) { } else if (!fragment.isAdded() && otherFragment != null ) {
getChildFragmentManager() getChildFragmentManager()
.beginTransaction() .beginTransaction()
.hide(otherFragment) .hide(otherFragment)
@ -113,9 +109,8 @@ public class ExploreListRootFragment extends CommonsDaggerSupportFragment implem
@Override @Override
public void onMediaClicked(int position) { public void onMediaClicked(int position) {
Log.d("deneme8","on media clicked");
container.setVisibility(View.VISIBLE); container.setVisibility(View.VISIBLE);
((ExploreFragment)getParentFragment()).tabLayout.setVisibility(View.GONE); ((ExploreFragment) getParentFragment()).tabLayout.setVisibility(View.GONE);
mediaDetails = new MediaDetailPagerFragment(false, true); mediaDetails = new MediaDetailPagerFragment(false, true);
mediaDetails.showImage(position); mediaDetails.showImage(position);
((ExploreFragment) getParentFragment()).setScroll(false); ((ExploreFragment) getParentFragment()).setScroll(false);

4
app/src/main/res/values/styles.xml
View file

@ -54,6 +54,8 @@
<item name="contributionsListTextSecondary">@color/white</item> <item name="contributionsListTextSecondary">@color/white</item>
<item name="menu_item_tint">@color/white</item> <item name="menu_item_tint">@color/white</item>
<item name="search_icon">@drawable/ic_search_white_24dp</item> <item name="search_icon">@drawable/ic_search_white_24dp</item>
<item name="android:windowEnableSplitTouch">false</item>
<item name="android:splitMotionEvents">false</item>
</style> </style>
<style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
@ -109,6 +111,8 @@
<item name="contributionsListTextSecondary">@color/disabled_button_text_color_dark</item> <item name="contributionsListTextSecondary">@color/disabled_button_text_color_dark</item>
<item name="menu_item_tint">@color/primaryDarkColor</item> <item name="menu_item_tint">@color/primaryDarkColor</item>
<item name="search_icon">@drawable/ic_search_blue_24dp</item> <item name="search_icon">@drawable/ic_search_blue_24dp</item>
<item name="android:windowEnableSplitTouch">false</item>
<item name="android:splitMotionEvents">false</item>
</style> </style>
<style name="LightMoreBottomSheetStyle" parent="LightAppTheme"> <style name="LightMoreBottomSheetStyle" parent="LightAppTheme">