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

[android] Static showcase menu text.

Browse source 
(cherry picked from commit f575fbe)
This commit is contained in:
Dmitry Yunitsky 2015-12-14 20:11:22 +03:00
parent fa28e5a387
commit 8e27d72dbd
4 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/res/layout/menu_content.xml
View file

@ -53,6 +53,7 @@
style="@style/MwmTheme.Menu.Content.ListItem"
android:drawableLeft="@drawable/ic_showcase"
android:visibility="gone"
android:text="@string/showcase_more_apps"
tools:visibility="visible"
tools:background="#20FF0000"/>

1
android/res/layout/menu_content_grid.xml
View file

@ -55,6 +55,7 @@
style="@style/MwmTheme.Menu.Content.GridItem.Text"
android:drawableTop="@drawable/ic_showcase"
android:visibility="gone"
android:text="@string/showcase_more_apps"
tools:background="#200000FF"
tools:visibility="visible"/>

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

@ -748,8 +748,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
final NativeAppwallBanner menuBanner = nativeAppwallAd.getBanners().get(0);
mMainMenu.showShowcase(true);
mMainMenu.setShowcaseText(menuBanner.getTitle());
mMainMenu.setShowcaseDrawable(menuBanner.getIcon().getBitmap());
}
@Override

23
android/src/com/mapswithme/maps/widget/menu/MainMenu.java
View file

@ -2,7 +2,6 @@ package com.mapswithme.maps.widget.menu;
import android.animation.Animator;
import android.app.Activity;
import android.graphics.Bitmap;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable;
@ -14,6 +13,11 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.mapswithme.country.ActiveCountryTree;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmActivity;
@ -24,11 +28,6 @@ import com.mapswithme.maps.widget.RotateByAlphaDrawable;
import com.mapswithme.maps.widget.TrackedTransitionDrawable;
import com.mapswithme.util.UiUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class MainMenu
{
public enum State
@ -545,18 +544,6 @@ public class MainMenu
UiUtils.showIf(show, mItemViews.get(Item.SHOWCASE));
}
public void setShowcaseText(String text)
{
((TextView)mItemViews.get(Item.SHOWCASE)).setText(text);
}
public void setShowcaseDrawable(Bitmap bitmap)
{
// TODO d.yunitsky uncomment or delete in future, when decision with dynamic vs static icons will be made
// final Drawable drawable = new BitmapDrawable(mFrame.getResources(), Bitmap.createScaledBitmap(bitmap, UiUtils.dp(48), UiUtils.dp(48), true));
// ((TextView) mItemViews.get(Item.SHOWCASE)).setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
}
public Button getRouteStartButton()
{
return mRouteStartButton;