From 5d9320bfeacaab41ce3772dcb69e3950f9482d6d Mon Sep 17 00:00:00 2001 From: mueller-ma Date: Fri, 12 Jul 2024 13:01:40 +0200 Subject: [PATCH] Revert skeleton for Sitemaps for now See https://github.com/openhab/openhab-android/issues/3740#issuecomment-2225089147 Signed-off-by: mueller-ma --- .../habdroid/ui/activity/ContentController.kt | 5 +-- .../src/main/res/layout/fragment_status.xml | 41 ++++--------------- 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/activity/ContentController.kt b/mobile/src/main/java/org/openhab/habdroid/ui/activity/ContentController.kt index 042b940646..3ba3781bc5 100644 --- a/mobile/src/main/java/org/openhab/habdroid/ui/activity/ContentController.kt +++ b/mobile/src/main/java/org/openhab/habdroid/ui/activity/ContentController.kt @@ -41,7 +41,6 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks import androidx.fragment.app.commit import androidx.fragment.app.commitNow -import com.faltenreich.skeletonlayout.SkeletonLayout import java.util.Stack import org.openhab.habdroid.R import org.openhab.habdroid.core.OpenHabApplication @@ -794,9 +793,7 @@ abstract class ContentController protected constructor(private val activity: Mai descriptionText.text = arguments.getCharSequence(KEY_MESSAGE) descriptionText.isVisible = !descriptionText.text.isNullOrEmpty() - val skeleton = view.findViewById(R.id.skeletonLayout) - skeleton.isVisible = arguments.getBoolean(KEY_PROGRESS) - skeleton.showSkeleton() + view.findViewById(R.id.progress).isVisible = arguments.getBoolean(KEY_PROGRESS) val watermark = view.findViewById(R.id.image) diff --git a/mobile/src/main/res/layout/fragment_status.xml b/mobile/src/main/res/layout/fragment_status.xml index 89be748815..d614e6a362 100644 --- a/mobile/src/main/res/layout/fragment_status.xml +++ b/mobile/src/main/res/layout/fragment_status.xml @@ -35,40 +35,13 @@ android:textColor="?colorOnSurfaceVariant" tools:text="Some status message" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - +