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

Added night theme dog btn background

Browse source
This commit is contained in:
Dmitry Donskoy 2019-11-18 14:04:03 +03:00 • committed by Aleksandr Zatsepin
parent 75e71d855b
commit aa38fcb270
10 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/res/drawable-hdpi/ic_dog_bg_night.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
android/res/drawable-mdpi/ic_dog_bg_night.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
android/res/drawable-xhdpi/ic_dog_bg_night.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
android/res/drawable-xxhdpi/ic_dog_bg_night.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
android/res/drawable-xxxhdpi/ic_dog_bg_night.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

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

@ -66,7 +66,7 @@
android:id="@+id/dog_btn_bg"
style="@style/MwmWidget.MapButton.Traffic"
android:layout_gravity="center"
android:src="@drawable/ic_dog_bg"/>
android:src="?attr/bg_dog_btn"/>
<ImageButton
android:id="@+id/subs_screen_btn"

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

@ -66,7 +66,7 @@
android:id="@+id/dog_btn_bg"
android:layout_gravity="center"
style="@style/MwmWidget.MapButton.Traffic"
android:src="@drawable/ic_dog_bg"/>
android:src="?attr/bg_dog_btn"/>
<ImageButton
android:id="@+id/subs_screen_btn"

1
android/res/values/themes-attrs.xml
View file

@ -111,6 +111,7 @@
<attr name="tipsPrimaryTextColor" format="color"/>
<attr name="tipsSecondaryTextColor" format="color"/>
<attr name="bg_crown" format="reference"/>
<attr name="bg_dog_btn" format="reference"/>
</declare-styleable>
<declare-styleable name="ThemeAttrs.NavButtons">

2
android/res/values/themes-base.xml
View file

@ -159,6 +159,7 @@
<item name="subscriptionTitleColor">@color/bookmarks_subs_title</item>
<item name="subscriptionSubtitleColor">@color/bookmarks_subs_subtitle</item>
<item name="bg_crown">@drawable/bg_crown</item>
<item name="bg_dog_btn">@drawable/ic_dog_bg</item>
</style>
<!-- Night theme -->
@ -317,5 +318,6 @@
<item name="subscriptionTitleColor">@color/bookmarks_subs_title_night</item>
<item name="subscriptionSubtitleColor">@color/bookmarks_subs_subtitle_night</item>
<item name="bg_crown">@drawable/bg_crown_night</item>
<item name="bg_dog_btn">@drawable/ic_dog_bg_night</item>
</style>
</resources>

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

@ -724,14 +724,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
initToggleMapLayerController(frame);
View openSubsScreenBtnContainer = frame.findViewById(R.id.subs_screen_btn_container);
boolean hasCrownView = OnboardingTip.get() != null;
boolean hasOnBoardingView = OnboardingTip.get() != null;
mNavAnimationController = new NavigationButtonsAnimationController(
zoomIn, zoomOut, myPosition, getWindow().getDecorView().getRootView(), this,
hasCrownView ? openSubsScreenBtnContainer : null);
hasOnBoardingView ? openSubsScreenBtnContainer : null);
UiUtils.showIf(hasCrownView, openSubsScreenBtnContainer);
if (hasCrownView)
UiUtils.showIf(hasOnBoardingView, openSubsScreenBtnContainer);
if (hasOnBoardingView)
{
openSubsScreenBtnContainer.findViewById(R.id.subs_screen_btn)
.setOnClickListener(v -> onBoardingBtnClicked());