Skip to content

Commit e37bb09

Browse files
tibbitibbi
committed
use the new design for Save As dialog
1 parent 4baca37 commit e37bb09

3 files changed

Lines changed: 46 additions & 38 deletions

File tree

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ android {
6464
}
6565

6666
dependencies {
67-
implementation 'com.github.SimpleMobileTools:Simple-Commons:449b24c6a4'
67+
implementation 'com.github.SimpleMobileTools:Simple-Commons:3aade6f350'
6868
implementation 'com.github.tibbi:PdfViewPager:d2af24208d'
6969
implementation 'com.github.Stericson:RootTools:df729dcb13'
7070
implementation 'com.github.Stericson:RootShell:1.6'

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/SaveAsDialog.kt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class SaveAsDialog(
2020

2121
var realPath = path.getParentPath()
2222
val view = activity.layoutInflater.inflate(R.layout.dialog_save_as, null).apply {
23-
save_as_path.text = activity.humanizePath(realPath)
23+
folder_value.setText(activity.humanizePath(realPath))
2424

2525
val fullName = path.getFilenameFromPath()
2626
val dotAt = fullName.lastIndexOf(".")
@@ -29,18 +29,17 @@ class SaveAsDialog(
2929
if (dotAt > 0) {
3030
name = fullName.substring(0, dotAt)
3131
val extension = fullName.substring(dotAt + 1)
32-
save_as_extension.setText(extension)
32+
extension_value.setText(extension)
3333
}
3434

35-
save_as_name.setText(name)
35+
filename_value.setText(name)
3636

3737
if (hidePath) {
38-
save_as_path_label.beGone()
39-
save_as_path.beGone()
38+
folder_hint.beGone()
4039
} else {
41-
save_as_path.setOnClickListener {
40+
folder_value.setOnClickListener {
4241
FilePickerDialog(activity, realPath, false, false, true, true, showFavoritesButton = true) {
43-
save_as_path.text = activity.humanizePath(it)
42+
folder_value.setText(activity.humanizePath(it))
4443
realPath = it
4544
}
4645
}
@@ -52,10 +51,10 @@ class SaveAsDialog(
5251
.setNegativeButton(R.string.cancel, null)
5352
.apply {
5453
activity.setupDialogStuff(view, this, R.string.save_as) { alertDialog ->
55-
alertDialog.showKeyboard(view.save_as_name)
54+
alertDialog.showKeyboard(view.filename_value)
5655
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
57-
val filename = view.save_as_name.value
58-
val extension = view.save_as_extension.value
56+
val filename = view.filename_value.value
57+
val extension = view.extension_value.value
5958

6059
if (filename.isEmpty()) {
6160
activity.toast(R.string.filename_cannot_be_empty)

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

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,52 @@
66
android:orientation="vertical"
77
android:padding="@dimen/activity_margin">
88

9-
<com.simplemobiletools.commons.views.MyTextView
10-
android:id="@+id/save_as_path_label"
11-
android:layout_width="wrap_content"
12-
android:layout_height="wrap_content"
13-
android:text="@string/path"
14-
android:textSize="@dimen/smaller_text_size" />
15-
16-
<com.simplemobiletools.commons.views.MyTextView
17-
android:id="@+id/save_as_path"
9+
<com.simplemobiletools.commons.views.MyTextInputLayout
10+
android:id="@+id/folder_hint"
1811
android:layout_width="match_parent"
1912
android:layout_height="wrap_content"
2013
android:layout_marginBottom="@dimen/activity_margin"
21-
android:paddingTop="@dimen/small_margin"
22-
android:paddingEnd="@dimen/small_margin" />
14+
android:hint="@string/path">
15+
16+
<com.google.android.material.textfield.TextInputEditText
17+
android:id="@+id/folder_value"
18+
style="@style/UnclickableEditText"
19+
android:layout_width="match_parent"
20+
android:layout_height="wrap_content" />
21+
22+
</com.simplemobiletools.commons.views.MyTextInputLayout>
2323

24-
<com.simplemobiletools.commons.views.MyEditText
25-
android:id="@+id/save_as_name"
24+
<com.simplemobiletools.commons.views.MyTextInputLayout
25+
android:id="@+id/filename_hint"
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
2828
android:layout_marginBottom="@dimen/activity_margin"
29-
android:singleLine="true"
30-
android:textCursorDrawable="@null"
31-
android:textSize="@dimen/normal_text_size" />
29+
android:hint="@string/filename">
3230

33-
<com.simplemobiletools.commons.views.MyTextView
34-
android:id="@+id/save_as_extension_label"
35-
android:layout_width="wrap_content"
36-
android:layout_height="wrap_content"
37-
android:text="@string/extension" />
31+
<com.google.android.material.textfield.TextInputEditText
32+
android:id="@+id/filename_value"
33+
android:layout_width="match_parent"
34+
android:layout_height="wrap_content"
35+
android:inputType="textCapSentences"
36+
android:singleLine="true"
37+
android:textCursorDrawable="@null"
38+
android:textSize="@dimen/bigger_text_size" />
39+
40+
</com.simplemobiletools.commons.views.MyTextInputLayout>
3841

39-
<com.simplemobiletools.commons.views.MyEditText
40-
android:id="@+id/save_as_extension"
42+
<com.simplemobiletools.commons.views.MyTextInputLayout
43+
android:id="@+id/extension_hint"
4144
android:layout_width="match_parent"
4245
android:layout_height="wrap_content"
43-
android:layout_marginBottom="@dimen/activity_margin"
44-
android:singleLine="true"
45-
android:textCursorDrawable="@null"
46-
android:textSize="@dimen/normal_text_size" />
46+
android:hint="@string/extension">
47+
48+
<com.google.android.material.textfield.TextInputEditText
49+
android:id="@+id/extension_value"
50+
android:layout_width="match_parent"
51+
android:layout_height="wrap_content"
52+
android:singleLine="true"
53+
android:textCursorDrawable="@null"
54+
android:textSize="@dimen/bigger_text_size" />
4755

56+
</com.simplemobiletools.commons.views.MyTextInputLayout>
4857
</LinearLayout>

0 commit comments

Comments
 (0)