From af4bd647d6d98e187d7f574053432aa38a7405fd Mon Sep 17 00:00:00 2001 From: osodebailar Date: Wed, 20 Apr 2022 10:24:36 +0200 Subject: [PATCH] small display fix for cardview in overview --- .../general/overview/OverviewFragment.kt | 2 +- .../nightscout/androidaps/skins/SkinLowRes.kt | 41 +++++++++++++++++++ app/src/main/res/layout/overview_fragment.xml | 10 ++--- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 1d35a47c86..7be5135fa4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -165,7 +165,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val landscape = screenHeight < screenWidth skinProvider.activeSkin().preProcessLandscapeOverviewLayout(dm, binding, landscape, rh.gb(R.bool.isTablet), smallHeight) - binding.nsclientLayout.visibility = config.NSCLIENT.toVisibility() + binding.nsclientCard.visibility = config.NSCLIENT.toVisibility() binding.notifications.setHasFixedSize(false) binding.notifications.layoutManager = LinearLayoutManager(view.context) diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt index 45ba680275..ce7c8a7581 100644 --- a/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt +++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt @@ -2,6 +2,8 @@ package info.nightscout.androidaps.skins import android.util.DisplayMetrics import android.view.View.GONE +import android.view.ViewGroup +import androidx.core.view.marginStart import info.nightscout.androidaps.interfaces.Config import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.ActionsFragmentBinding @@ -38,6 +40,45 @@ class SkinLowRes @Inject constructor(private val config: Config) : SkinInterface override fun preProcessLandscapeOverviewLayout(dm: DisplayMetrics, binding: OverviewFragmentBinding, isLandscape: Boolean, isTablet: Boolean, isSmallHeight: Boolean) { if (!config.NSCLIENT && isLandscape) moveButtonsLayout(binding.root) + + binding.apply { + loopCard.elevation = 0F + loopCard.radius = 0F + val param = (loopCard.layoutParams as ViewGroup.MarginLayoutParams).apply { + setMargins(0,0,0,0) + } + loopCard.layoutParams = param + + infoCard.elevation = 0F + infoCard.radius = 0F + val paramInfo = (infoCard.layoutParams as ViewGroup.MarginLayoutParams).apply { + setMargins(0,0,0,0) + } + infoCard.layoutParams = paramInfo + + statusCard.elevation = 0F + statusCard.radius = 0F + statusCard.strokeWidth = 1 + val paramStatus = (statusCard.layoutParams as ViewGroup.MarginLayoutParams).apply { + setMargins(0,0,0,0) + } + statusCard.layoutParams = paramStatus + + nsclientCard.elevation = 0F + nsclientCard.radius = 0F + val paramNsClient = (nsclientCard.layoutParams as ViewGroup.MarginLayoutParams).apply { + setMargins(0,0,0,0) + } + nsclientCard.layoutParams = paramNsClient + + graphCard.elevation = 0F + graphCard.radius = 0F + val paramGraph = (graphCard.layoutParams as ViewGroup.MarginLayoutParams).apply { + setMargins(0,0,0,0) + } + graphCard.layoutParams = paramGraph + } + } } diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml index 7190d24a58..20884ff07c 100644 --- a/app/src/main/res/layout/overview_fragment.xml +++ b/app/src/main/res/layout/overview_fragment.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" />