Skip to content

Commit aeddb15

Browse files
author
tanpengcheng
committed
[feat] add modify dir ui.
1 parent 2110c6a commit aeddb15

File tree

8 files changed

+87
-3
lines changed

8 files changed

+87
-3
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ dependencies {
9999
kapt 'androidx.lifecycle:lifecycle-compiler:2.6.1'
100100

101101
// CameraX
102-
def camerax_version = "1.2.2"
102+
def camerax_version = "1.2.3"
103103
implementation "androidx.camera:camera-core:${camerax_version}"
104104
implementation "androidx.camera:camera-camera2:${camerax_version}"
105105
implementation "androidx.camera:camera-lifecycle:${camerax_version}"

‎app/src/main/java/com/tans/tfiletransporter/ui/activity/commomdialog/SettingsDialog.kt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.tans.tfiletransporter.ui.activity.commomdialog
22

33
import android.app.Activity
4+
import com.jakewharton.rxbinding4.view.clicks
45
import com.jakewharton.rxbinding4.widget.checkedChanges
56
import com.jakewharton.rxbinding4.widget.userChanges
67
import com.tans.tfiletransporter.R
@@ -26,6 +27,18 @@ class SettingsDialog(context: Activity) : BaseCustomDialog<SettingsDialogBinding
2627
binding.maxConnectionTv.text = connection.toString()
2728
}
2829

30+
binding.downloadDirEditIv.clicks()
31+
.doOnNext {
32+
// TODO:
33+
}
34+
.bindLife()
35+
36+
binding.downloadDirResetIv.clicks()
37+
.doOnNext {
38+
// TODO:
39+
}
40+
.bindLife()
41+
2942
binding.shareMyDirSt.checkedChanges()
3043
.skipInitialValue()
3144
.switchMapSingle {

‎app/src/main/res/drawable/default_click_ripple_bg.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ripple
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:color="#99999999">
5+
<item>
6+
<shape android:shape="rectangle">
7+
<solid android:color="@android:color/white" />
8+
<corners android:radius="2dp" />
9+
</shape>
10+
</item>
11+
</ripple>

‎app/src/main/res/drawable/ic_create_folder.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:fillColor="@android:color/white"
8+
android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18L4,6h5.17l2,2L20,8v10zM12,14h2v2h2v-2h2v-2h-2v-2h-2v2h-2z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_done.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:fillColor="@color/black_1"
8+
android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_edit.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector
2+
xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:width="48dp"
4+
android:height="48dp"
5+
android:viewportWidth="960"
6+
android:viewportHeight="960">
7+
<path
8+
android:fillColor="#FF03DAC5"
9+
android:pathData="M180,780L224,780L667,337L623,293L180,736L180,780ZM794,294L666,166L708,124Q725,107 750,107Q775,107 792,124L836,168Q853,185 853,210Q853,235 836,252L794,294ZM752,336L248,840L120,840L120,712L624,208L752,336ZM645,315L623,293L623,293L667,337L667,337L645,315Z"/>
10+
</vector>

‎app/src/main/res/drawable/ic_reset.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="48dp"
3+
android:height="48dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960">
6+
<path
7+
android:fillColor="#FF03DAC5"
8+
android:pathData="M477,840Q328,840 224,734.5Q120,629 120,479L180,479Q180,604 266,692Q352,780 477,780Q604,780 692,691Q780,602 780,475Q780,351 691,265.5Q602,180 477,180Q409,180 349.5,211Q290,242 246,293L351,293L351,353L142,353L142,145L202,145L202,251Q254,190 325.5,155Q397,120 477,120Q552,120 618,148Q684,176 733.5,224.5Q783,273 811.5,338Q840,403 840,478Q840,553 811.5,619Q783,685 733.5,734Q684,783 618,811.5Q552,840 477,840ZM605,643L451,491L451,277L511,277L511,466L648,600L605,643Z"/>
9+
</vector>

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,29 @@
5454
app:layout_constraintTop_toBottomOf="@id/download_dir_title_tv"
5555
app:layout_constraintEnd_toEndOf="parent"/>
5656

57+
58+
<ImageView
59+
android:id="@+id/download_dir_edit_iv"
60+
android:layout_width="30dp"
61+
android:layout_height="30dp"
62+
android:layout_marginStart="?attr/dialogPreferredPadding"
63+
android:padding="4dp"
64+
android:background="@drawable/default_click_ripple_bg"
65+
android:src="@drawable/ic_edit"
66+
app:layout_constraintStart_toStartOf="parent"
67+
app:layout_constraintTop_toBottomOf="@id/download_dir_tv"/>
68+
69+
<ImageView
70+
android:id="@+id/download_dir_reset_iv"
71+
android:layout_width="30dp"
72+
android:layout_height="30dp"
73+
android:src="@drawable/ic_reset"
74+
android:layout_marginStart="12dp"
75+
android:background="@drawable/default_click_ripple_bg"
76+
android:padding="4dp"
77+
app:layout_constraintTop_toBottomOf="@id/download_dir_tv"
78+
app:layout_constraintStart_toEndOf="@id/download_dir_edit_iv"/>
79+
5780
<TextView
5881
android:id="@+id/share_dir_title_tv"
5982
android:layout_width="0dp"
@@ -63,10 +86,10 @@
6386
android:textStyle="bold"
6487
android:layout_marginStart="?attr/dialogPreferredPadding"
6588
android:layout_marginEnd="?attr/dialogPreferredPadding"
66-
android:layout_marginTop="12dp"
89+
android:layout_marginTop="10dp"
6790
android:text="@string/setting_share_my_dir"
6891
app:layout_constraintStart_toStartOf="parent"
69-
app:layout_constraintTop_toBottomOf="@id/download_dir_tv"
92+
app:layout_constraintTop_toBottomOf="@id/download_dir_edit_iv"
7093
app:layout_constraintEnd_toEndOf="parent" />
7194

7295
<androidx.appcompat.widget.SwitchCompat

0 commit comments

Comments
 (0)