Skip to content

Commit

Permalink
Revert skeleton for Sitemaps for now (#3746)
Browse files Browse the repository at this point in the history
See #3740 (comment)

Signed-off-by: mueller-ma <[email protected]>
  • Loading branch information
mueller-ma authored Jul 15, 2024
1 parent 9b75a2f commit e47bed9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<SkeletonLayout>(R.id.skeletonLayout)
skeleton.isVisible = arguments.getBoolean(KEY_PROGRESS)
skeleton.showSkeleton()
view.findViewById<View>(R.id.progress).isVisible = arguments.getBoolean(KEY_PROGRESS)

val watermark = view.findViewById<ImageView>(R.id.image)

Expand Down
41 changes: 7 additions & 34 deletions mobile/src/main/res/layout/fragment_status.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,40 +35,13 @@
android:textColor="?colorOnSurfaceVariant"
tools:text="Some status message" />

<com.faltenreich.skeletonlayout.SkeletonLayout
android:id="@+id/skeletonLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:maskColor="?colorOnSurfaceInverse">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/widgetlist_frameitem" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_frameitem" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_frameitem" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_frameitem" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
<include layout="@layout/widgetlist_textitem_compact" />
</LinearLayout>


</com.faltenreich.skeletonlayout.SkeletonLayout>
<ProgressBar
android:id="@+id/progress"
style="?attr/indeterminateProgressStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center_horizontal" />

<com.google.android.material.button.MaterialButton
android:id="@+id/button1"
Expand Down

0 comments on commit e47bed9

Please sign in to comment.