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

[android] Rename class + fix rebase

Browse source
This commit is contained in:
Dmitry Donskoy 2018-09-17 13:18:44 +03:00 • committed by Aleksandr Zatsepin
parent 9489e1f5de
commit 67a4ff4f8d
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/multidex-config.txt
View file

@ -4,7 +4,6 @@ com/mapswithme/maps/bookmarks/data/FeatureId.class
com/mapswithme/maps/bookmarks/data/MapObject.class
com/mapswithme/maps/location/PlatformSocket.class
com/mapswithme/maps/search/PopularityProvider.class
com/mapswithme/maps/metrics/UserActionsCollector.class
com/mapswithme/maps/ugc/UGC$Rating.class
com/mapswithme/util/log/LoggerFactory.class
com/mapswithme/util/HttpClient.class

3
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -72,7 +72,6 @@ import com.mapswithme.maps.maplayer.subway.SubwayManager;
import com.mapswithme.maps.maplayer.traffic.OnTrafficLayerToggleListener;
import com.mapswithme.maps.maplayer.traffic.TrafficManager;
import com.mapswithme.maps.maplayer.traffic.widget.TrafficButton;
import com.mapswithme.maps.metrics.UserActionsLogger;
import com.mapswithme.maps.purchase.AdsRemovalPurchaseCallback;
import com.mapswithme.maps.purchase.AdsRemovalPurchaseControllerProvider;
import com.mapswithme.maps.purchase.PurchaseController;
@ -125,7 +124,6 @@ import com.mapswithme.util.sharing.SharingHelper;
import com.mapswithme.util.statistics.AlohaHelper;
import com.mapswithme.util.statistics.PlacePageTracker;
import com.mapswithme.util.statistics.Statistics;
import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
import java.io.Serializable;
import java.util.Locale;
@ -241,7 +239,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
PurchaseFactory.createPurchaseController();
@NonNull
private final OnClickListener mOnMyPositionClickListener = new CurrentPositionClickListener();
private MaterialTapTargetPrompt mTutorial;
public interface LeftAnimationTrackListener
{

4
android/src/com/mapswithme/maps/tips/ImmersiveCompatPromptBackground.java → android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java
View file

@ -18,7 +18,7 @@ import uk.co.samuelwall.materialtaptargetprompt.extras.PromptBackground;
import uk.co.samuelwall.materialtaptargetprompt.extras.PromptOptions;
import uk.co.samuelwall.materialtaptargetprompt.extras.PromptUtils;
public class ImmersiveCompatPromptBackground extends PromptBackground
public class ImmersiveModeCompatPromptBackground extends PromptBackground
{
@NonNull
private final WindowManager mWindowManager;
@ -34,7 +34,7 @@ public class ImmersiveCompatPromptBackground extends PromptBackground
@NonNull
private final DisplayMetrics mBaseMetrics;
ImmersiveCompatPromptBackground(@NonNull WindowManager windowManager)
ImmersiveModeCompatPromptBackground(@NonNull WindowManager windowManager)
{
mWindowManager = windowManager;
mPaint = new Paint();

5
android/src/com/mapswithme/maps/tips/TipsApi.java
View file

@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.view.View;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.metrics.UserActionsLogger;
@ -138,7 +139,7 @@ public enum TipsApi
.setSecondaryTextTypeface(Typeface.DEFAULT)
.setBackgroundColour(ThemeUtils.getColor(activity, R.attr.tipsBgColor))
.setFocalColour(activity.getResources().getColor(android.R.color.transparent))
.setPromptBackground(new ImmersiveCompatPromptBackground(activity.getWindowManager()))
.setPromptBackground(new ImmersiveModeCompatPromptBackground(activity.getWindowManager()))
.setPromptStateChangeListener((prompt, state) -> onPromptStateChanged(state));
builder.show();
}
@ -161,7 +162,7 @@ public enum TipsApi
@NonNull
public static <T> TipsApi requestCurrent(@NonNull Class<T> requiredScreenClass)
{
int index = 1;
int index = Framework.nativeGetCurrentTipsApi();
TipsApi value = index >= 0 ? values()[index] : STUB;
TipsApi tipsApi = value != STUB && value.isScreenAllowed(requiredScreenClass) ? value
: STUB;