Skip to content

Commit a0e4205

Browse files
tibbitibbi
committed
misc fixes
1 parent 179763e commit a0e4205

File tree

11 files changed

+31
-70
lines changed

11 files changed

+31
-70
lines changed

‎app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.Manifest
44
import android.content.Intent
55
import android.content.pm.PackageManager
66
import android.os.Bundle
7+
import android.os.Handler
78
import android.os.Parcelable
89
import android.support.v4.app.ActivityCompat
910
import android.view.Menu
@@ -23,6 +24,7 @@ import com.simplemobiletools.filemanager.R
2324
import com.simplemobiletools.filemanager.SCROLL_STATE
2425
import com.simplemobiletools.filemanager.extensions.config
2526
import com.simplemobiletools.filemanager.fragments.ItemsFragment
27+
import kotlinx.android.synthetic.main.activity_main.*
2628
import java.io.File
2729
import java.util.*
2830

@@ -41,7 +43,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
4143
override fun onCreate(savedInstanceState: Bundle?) {
4244
super.onCreate(savedInstanceState)
4345
setContentView(R.layout.activity_main)
44-
//breadcrumbs.setListener(this)
46+
breadcrumbs.setListener(this)
4547
tryInitFileManager()
4648
storeStoragePaths()
4749
}
@@ -64,7 +66,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
6466
}
6567

6668
private fun openPath(path: String) {
67-
//breadcrumbs.setBreadcrumb(path)
69+
breadcrumbs.setBreadcrumb(path)
6870
val bundle = Bundle()
6971
bundle.putString(PATH, path)
7072

@@ -78,7 +80,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
7880

7981
latestFragment = ItemsFragment()
8082
latestFragment!!.arguments = bundle
81-
latestFragment!!.setListener(this)
83+
latestFragment!!.setListener(this@MainActivity)
8284
supportFragmentManager.beginTransaction().replace(R.id.fragment_holder, latestFragment).addToBackStack(path).commitAllowingStateLoss()
8385
}
8486

@@ -100,7 +102,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
100102
startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_MULTISELECT, BuildConfig.VERSION_NAME)
101103
}
102104

103-
/*override fun onBackPressed() {
105+
override fun onBackPressed() {
104106
if (breadcrumbs.childCount <= 1) {
105107
if (!mWasBackJustPressed) {
106108
mWasBackJustPressed = true
@@ -114,7 +116,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
114116
val item = breadcrumbs.lastItem
115117
openPath(item.path)
116118
}
117-
}*/
119+
}
118120

119121
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
120122
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
@@ -139,8 +141,8 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
139141
changePath(it)
140142
}
141143
} else {
142-
/*val item = breadcrumbs.getChildAt(id).tag as FileDirItem
143-
openPath(item.path)*/
144+
val item = breadcrumbs.getChildAt(id).tag as FileDirItem
145+
openPath(item.path)
144146
}
145147
}
146148

‎app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.simplemobiletools.commons.extensions.formatSize
1717
import com.simplemobiletools.commons.extensions.isGif
1818
import com.simplemobiletools.commons.extensions.toast
1919
import com.simplemobiletools.commons.models.FileDirItem
20-
import com.simplemobiletools.filemanager.Config
2120
import com.simplemobiletools.filemanager.R
2221
import com.simplemobiletools.filemanager.activities.SimpleActivity
2322
import com.simplemobiletools.filemanager.dialogs.CopyDialog
@@ -51,29 +50,15 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: List<FileDirItem>,
5150

5251
val multiSelectorMode = object : ModalMultiSelectorCallback(multiSelector) {
5352
override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
54-
return when (item.itemId) {
55-
R.id.cab_rename -> {
56-
displayRenameDialog()
57-
true
58-
}
59-
R.id.cab_properties -> {
60-
showProperties()
61-
true
62-
}
63-
R.id.cab_share -> {
64-
shareFiles()
65-
true
66-
}
67-
R.id.cab_copy_move -> {
68-
displayCopyDialog()
69-
true
70-
}
71-
R.id.cab_delete -> {
72-
askConfirmDelete()
73-
true
74-
}
75-
else -> false
53+
when (item.itemId) {
54+
R.id.cab_rename -> displayRenameDialog()
55+
R.id.cab_properties -> showProperties()
56+
R.id.cab_share -> shareFiles()
57+
R.id.cab_copy_move -> displayCopyDialog()
58+
R.id.cab_delete -> askConfirmDelete()
59+
else -> return false
7660
}
61+
return true
7762
}
7863

7964
override fun onCreateActionMode(actionMode: ActionMode?, menu: Menu?): Boolean {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import com.simplemobiletools.commons.extensions.*
77
import com.simplemobiletools.filemanager.R
88
import com.simplemobiletools.filemanager.activities.SimpleActivity
99
import com.simplemobiletools.filemanager.extensions.config
10-
import kotlinx.android.synthetic.main.copy_item.view.*
10+
import kotlinx.android.synthetic.main.dialog_copy_item.view.*
1111
import java.io.File
1212
import java.util.*
1313

1414
class CopyDialog(val activity: SimpleActivity, val files: ArrayList<File>, val copyMoveListener: CopyMoveTask.CopyMoveListener) {
1515

1616
init {
1717
val context = activity
18-
val view = activity.layoutInflater.inflate(R.layout.copy_item, null)
18+
val view = activity.layoutInflater.inflate(R.layout.dialog_copy_item, null)
1919
val sourcePath = files[0].parent.trimEnd('/')
2020
var destinationPath = ""
2121
view.source.text = "${context.humanizePath(sourcePath)}/"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import android.view.WindowManager
77
import com.simplemobiletools.commons.extensions.*
88
import com.simplemobiletools.filemanager.R
99
import com.simplemobiletools.filemanager.extensions.config
10-
import kotlinx.android.synthetic.main.create_new.view.*
10+
import kotlinx.android.synthetic.main.dialog_create_new.view.*
1111
import java.io.File
1212
import java.io.IOException
1313

1414
class CreateNewItemDialog(val activity: Activity, val path: String, val callback: () -> Unit) {
1515
init {
16-
val view = activity.layoutInflater.inflate(R.layout.create_new, null)
16+
val view = activity.layoutInflater.inflate(R.layout.dialog_create_new, null)
1717

1818
AlertDialog.Builder(activity)
1919
.setPositiveButton(R.string.ok, null)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import com.simplemobiletools.commons.extensions.*
77
import com.simplemobiletools.commons.models.FileDirItem
88
import com.simplemobiletools.filemanager.R
99
import com.simplemobiletools.filemanager.extensions.config
10-
import kotlinx.android.synthetic.main.rename_item.view.*
10+
import kotlinx.android.synthetic.main.dialog_rename_item.view.*
1111
import java.io.File
1212

1313
class RenameItemDialog(val activity: Activity, val item: FileDirItem, val callback: () -> Unit) {
1414

1515
init {
16-
val view = activity.layoutInflater.inflate(R.layout.rename_item, null)
16+
val view = activity.layoutInflater.inflate(R.layout.dialog_rename_item, null)
1717
view.item_name.setText(item.name)
1818

1919
val path = File(item.path).parent

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

app/src/main/res/layout/copy_item.xml renamed to app/src/main/res/layout/dialog_copy_item.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
android:paddingRight="@dimen/activity_margin"
1010
android:paddingTop="@dimen/activity_margin">
1111

12-
<TextView
12+
<com.simplemobiletools.commons.views.MyTextView
1313
android:id="@+id/source_label"
1414
android:layout_width="wrap_content"
1515
android:layout_height="wrap_content"
1616
android:text="@string/source"
1717
android:textSize="@dimen/smaller_text_size"/>
1818

19-
<TextView
19+
<com.simplemobiletools.commons.views.MyTextView
2020
android:id="@+id/source"
2121
android:layout_width="match_parent"
2222
android:layout_height="wrap_content"
@@ -26,14 +26,14 @@
2626
android:paddingTop="@dimen/small_margin"
2727
android:text="source"/>
2828

29-
<TextView
29+
<com.simplemobiletools.commons.views.MyTextView
3030
android:id="@+id/destination_label"
3131
android:layout_width="wrap_content"
3232
android:layout_height="wrap_content"
3333
android:text="@string/destination"
3434
android:textSize="@dimen/smaller_text_size"/>
3535

36-
<TextView
36+
<com.simplemobiletools.commons.views.MyTextView
3737
android:id="@+id/destination"
3838
android:layout_width="match_parent"
3939
android:layout_height="wrap_content"
@@ -50,14 +50,14 @@
5050
android:layout_height="wrap_content"
5151
android:checkedButton="@+id/dialog_radio_copy">
5252

53-
<RadioButton
53+
<com.simplemobiletools.commons.views.MyCompatRadioButton
5454
android:id="@+id/dialog_radio_copy"
5555
android:layout_width="match_parent"
5656
android:layout_height="wrap_content"
5757
android:layout_marginBottom="@dimen/medium_margin"
5858
android:text="@string/copy"/>
5959

60-
<RadioButton
60+
<com.simplemobiletools.commons.views.MyCompatRadioButton
6161
android:id="@+id/dialog_radio_move"
6262
android:layout_width="match_parent"
6363
android:layout_height="wrap_content"

app/src/main/res/layout/create_new.xml renamed to app/src/main/res/layout/dialog_create_new.xml

File renamed without changes.

app/src/main/res/layout/rename_item.xml renamed to app/src/main/res/layout/dialog_rename_item.xml

File renamed without changes.

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)