mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 04:43:54 +01:00
Code cleanup
This commit is contained in:
parent
9d1412b03d
commit
1677a4bd52
4 changed files with 26 additions and 33 deletions
|
|
@ -62,6 +62,7 @@ import fr.free.nrw.commons.utils.NearbyFABUtils;
|
||||||
import fr.free.nrw.commons.utils.NetworkUtils;
|
import fr.free.nrw.commons.utils.NetworkUtils;
|
||||||
import fr.free.nrw.commons.utils.PermissionUtils;
|
import fr.free.nrw.commons.utils.PermissionUtils;
|
||||||
import fr.free.nrw.commons.utils.ViewUtil;
|
import fr.free.nrw.commons.utils.ViewUtil;
|
||||||
|
import fr.free.nrw.commons.wikidata.WikidataEditListener;
|
||||||
import io.reactivex.Observable;
|
import io.reactivex.Observable;
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||||
import io.reactivex.schedulers.Schedulers;
|
import io.reactivex.schedulers.Schedulers;
|
||||||
|
|
@ -69,9 +70,12 @@ import timber.log.Timber;
|
||||||
|
|
||||||
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
|
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
|
||||||
import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
|
import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
|
||||||
|
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.MAP_UPDATED;
|
||||||
|
|
||||||
|
|
||||||
public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment implements NearbyParentFragmentContract.View {
|
public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment
|
||||||
|
implements NearbyParentFragmentContract.View,
|
||||||
|
WikidataEditListener.WikidataP18EditListener {
|
||||||
|
|
||||||
@BindView(R.id.bottom_sheet)
|
@BindView(R.id.bottom_sheet)
|
||||||
View bottomSheetList;
|
View bottomSheetList;
|
||||||
|
|
@ -164,6 +168,8 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
|
||||||
@Inject
|
@Inject
|
||||||
ContributionController controller;
|
ContributionController controller;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
WikidataEditListener wikidataEditListener;
|
||||||
|
|
||||||
private BottomSheetBehavior bottomSheetListBehavior;
|
private BottomSheetBehavior bottomSheetListBehavior;
|
||||||
private BottomSheetBehavior bottomSheetDetailsBehavior;
|
private BottomSheetBehavior bottomSheetDetailsBehavior;
|
||||||
|
|
@ -888,4 +894,23 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
|
||||||
bookmarkButtonImage.setImageResource(bookmarkIcon);
|
bookmarkButtonImage.setImageResource(bookmarkIcon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAttach(Context context) {
|
||||||
|
super.onAttach(context);
|
||||||
|
wikidataEditListener.setAuthenticationStateListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
wikidataEditListener.setAuthenticationStateListener(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onWikidataEditSuccessful() {
|
||||||
|
if (mapFragment != null && nearbyParentFragmentPresenter != null && locationManager != null) {
|
||||||
|
nearbyParentFragmentPresenter.updateMapAndList(MAP_UPDATED, locationManager.getLastLocation());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:orientation="vertical" android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<com.mapbox.mapboxsdk.maps.MapView
|
|
||||||
android:id="@+id/mapView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
@ -50,20 +50,6 @@
|
||||||
android:icon="@drawable/ic_feedback_black_24dp"
|
android:icon="@drawable/ic_feedback_black_24dp"
|
||||||
android:title="@string/navigation_item_feedback" />
|
android:title="@string/navigation_item_feedback" />
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_nearby_test_activity"
|
|
||||||
android:icon="@drawable/ic_help_black_24dp"
|
|
||||||
android:title="@string/navigation_item_nearby_test_activity" />
|
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_nearby_test_fragment"
|
|
||||||
android:icon="@drawable/ic_help_black_24dp"
|
|
||||||
android:title="@string/navigation_item_nearby_test_fragment" />
|
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_nearby_test_fragment_layers"
|
|
||||||
android:icon="@drawable/ic_help_black_24dp"
|
|
||||||
android:title="@string/navigation_item_nearby_test_fragment_layers" />
|
|
||||||
|
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -89,9 +89,6 @@
|
||||||
<string name="title_activity_featured_images">Featured Images</string>
|
<string name="title_activity_featured_images">Featured Images</string>
|
||||||
<string name="title_activity_category_details">Category</string>
|
<string name="title_activity_category_details">Category</string>
|
||||||
<string name="title_activity_review">Peer Review</string>
|
<string name="title_activity_review">Peer Review</string>
|
||||||
<string name="title_activity_nearby_test_activity">Nearby Test Activity</string>
|
|
||||||
<string name="title_activity_nearby_test_fragment">Nearby Test Fragment</string>
|
|
||||||
<string name="title_activity_nearby_test_fragment_layers">Nearby Test Fragment Layers</string>
|
|
||||||
<string name="menu_about">About</string>
|
<string name="menu_about">About</string>
|
||||||
<string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
|
<string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
|
||||||
<string name="trademarked_name" translatable="false">Wikimedia Commons</string>
|
<string name="trademarked_name" translatable="false">Wikimedia Commons</string>
|
||||||
|
|
@ -236,9 +233,6 @@
|
||||||
<string name="navigation_item_notification">Notifications</string>
|
<string name="navigation_item_notification">Notifications</string>
|
||||||
<string name="navigation_item_featured_images">Featured</string>
|
<string name="navigation_item_featured_images">Featured</string>
|
||||||
<string name="navigation_item_review">Review</string>
|
<string name="navigation_item_review">Review</string>
|
||||||
<string name="navigation_item_nearby_test_activity">Nearby Test Activity</string>
|
|
||||||
<string name="navigation_item_nearby_test_fragment">Nearby Test Fragment</string>
|
|
||||||
<string name="navigation_item_nearby_test_fragment_layers">Nearby Test Fragment Layers</string>
|
|
||||||
<string name="nearby_needs_permissions">Nearby places cannot be displayed without location permissions</string>
|
<string name="nearby_needs_permissions">Nearby places cannot be displayed without location permissions</string>
|
||||||
<string name="no_description_found">no description found</string>
|
<string name="no_description_found">no description found</string>
|
||||||
<string name="nearby_info_menu_commons_article">Commons file page</string>
|
<string name="nearby_info_menu_commons_article">Commons file page</string>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue