Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove nav drawer footer

Browse source
This commit is contained in:
Vitaliy 2020-04-01 19:46:02 +03:00
parent 63e4716708
commit 50577f3f32
3 changed files with 3 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/res/layout/main.xml
View file

@ -107,18 +107,6 @@
android:drawSelectorOnTop="false"
android:layout_gravity="start"/>
<RelativeLayout
android:id="@+id/drawer_footer_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:layout_alignParentBottom="true"
android:layout_gravity="start"
android:visibility="gone">
<include layout="@layout/powered_by_osmand_item"/>
</RelativeLayout>
</RelativeLayout>
</androidx.drawerlayout.widget.DrawerLayout>

34
OsmAnd/res/layout/powered_by_osmand_item.xml
View file

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
android:layout_gravity="bottom"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:contentDescription="@string/app_name_osmand"
android:scaleType="centerInside"
android:tint="@color/osmand_orange"
android:src="@drawable/ic_action_osmand_logo" />
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawablePadding="24dp"
android:gravity="center_vertical"
android:minHeight="@dimen/list_item_height"
android:paddingStart="4dp"
android:paddingLeft="4dp"
android:text="@string/powered_by_osmand"
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textStyle="normal" />
</LinearLayout>

52
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -50,7 +50,6 @@ import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.Version;
import net.osmand.plus.activities.actions.OsmAndDialogs;
import net.osmand.plus.activities.actions.OsmandRestoreOrExitDialog;
import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
import net.osmand.plus.dialogs.FavoriteDialogs;
import net.osmand.plus.download.IndexItem;
@ -144,22 +143,18 @@ public class MapActivityActions implements DialogProvider {
private final MapActivity mapActivity;
private OsmandSettings settings;
private RoutingHelper routingHelper;
@NonNull
private ImageView drawerLogoHeader;
private View drawerOsmAndFooter;
private int drawerMode = DRAWER_MODE_NORMAL;
public MapActivityActions(MapActivity mapActivity) {
this.mapActivity = mapActivity;
settings = mapActivity.getMyApplication().getSettings();
routingHelper = mapActivity.getMyApplication().getRoutingHelper();
drawerLogoHeader = new ImageView(mapActivity);
drawerLogoHeader.setPadding(-AndroidUtils.dpToPx(mapActivity, 8f), AndroidUtils.dpToPx(mapActivity, 16f), 0,
0);
drawerOsmAndFooter = mapActivity.getLayoutInflater().inflate(R.layout.powered_by_osmand_item, null);
drawerLogoHeader.setPadding(-AndroidUtils.dpToPx(mapActivity, 8f),
AndroidUtils.dpToPx(mapActivity, 16f), 0, 0);
}
public void addAsTarget(double latitude, double longitude, PointDescription pd) {
@ -1121,13 +1116,10 @@ public class MapActivityActions implements DialogProvider {
menuItemsListView.setBackgroundColor(ContextCompat.getColor(mapActivity, R.color.list_background_color_light));
}
menuItemsListView.removeHeaderView(drawerLogoHeader);
menuItemsListView.removeFooterView(drawerOsmAndFooter);
Bitmap navDrawerLogo = getMyApplication().getAppCustomization().getNavDrawerLogo();
final ArrayList<String> navDrawerLogoParams = getMyApplication().getAppCustomization().getNavDrawerLogoParams();
boolean customHeader = false;
if (navDrawerLogo != null) {
customHeader = true;
drawerLogoHeader.setImageBitmap(navDrawerLogo);
menuItemsListView.addHeaderView(drawerLogoHeader);
}
@ -1159,44 +1151,6 @@ public class MapActivityActions implements DialogProvider {
}
});
if (customHeader) {
menuItemsListView.post(new Runnable() {
public void run() {
View footerLayout = mapActivity.findViewById(R.id.drawer_footer_layout);
boolean showFooterLayout = false;
if (menuItemsListView.getChildCount() > 0) {
int numItemsVisible = menuItemsListView.getLastVisiblePosition() -
menuItemsListView.getFirstVisiblePosition();
View lastView = menuItemsListView.getChildAt(menuItemsListView.getLastVisiblePosition());
boolean overlapped = lastView != null && lastView.getY() + lastView.getHeight() * 2 > menuItemsListView.getHeight();
if (simpleListAdapter.getCount() - 1 > numItemsVisible || overlapped) {
menuItemsListView.addFooterView(drawerOsmAndFooter);
} else {
showFooterLayout = true;
}
} else {
showFooterLayout = true;
}
if (showFooterLayout) {
footerLayout.setVisibility(View.VISIBLE);
footerLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (navDrawerLogoParams != null) {
mapActivity.closeDrawer();
}
new OsmandRestoreOrExitDialog()
.show(mapActivity.getSupportFragmentManager(), "dialog");
//showReturnConfirmationDialog(navDrawerLogoParams.get(0));
}
});
} else {
footerLayout.setVisibility(View.GONE);
}
}
});
}
}
private void executeHeadersIntent(String packageName) {