Skip to content

Commit a2ecea9

Browse files
WSTxdaWSTxda
committed
Redesign AboutLibraries layout view
1 parent e34f5e4 commit a2ecea9

File tree

3 files changed

+130
-1
lines changed

3 files changed

+130
-1
lines changed

‎app/src/main/java/com/wstxda/gsl/activity/LibraryActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class LibraryActivity : BaseActivity() {
2020
binding.collapsingToolbar.title = getString(R.string.pref_used_library_summary)
2121

2222
if (savedInstanceState == null) {
23-
val fragment = LibsBuilder().withVersionShown(false).supportFragment()
23+
val fragment = LibsBuilder().supportFragment()
2424
supportFragmentManager.beginTransaction()
2525
.replace(binding.libraryFragmentContainer.id, fragment).commit()
2626
}

‎app/src/main/res/layout/listitem_opensource.xml‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:app="http://schemas.android.com/apk/res-auto"
3+
android:layout_width="fill_parent"
4+
android:layout_height="wrap_content"
5+
android:layout_marginStart="17dp"
6+
android:layout_marginTop="12dp"
7+
app:strokeWidth="0dp"
8+
app:cardCornerRadius="16dp"
9+
android:backgroundTint="?colorSurfaceContainerLow"
10+
app:cardBackgroundColor="?colorSurfaceContainerLow"
11+
android:layout_marginEnd="17dp"
12+
android:clickable="true"
13+
android:focusable="true">
14+
15+
<androidx.constraintlayout.widget.ConstraintLayout
16+
android:id="@id/content"
17+
android:layout_width="fill_parent"
18+
android:layout_height="wrap_content"
19+
android:padding="16dp"
20+
android:layout_marginBottom="16dp"
21+
android:orientation="vertical">
22+
23+
<TextView
24+
android:id="@id/libraryName"
25+
android:layout_width="0dp"
26+
android:layout_height="wrap_content"
27+
android:ellipsize="end"
28+
android:maxLines="2"
29+
android:layout_marginEnd="8dp"
30+
android:textAppearance="?attr/textAppearanceTitleMedium"
31+
app:layout_constraintBottom_toTopOf="@id/libraryCreator"
32+
app:layout_constraintEnd_toStartOf="@id/libraryVersion"
33+
app:layout_constraintHorizontal_weight="1"
34+
app:layout_constraintStart_toStartOf="parent"
35+
app:layout_constraintTop_toTopOf="parent" />
36+
37+
<TextView
38+
android:id="@id/libraryCreator"
39+
android:layout_width="0dp"
40+
android:layout_height="wrap_content"
41+
android:ellipsize="end"
42+
android:layout_marginEnd="8dp"
43+
android:maxLines="2"
44+
android:textAppearance="?attr/textAppearanceBodySmall"
45+
app:layout_constraintBottom_toTopOf="@id/libraryDescriptionDivider"
46+
app:layout_constraintEnd_toStartOf="@id/libraryVersion"
47+
app:layout_constraintStart_toStartOf="parent"
48+
app:layout_constraintTop_toBottomOf="@id/libraryName" />
49+
50+
51+
<com.google.android.material.chip.Chip
52+
android:id="@id/libraryVersion"
53+
android:layout_width="wrap_content"
54+
android:layout_height="wrap_content"
55+
android:layout_marginTop="10dp"
56+
android:backgroundTint="?attr/colorSurfaceContainerHigh"
57+
android:clickable="false"
58+
android:textSize="12sp"
59+
app:chipEndPadding="0dp"
60+
app:chipMinHeight="24dp"
61+
app:chipStartPadding="0dp"
62+
app:chipStrokeWidth="0dp"
63+
app:layout_constraintBottom_toBottomOf="@id/libraryName"
64+
app:layout_constraintEnd_toEndOf="parent"
65+
app:layout_constraintTop_toTopOf="@id/libraryName" />
66+
67+
68+
<View
69+
android:id="@id/libraryDescriptionDivider"
70+
android:layout_width="0dp"
71+
android:layout_height="0dp"
72+
app:layout_constraintBottom_toTopOf="@id/libraryDescription"
73+
app:layout_constraintEnd_toEndOf="parent"
74+
app:layout_constraintStart_toStartOf="parent"
75+
app:layout_constraintTop_toBottomOf="@id/libraryCreator" />
76+
77+
<TextView
78+
android:id="@id/libraryDescription"
79+
android:layout_width="0dp"
80+
android:layout_height="wrap_content"
81+
android:layout_marginTop="8dp"
82+
android:layout_marginBottom="8dp"
83+
android:maxLines="20"
84+
android:textAppearance="?textAppearanceBodyMedium"
85+
app:layout_constraintBottom_toTopOf="@id/libraryBottomDivider"
86+
app:layout_constraintEnd_toEndOf="parent"
87+
app:layout_constraintStart_toStartOf="parent"
88+
app:layout_constraintTop_toBottomOf="@id/libraryDescriptionDivider" />
89+
90+
<com.google.android.material.divider.MaterialDivider
91+
android:id="@+id/libraryBottomDivider"
92+
android:layout_width="wrap_content"
93+
app:dividerColor="?colorSurfaceContainerHighest"
94+
android:layout_height="wrap_content"
95+
style="@style/Widget.Material3.MaterialDivider"
96+
android:layout_marginTop="@dimen/aboutLibraries_card_divider_padding"
97+
android:layout_marginBottom="@dimen/aboutLibraries_card_divider_padding"
98+
app:layout_constraintTop_toBottomOf="@id/libraryDescription"
99+
app:layout_constraintBottom_toTopOf="@id/libraryLicense"
100+
app:layout_constraintStart_toStartOf="parent"
101+
app:layout_constraintEnd_toEndOf="parent" />
102+
103+
<com.google.android.material.button.MaterialButton
104+
android:id="@id/libraryLicense"
105+
style="@style/Widget.Material3Expressive.Button.TonalButton"
106+
android:layout_width="wrap_content"
107+
android:layout_height="wrap_content"
108+
android:layout_marginTop="16dp"
109+
app:icon="@drawable/ic_license"
110+
app:iconTint="?android:textColorSecondary"
111+
app:layout_constraintEnd_toEndOf="parent"
112+
app:layout_constraintTop_toBottomOf="@id/libraryBottomDivider" />
113+
</androidx.constraintlayout.widget.ConstraintLayout>
114+
</com.google.android.material.card.MaterialCardView>

‎app/src/main/res/layout/listloader_opensource.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:app="http://schemas.android.com/apk/res-auto"
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent">
5+
6+
<com.google.android.material.loadingindicator.LoadingIndicator
7+
android:id="@id/progressBar"
8+
style="@style/Widget.Material3.LoadingIndicator.Contained"
9+
android:layout_width="wrap_content"
10+
android:layout_height="wrap_content"
11+
android:layout_centerInParent="true"
12+
app:containerHeight="100dp"
13+
app:containerWidth="100dp"
14+
app:indicatorSize="80dp" />
15+
</RelativeLayout>

0 commit comments

Comments
 (0)