diff --git a/app/build.gradle b/app/build.gradle index bcb25a399d..42f5c188dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 21 targetSdkVersion 34 - versionCode 1092 - versionName "0.10.92" + versionCode 1093 + versionName "0.10.93" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.java b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.java index 47f54e6b98..9405f71ab5 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.java @@ -30,6 +30,7 @@ import com.mikepenz.materialdrawer.model.PrimaryDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.Nameable; +import com.mikepenz.materialdrawer.holder.DimenHolder; import org.ole.planet.myplanet.R; import org.ole.planet.myplanet.callback.OnHomeItemClickListener; @@ -259,18 +260,17 @@ private AccountHeader getAccountHeader() { .withActivity(DashboardActivity.this) .withTextColor(getResources().getColor(R.color.bg_white)) .withHeaderBackground(R.drawable.ole_logo) - .withHeaderBackgroundScaleType(ImageView.ScaleType.FIT_XY) .withDividerBelowHeader(false) .build(); ImageView headerBackground = header.getHeaderBackgroundView(); - headerBackground.setPadding(20, 12, 20, 12); // Add padding values as per your requirement + headerBackground.setPadding(30, 60, 30, 60); headerBackground.setColorFilter(getResources().getColor(R.color.md_white_1000), PorterDuff.Mode.SRC_IN); return header; } private void createDrawer() { - com.mikepenz.materialdrawer.holder.DimenHolder dimenHolder = com.mikepenz.materialdrawer.holder.DimenHolder.fromDp(200); + com.mikepenz.materialdrawer.holder.DimenHolder dimenHolder = com.mikepenz.materialdrawer.holder.DimenHolder.fromDp(160); result = new DrawerBuilder().withActivity(this).withFullscreen(true).withSliderBackgroundColor(getResources().getColor(R.color.colorPrimary)).withToolbar(mTopToolbar).withAccountHeader(headerResult).withHeaderHeight(dimenHolder).addDrawerItems(getDrawerItems()).addStickyDrawerItems(getDrawerItemsFooter()).withOnDrawerItemClickListener((view, position, drawerItem) -> { if (drawerItem != null) { menuAction(((Nameable) drawerItem).getName().getTextRes()); @@ -311,9 +311,6 @@ private void menuAction(int selectedMenuId) { case R.string.enterprises: openEnterpriseFragment(); break; - case R.string.menu_feedback: - openMyFragment(new FeedbackListFragment()); - break; case R.string.menu_logout: logout(); break; @@ -379,10 +376,9 @@ private IDrawerItem[] getDrawerItems() { @NonNull private IDrawerItem[] getDrawerItemsFooter() { ArrayList menuImageListFooter = new ArrayList<>(); - menuImageListFooter.add(getResources().getDrawable(R.drawable.feedback)); menuImageListFooter.add(getResources().getDrawable(R.drawable.logout)); - return new IDrawerItem[]{changeUX(R.string.menu_feedback, menuImageListFooter.get(0)), changeUX(R.string.menu_logout, menuImageListFooter.get(1)),}; + return new IDrawerItem[]{changeUX(R.string.menu_logout, menuImageListFooter.get(0)),}; } public PrimaryDrawerItem changeUX(int iconText, Drawable drawable) {