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

[android] subs_screen_btn is renamed to onboarding_btn

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-11-26 19:03:04 +03:00
parent 6d755076d1
commit 7d3f7ed3eb
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout-land/map_navigation_buttons.xml
View file

@ -70,7 +70,7 @@
android:src="?attr/bg_dog_btn"/>
<ImageView
android:id="@+id/subs_screen_btn"
android:id="@+id/onboarding_btn"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"

2
android/res/layout/map_navigation_buttons.xml
View file

@ -71,7 +71,7 @@
android:src="?attr/bg_dog_btn"/>
<ImageView
android:id="@+id/subs_screen_btn"
android:id="@+id/onboarding_btn"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"

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

@ -744,7 +744,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
UiUtils.showIf(hasOnBoardingView, openSubsScreenBtnContainer);
if (hasOnBoardingView)
{
openSubsScreenBtnContainer.findViewById(R.id.subs_screen_btn)
openSubsScreenBtnContainer.findViewById(R.id.onboarding_btn)
.setOnClickListener(v -> onBoardingBtnClicked(tip));
Statistics.ParameterBuilder builder = Statistics.makeGuidesSubscriptionBuilder();
Statistics.INSTANCE.trackEvent(Statistics.EventName.MAP_SPONSORED_BUTTON_SHOW, builder);

2
android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java
View file

@ -57,7 +57,7 @@ class NavigationButtonsAnimationController
{
Animation animation = AnimationUtils.loadAnimation(onBoardingTipBtnContainer.getContext(),
R.anim.dog_btn_rotation);
onBoardingTipBtnContainer.findViewById(R.id.subs_screen_btn).setAnimation(animation);
onBoardingTipBtnContainer.findViewById(R.id.onboarding_btn).setAnimation(animation);
}
}

2
android/src/com/mapswithme/maps/routing/NavigationController.java
View file

@ -137,7 +137,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie
mSearchButtonFrame = activity.findViewById(R.id.search_button_frame);
mSearchWheel = new SearchWheel(mSearchButtonFrame);
mOnboardingBtn = activity.findViewById(R.id.subs_screen_btn);
mOnboardingBtn = activity.findViewById(R.id.onboarding_btn);
ImageView bookmarkButton = (ImageView) mSearchButtonFrame.findViewById(R.id.btn_bookmarks);
bookmarkButton.setImageDrawable(Graphics.tint(bookmarkButton.getContext(),