Update module fragment

Update UI and logic for loading modules
This commit is contained in:
topjohnwu
2020-08-09 21:41:23 -07:00
parent c944277e78
commit f5aa6a3cf8
8 changed files with 136 additions and 155 deletions
@@ -32,7 +32,7 @@
android:id="@+id/module_list"
adapter="@{viewModel.adapter}"
dividerHorizontal="@{@drawable/divider_l1}"
dividerVertical="@{@drawable/divider_l1}"
dividerVertical="@{@drawable/divider_l_50}"
gone="@{viewModel.loading && viewModel.items.empty}"
itemBinding="@{viewModel.itemBinding}"
items="@{viewModel.items}"
+10 -16
View File
@@ -15,42 +15,36 @@
</data>
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:layout_height="wrap_content">
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatTextView
<TextView
android:id="@+id/module_title"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{item.title}"
android:textAppearance="@style/AppearanceFoundation.Body"
android:textAppearance="@style/AppearanceFoundation.Large"
android:textColor="@color/color_primary_transient"
android:textStyle="bold"
tools:text="@tools:sample/lorem/random"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/module_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
tools:text="Installed" />
<com.google.android.material.button.MaterialButton
android:id="@+id/module_button"
style="@style/WidgetFoundation.Button.Text.Secondary"
gone="@{!item.hasButton}"
invisible="@{!item.hasButton}"
android:onClick="@{() -> viewModel.sectionPressed(item)}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1"
android:text="@{item.button}"
tools:text="@tools:sample/lorem"
android:textAllCaps="false"
app:icon="@{item.icon}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/module_title"
app:layout_constraintTop_toTopOf="parent" />
tools:text="Reboot" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</layout>
@@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@{item.title}"
android:textAppearance="@style/AppearanceFoundation.Display.Secondary"
android:textAppearance="@style/AppearanceFoundation.Large.Secondary"
android:textStyle="bold"
tools:text="@tools:sample/lorem" />
@@ -36,4 +36,4 @@
</LinearLayout>
</layout>
</layout>
@@ -2,19 +2,19 @@
<resources>
<!--region Display-->
<style name="AppearanceFoundation.Display" parent="TextAppearance.AppCompat.Display1">
<style name="AppearanceFoundation.Large" parent="TextAppearance.AppCompat.Large">
<item name="android:textColor">?attr/colorOnSurface</item>
</style>
<style name="AppearanceFoundation.Display.Secondary">
<style name="AppearanceFoundation.Large.Secondary">
<item name="android:textColor">?colorSecondary</item>
</style>
<style name="AppearanceFoundation.Display.Variant">
<style name="AppearanceFoundation.Large.Variant">
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
</style>
<style name="AppearanceFoundation.Display.OnPrimary">
<style name="AppearanceFoundation.Display.OnPrimary" parent="TextAppearance.AppCompat.Display1">
<item name="android:textColor">?attr/colorOnPrimary</item>
</style>
@@ -119,4 +119,4 @@
</style>
<!--endregion-->
</resources>
</resources>