pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed review notes - renamed base fragments

Browse source 
https://github.com/mapsme/omim/pull/10273#discussion_r252116996
This commit is contained in:
Dmitry Donskoy 2019-01-30 12:53:56 +03:00 • committed by Aleksandr Zatsepin
parent a86c993a43
commit e2cad930c9
5 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/auth/BaseMwmAuthorizationFragment.java → android/src/com/mapswithme/maps/auth/BaseAuthFragment.java
View file

@ -12,7 +12,7 @@ import com.mapswithme.maps.base.BaseMwmToolbarFragment;
* starting from the getting an auth token from a social network and passing it to the core
* to get user authorized for the MapsMe server (Passport).
*/
public abstract class BaseMwmAuthorizationFragment extends BaseMwmToolbarFragment
public abstract class BaseAuthFragment extends BaseMwmToolbarFragment
implements Authorizer.Callback, TargetFragmentCallback
{
@NonNull

2
android/src/com/mapswithme/maps/base/NoToolbarBaseMwmAuthFragment.java → android/src/com/mapswithme/maps/base/BaseAuthFragment.java
View file

@ -9,7 +9,7 @@ import android.support.annotation.Nullable;
import com.mapswithme.maps.auth.Authorizer;
import com.mapswithme.maps.auth.TargetFragmentCallback;
public abstract class NoToolbarBaseMwmAuthFragment extends BaseAsyncOperationFragment
public abstract class BaseAuthFragment extends BaseAsyncOperationFragment
implements Authorizer.Callback, TargetFragmentCallback
{
@NonNull

4
android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java
View file

@ -12,7 +12,7 @@ import android.widget.EditText;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.auth.BaseMwmAuthorizationFragment;
import com.mapswithme.maps.auth.BaseAuthFragment;
import com.mapswithme.maps.background.Notifier;
import com.mapswithme.maps.bookmarks.data.FeatureId;
import com.mapswithme.maps.metrics.UserActionsLogger;
@ -25,7 +25,7 @@ import com.mapswithme.util.statistics.Statistics;
import java.util.List;
public class UGCEditorFragment extends BaseMwmAuthorizationFragment
public class UGCEditorFragment extends BaseAuthFragment
{
static final String ARG_FEATURE_ID = "arg_feature_id";
static final String ARG_TITLE = "arg_title";

7
android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java
View file

@ -9,7 +9,7 @@ import android.view.View;
import android.view.ViewGroup;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.NoToolbarBaseMwmAuthFragment;
import com.mapswithme.maps.base.BaseAuthFragment;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.CatalogCustomProperty;
@ -21,7 +21,7 @@ import com.mapswithme.util.statistics.Statistics;
import java.util.List;
import java.util.Objects;
public class SendLinkPlaceholderFragment extends NoToolbarBaseMwmAuthFragment implements BookmarkManager.BookmarksCatalogListener
public class SendLinkPlaceholderFragment extends BaseAuthFragment implements BookmarkManager.BookmarksCatalogListener
{
public static final String EXTRA_CATEGORY = "bookmarks_category";
private static final String BODY_STRINGS_SEPARATOR = "\n\n";
@ -70,7 +70,8 @@ public class SendLinkPlaceholderFragment extends NoToolbarBaseMwmAuthFragment im
private void requestUpload()
{
showProgress();
BookmarkManager.INSTANCE.uploadToCatalog(BookmarkCategory.AccessRules.ACCESS_RULES_AUTHOR_ONLY, mCategory);
BookmarkManager.INSTANCE.uploadToCatalog(BookmarkCategory.AccessRules.ACCESS_RULES_AUTHOR_ONLY,
mCategory);
}
private void shareLink()

9
android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java
View file

@ -6,9 +6,7 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.text.Html;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
@ -20,7 +18,7 @@ import android.widget.Toast;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.auth.BaseMwmAuthorizationFragment;
import com.mapswithme.maps.auth.BaseAuthFragment;
import com.mapswithme.maps.base.FinishActivityToolbarController;
import com.mapswithme.maps.bookmarks.data.AbstractCategoriesSnapshot;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
@ -32,7 +30,6 @@ import com.mapswithme.maps.bookmarks.data.CatalogTagsGroup;
import com.mapswithme.maps.dialog.AlertDialog;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.maps.dialog.ConfirmationDialogFactory;
import com.mapswithme.maps.dialog.ProgressDialogFragment;
import com.mapswithme.maps.widget.ToolbarController;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.UiUtils;
@ -43,8 +40,8 @@ import com.mapswithme.util.statistics.Statistics;
import java.util.List;
import java.util.Objects;
public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment implements BookmarkManager.BookmarksCatalogListener,
AlertDialogCallback
public class UgcSharingOptionsFragment extends BaseAuthFragment implements BookmarkManager.BookmarksCatalogListener,
AlertDialogCallback
{
public static final int REQ_CODE_CUSTOM_PROPERTIES = 101;
private static final int REQ_CODE_NO_NETWORK_CONNECTION_DIALOG = 103;