Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
ffa85a61
Commit
ffa85a61
authored
Feb 12, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update home screen layout (yet again)
parent
e5ea3e4a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
542 additions
and
609 deletions
+542
-609
fragment_home_md2.xml
app/src/main/res/layout/fragment_home_md2.xml
+12
-6
include_home_device.xml
app/src/main/res/layout/include_home_device.xml
+201
-208
include_home_magisk.xml
app/src/main/res/layout/include_home_magisk.xml
+169
-207
include_home_manager.xml
app/src/main/res/layout/include_home_manager.xml
+160
-188
No files found.
app/src/main/res/layout/fragment_home_md2.xml
View file @
ffa85a61
...
...
@@ -40,7 +40,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<
androidx.appcompat.widget.AppCompat
TextView
<TextView
android:id=
"@+id/home_notice_content"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -73,6 +73,8 @@
viewModel=
"@{viewModel}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
app:layout_constraintTop_toTopOf=
"parent"
/>
<include
...
...
@@ -81,7 +83,9 @@
viewModel=
"@{viewModel}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l_50"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
android:layout_marginTop=
"@dimen/l1"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_wrapper"
/>
<include
...
...
@@ -90,7 +94,9 @@
viewModel=
"@{viewModel}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l_50"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
android:layout_marginTop=
"@dimen/l1"
app:layout_constraintTop_toBottomOf=
"@+id/home_magisk_wrapper"
/>
<com.google.android.material.card.MaterialCardView
...
...
@@ -106,7 +112,7 @@
android:orientation=
"vertical"
android:paddingTop=
"@dimen/l1"
>
<
androidx.appcompat.widget.AppCompat
TextView
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
...
...
@@ -114,7 +120,7 @@
android:text=
"@string/home_support_title"
android:textAppearance=
"@style/AppearanceFoundation.Title"
/>
<
androidx.appcompat.widget.AppCompat
TextView
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
...
...
@@ -132,7 +138,7 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
android:clipToPadding=
"false"
android:nestedScrollingEnabled=
"
@{false}
"
android:nestedScrollingEnabled=
"
false
"
android:orientation=
"horizontal"
android:overScrollMode=
"ifContentScrolls"
android:paddingStart=
"@dimen/l1"
...
...
app/src/main/res/layout/include_home_device.xml
View file @
ffa85a61
...
...
@@ -21,21 +21,29 @@
</data>
<com.google.android.material.card.MaterialCardView
style=
"@style/WidgetFoundation.Card"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingTop=
"@dimen/l_50"
android:paddingStart=
"@dimen/l1"
android:paddingEnd=
"@dimen/l1"
android:paddingBottom=
"@dimen/l1"
tools:layout_gravity=
"center"
>
<androidx.appcompat.widget.AppCompat
ImageView
<
ImageView
android:id=
"@+id/home_device_icon"
style=
"@style/WidgetFoundation.Icon.Primary"
android:layout_marginStart=
"@dimen/l1"
android:padding=
"@dimen/l_50"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_device"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
android:id=
"@+id/home_device_title"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -46,7 +54,7 @@
app:layout_constraintBottom_toBottomOf=
"@+id/home_device_icon"
app:layout_constraintEnd_toStartOf=
"@+id/home_device_action_reboot"
app:layout_constraintStart_toEndOf=
"@+id/home_device_icon"
app:layout_constraintTop_toTopOf=
"parent
"
/>
app:layout_constraintTop_toTopOf=
"@+id/home_device_icon
"
/>
<com.google.android.material.button.MaterialButton
android:id=
"@+id/home_device_action_reboot"
...
...
@@ -56,7 +64,6 @@
popupMenuOnClickListener=
"@{RebootEvent::reboot}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/l_50"
android:text=
"@string/reboot"
android:textAllCaps=
"false"
app:icon=
"@drawable/ic_restart"
...
...
@@ -75,9 +82,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:fadingEdgeLength=
"@dimen/l1"
android:paddingStart=
"@dimen/l1"
android:paddingTop=
"@dimen/l_50"
android:paddingEnd=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
android:scrollbars=
"none"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_title_barrier"
>
...
...
@@ -96,31 +101,24 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/home_device_info_title"
style=
"@style/W.Home.Title"
android:text=
"@string/info"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<View
style=
"@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_info_title
"
/>
app:layout_constraintTop_toTopOf=
"parent
"
/>
<LinearLayout
android:id=
"@+id/home_device_info_manufacturer"
style=
"@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_info_title
"
>
app:layout_constraintTop_toTopOf=
"parent
"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/home_device_extra_manufacturer"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Build.MANUFACTURER}"
tools:text=
"Google"
/>
...
...
@@ -133,11 +131,11 @@
app:layout_constraintStart_toStartOf=
"@+id/home_device_info_manufacturer"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_info_manufacturer"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/home_device_extra_model"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Build.DEVICE ?? Build.PRODUCT}"
tools:text=
"Pixel 4"
/>
...
...
@@ -150,11 +148,11 @@
app:layout_constraintStart_toStartOf=
"@+id/home_device_info_product"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_info_product"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/home_device_extra_board"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Build.BOARD}"
tools:text=
"flame"
/>
...
...
@@ -167,11 +165,11 @@
app:layout_constraintStart_toStartOf=
"@+id/home_device_info_board"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_info_board"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/home_device_system"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Build.VERSION.RELEASE}"
tools:text=
"10"
/>
...
...
@@ -191,31 +189,24 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/home_device_details_title"
style=
"@style/W.Home.Title"
android:text=
"@string/details"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<View
style=
"@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_details_title"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<LinearLayout
android:id=
"@+id/home_device_details_ab"
style=
"@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_details_title
"
>
app:layout_constraintTop_toTopOf=
"parent
"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"A/B"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Info.isAB ? @string/yes : @string/no}"
tools:text=
"Yes"
/>
...
...
@@ -228,11 +219,11 @@
app:layout_constraintStart_toStartOf=
"@+id/home_device_details_ab"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_details_ab"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"SAR"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Info.isSAR ? @string/yes : @string/no}"
tools:text=
"Yes"
/>
...
...
@@ -245,11 +236,11 @@
app:layout_constraintStart_toStartOf=
"@+id/home_device_details_sar"
app:layout_constraintTop_toBottomOf=
"@+id/home_device_details_sar"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"Ramdisk"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Info.ramdisk ? @string/yes : @string/no }"
tools:text=
"Yes"
/>
...
...
@@ -266,4 +257,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout>
app/src/main/res/layout/include_home_magisk.xml
View file @
ffa85a61
...
...
@@ -17,21 +17,29 @@
</data>
<com.google.android.material.card.MaterialCardView
style=
"@style/WidgetFoundation.Card"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingTop=
"@dimen/l_50"
android:paddingStart=
"@dimen/l1"
android:paddingEnd=
"@dimen/l1"
android:paddingBottom=
"@dimen/l1"
tools:layout_gravity=
"center"
>
<androidx.appcompat.widget.AppCompat
ImageView
<
ImageView
android:id=
"@+id/home_magisk_icon"
style=
"@style/WidgetFoundation.Icon.Primary"
android:layout_marginStart=
"@dimen/l1"
android:padding=
"@dimen/l_25"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_magisk
"
/>
app:srcCompat=
"@drawable/ic_magisk_outline
"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
android:id=
"@+id/home_magisk_title"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -40,10 +48,21 @@
android:textAppearance=
"@style/AppearanceFoundation.Title"
android:textColor=
"?colorPrimary"
app:layout_constraintBottom_toBottomOf=
"@+id/home_magisk_icon"
app:layout_constraintEnd_toStartOf=
"@+id/home_magisk_action"
app:layout_constraintHorizontal_bias=
"0.0"
app:layout_constraintEnd_toStartOf=
"@+id/home_magisk_uninstall"
app:layout_constraintStart_toEndOf=
"@+id/home_magisk_icon"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"@+id/home_magisk_icon"
/>
<ImageView
android:id=
"@+id/home_magisk_uninstall"
style=
"@style/WidgetFoundation.Icon.Error"
android:background=
"?attr/selectableItemBackground"
android:clickable=
"true"
gone=
"@{Info.env.magiskVersionCode < 0 || viewModel.stateMagisk == MagiskState.LOADING || !viewModel.isConnected}"
android:onClick=
"@{() -> viewModel.onDeletePressed()}"
app:layout_constraintBottom_toBottomOf=
"@+id/home_magisk_title"
app:layout_constraintEnd_toStartOf=
"@+id/home_magisk_action"
app:layout_constraintTop_toTopOf=
"@+id/home_magisk_title"
app:srcCompat=
"@drawable/ic_delete_md2"
/>
<FrameLayout
android:id=
"@+id/home_magisk_action"
...
...
@@ -60,7 +79,6 @@
isEnabled=
"@{viewModel.stateManager == MagiskState.UP_TO_DATE && (viewModel.stateMagiskProgress == 0 || viewModel.stateMagiskProgress == 100)}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/l_50"
android:onClick=
"@{() -> viewModel.onMagiskPressed()}"
android:text=
"@string/update"
android:textAllCaps=
"false"
...
...
@@ -72,7 +90,6 @@
isEnabled=
"@{viewModel.stateManager == MagiskState.UP_TO_DATE && (viewModel.stateMagiskProgress == 0 || viewModel.stateMagiskProgress == 100)}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/l_50"
android:onClick=
"@{() -> viewModel.onMagiskPressed()}"
android:text=
"@string/install"
android:textAllCaps=
"false"
...
...
@@ -91,9 +108,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:fadingEdgeLength=
"@dimen/l1"
android:paddingStart=
"@dimen/l1"
android:paddingTop=
"@dimen/l_50"
android:paddingEnd=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
android:scrollbars=
"none"
app:layout_constraintTop_toBottomOf=
"@+id/home_magisk_title_barrier"
>
...
...
@@ -112,31 +127,24 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/home_magisk_info_title"
style=
"@style/W.Home.Title"
android:text=
"@string/info"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<View
style=
"@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/home_magisk_info_title
"
/>
app:layout_constraintTop_toTopOf=
"parent
"
/>
<LinearLayout
android:id=
"@+id/home_magisk_latest_version"
style=
"@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/home_magisk_info_title
"
>
app:layout_constraintTop_toTopOf=
"parent
"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/module_section_remote"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{viewModel.isConnected ? viewModel.stateMagiskRemoteVersion : @string/not_available}"
tools:text=
"20.1 (12345)"
/>
...
...
@@ -149,11 +157,11 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_magisk_latest_version"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/installed"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Info.env.isActive ? viewModel.stateMagiskInstalledVersion : @string/not_available}"
tools:text=
"20.1 (12345)"
/>
...
...
@@ -166,11 +174,11 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_magisk_installed_version"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/status"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{Info.env.isActive ? viewModel.stateMagiskMode : @string/not_available}"
tools:text=
"Normal"
/>
...
...
@@ -189,58 +197,12 @@
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
style=
"@style/W.Home.Card"
gone=
"@{Info.env.magiskVersionCode < 0}"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:clickable=
"true"
android:onClick=
"@{() -> viewModel.onDeletePressed()}"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
>
<View
android:id=
"@+id/view"
style=
"@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_magisk_delete"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/home_magisk_delete"
style=
"@style/W.Home.Title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"@string/uninstall"
android:textColor=
"?colorError"
android:textStyle=
"bold"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.appcompat.widget.AppCompatImageView
style=
"@style/WidgetFoundation.Icon.Error"
android:background=
"@null"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_magisk_delete"
app:srcCompat=
"@drawable/ic_delete_md2"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
</HorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout>
app/src/main/res/layout/include_home_manager.xml
View file @
ffa85a61
...
...
@@ -17,21 +17,29 @@
</data>
<com.google.android.material.card.MaterialCardView
style=
"@style/WidgetFoundation.Card"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingTop=
"@dimen/l_50"
android:paddingStart=
"@dimen/l1"
android:paddingEnd=
"@dimen/l1"
android:paddingBottom=
"@dimen/l1"
tools:layout_gravity=
"center"
>
<androidx.appcompat.widget.AppCompat
ImageView
<
ImageView
android:id=
"@+id/home_manager_icon"
style=
"@style/WidgetFoundation.Icon.Primary"
android:layout_marginStart=
"@dimen/l1"
android:padding=
"@dimen/l_50"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_manager"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
android:id=
"@+id/home_manager_title"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +67,6 @@
gone=
"@{viewModel.stateManager != MagiskState.OBSOLETE}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/l_50"
android:onClick=
"@{() -> viewModel.onManagerPressed()}"
android:text=
"@string/update"
android:textAllCaps=
"false"
...
...
@@ -70,7 +77,6 @@
gone=
"@{viewModel.stateManager == MagiskState.OBSOLETE}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/l_50"
android:onClick=
"@{() -> viewModel.onManagerPressed()}"
android:text=
"@string/install"
android:textAllCaps=
"false"
...
...
@@ -89,9 +95,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:fadingEdgeLength=
"@dimen/l1"
android:paddingStart=
"@dimen/l1"
android:paddingTop=
"@dimen/l_50"
android:paddingEnd=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
android:scrollbars=
"none"
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_title_barrier"
>
...
...
@@ -110,31 +114,24 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/home_manager_info_title"
style=
"@style/W.Home.Title"
android:text=
"@string/info"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<View
style=
"@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_info_title
"
/>
app:layout_constraintTop_toTopOf=
"parent
"
/>
<LinearLayout
android:id=
"@+id/home_manager_latest_version"
style=
"@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_info_title"
>
app:layout_constraintTop_toTopOf=
"parent"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/module_section_remote"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{viewModel.isConnected ? viewModel.stateManagerRemoteVersion : @string/not_available}"
tools:text=
"8.0.0 (123) (10)"
/>
...
...
@@ -143,67 +140,32 @@
<LinearLayout
android:id=
"@+id/home_manager_installed_version"
style=
"@style/W.Home.Item.Botto
m"
style=
"@style/W.Home.Ite
m"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_latest_version"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/installed"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{viewModel.stateManagerInstalledVersion}"
tools:text=
"8.0.0 (123) (10)"
/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<ProgressBar
style=
"@style/WidgetFoundation.ProgressBar"
gone=
"@{viewModel.stateManagerProgress == 0 || viewModel.stateManagerProgress == 100}"
android:layout_width=
"match_parent"
android:layout_gravity=
"bottom"
android:max=
"100"
android:progress=
"@{viewModel.stateManagerProgress}"
/>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
style=
"@style/W.Home.Card"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/home_manager_details_title"
style=
"@style/W.Home.Title"
android:text=
"@string/details"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<View
style=
"@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_details_title"
/>
<LinearLayout
android:id=
"@+id/home_manager_internal_mode"
style=
"@style/W.Home.Item.Top
"
style=
"@style/W.Home.Item
"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_details_title
"
>
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_installed_version
"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/status"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{InfoKt.isRunningAsStub ? @string/home_status_stub : @string/home_status_normal}"
tools:text=
"Normal"
/>
...
...
@@ -216,11 +178,11 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_internal_mode"
>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
style=
"@style/W.Home.ItemContent"
android:text=
"@string/home_package"
/>
<androidx.appcompat.widget.AppCompat
TextView
<
TextView
android:id=
"@+id/home_manager_extra_connection_value"
style=
"@style/W.Home.ItemContent.Right"
android:text=
"@{viewModel.statePackageName}"
...
...
@@ -230,6 +192,14 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<ProgressBar
style=
"@style/WidgetFoundation.ProgressBar"
gone=
"@{viewModel.stateManagerProgress == 0 || viewModel.stateManagerProgress == 100}"
android:layout_width=
"match_parent"
android:layout_gravity=
"bottom"
android:max=
"100"
android:progress=
"@{viewModel.stateManagerProgress}"
/>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
...
...
@@ -238,4 +208,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment