Skip to content

Commit f7f444b

Browse files
authored
File meta data list UI enhanced
file meta data list UI enhanced
2 parents cc4867d + d318ccf commit f7f444b

File tree

4 files changed

+60
-3
lines changed

4 files changed

+60
-3
lines changed

app/src/main/java/com/github/code/gambit/ui/activity/main/FileMetaDataAdapter.kt

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.code.gambit.ui.activity.main
22

33
import android.content.Context
4+
import android.content.res.ColorStateList
45
import android.view.View
56
import androidx.work.WorkInfo
67
import com.github.code.gambit.R
@@ -27,7 +28,31 @@ class FileMetaDataAdapter(val context: Context) :
2728
) {
2829
binding.fileName.text = item.fileMetaData.name
2930
binding.fileSize.text = item.fileMetaData.size.byteToMb()
30-
binding.filePath.text = item.state.toString()
31+
binding.filePath.text = item.fileMetaData.path
32+
binding.status.text = item.state.toString()
33+
when (item.state) {
34+
WorkInfo.State.ENQUEUED -> {
35+
binding.linearProgress.show()
36+
}
37+
WorkInfo.State.RUNNING -> {
38+
binding.linearProgress.show()
39+
}
40+
WorkInfo.State.SUCCEEDED -> {
41+
binding.linearProgress.hide()
42+
binding.status.chipBackgroundColor = ColorStateList.valueOf(context.getColor(android.R.color.holo_green_light))
43+
}
44+
WorkInfo.State.FAILED -> {
45+
binding.linearProgress.hide()
46+
binding.status.chipBackgroundColor = ColorStateList.valueOf(context.getColor(android.R.color.holo_red_light))
47+
}
48+
WorkInfo.State.BLOCKED -> {
49+
binding.linearProgress.hide()
50+
}
51+
WorkInfo.State.CANCELLED -> {
52+
binding.linearProgress.hide()
53+
binding.status.chipBackgroundColor = ColorStateList.valueOf(context.getColor(android.R.color.holo_red_light))
54+
}
55+
}
3156
}
3257

3358
override fun onItemClick(

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
tools:listitem="@layout/file_meta_data_list_item"
153153
android:paddingTop="32dp"
154154
android:scaleX="1.1"
155-
android:scaleY="1.1"/>
155+
android:scaleY="1.1"
156+
android:visibility="invisible"/>
156157

157158
</androidx.constraintlayout.motion.widget.MotionLayout>

app/src/main/res/layout/file_meta_data_list_item.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,24 @@
2222
android:layout_width="match_parent"
2323
android:layout_height="match_parent">
2424

25+
<com.google.android.material.chip.Chip
26+
android:id="@+id/status"
27+
android:layout_width="wrap_content"
28+
android:layout_height="wrap_content"
29+
android:layout_alignParentTop="true"
30+
android:layout_alignParentEnd="true"
31+
tools:text="ENQUEUE"
32+
android:lines="1"
33+
android:textColor="@color/raw_white"
34+
app:chipSurfaceColor="@color/secondary"
35+
android:textSize="12sp"
36+
android:textStyle="bold"
37+
android:layout_marginEnd="2dp"
38+
android:layout_marginStart="2dp"
39+
android:layout_marginTop="2dp"
40+
android:scaleX="0.5"
41+
android:scaleY="0.5"/>
42+
2543
<ImageView
2644
android:id="@+id/file_icon"
2745
android:layout_width="82dp"
@@ -35,6 +53,7 @@
3553
android:visibility="gone"/>
3654

3755
<LinearLayout
56+
android:id="@+id/text_container"
3857
android:layout_width="match_parent"
3958
android:layout_height="wrap_content"
4059
android:layout_centerVertical="true"
@@ -91,6 +110,17 @@
91110
android:textSize="18sp"
92111
android:text="@string/mb" />
93112

113+
<com.google.android.material.progressindicator.LinearProgressIndicator
114+
android:id="@+id/linear_progress"
115+
android:layout_width="match_parent"
116+
android:layout_height="wrap_content"
117+
android:indeterminate="true"
118+
app:indicatorColor="@color/secondary"
119+
android:layout_marginStart="32dp"
120+
android:layout_marginEnd="32dp"
121+
android:layout_marginTop="8dp"
122+
android:layout_below="@id/text_container"/>
123+
94124
</RelativeLayout>
95125

96126
</androidx.cardview.widget.CardView>

app/src/main/res/xml/activity_main_scene.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
android:layout_height="0dp"
6262
motion:layout_constraintBottom_toTopOf="@id/constraint_layout"
6363
motion:layout_constraintTop_toTopOf="parent"
64-
motion:layout_constraintStart_toStartOf="parent" />
64+
motion:layout_constraintStart_toStartOf="parent"
65+
android:visibility="visible" />
6566
<Constraint
6667
android:id="@+id/file_upload_container_root"
6768
motion:layout_constraintEnd_toEndOf="parent"

0 commit comments

Comments
 (0)