Skip to content

Commit bdfc472

Browse files
committed
convert Constants to kotlin
1 parent f2e1d55 commit bdfc472

File tree

5 files changed

+28
-29
lines changed

5 files changed

+28
-29
lines changed

app/src/main/java/com/simplemobiletools/filemanager/Constants.java

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

app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void onPause() {
107107
}
108108

109109
private void fillItems() {
110-
mPath = getArguments().getString(Constants.PATH);
110+
mPath = getArguments().getString(Constants.INSTANCE.getPATH());
111111
final List<FileDirItem> newItems = getItems(mPath);
112112
Collections.sort(newItems);
113113
if (mItems != null && newItems.toString().equals(mItems.toString())) {

app/src/main/kotlin/com/simplemobiletools/filemanager/Config.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ class Config(context: Context) {
1313
}
1414

1515
init {
16-
mPrefs = context.getSharedPreferences(Constants.PREFS_KEY, Context.MODE_PRIVATE)
16+
mPrefs = context.getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE)
1717
}
1818

1919
var isFirstRun: Boolean
20-
get() = mPrefs.getBoolean(Constants.IS_FIRST_RUN, true)
21-
set(firstRun) = mPrefs.edit().putBoolean(Constants.IS_FIRST_RUN, firstRun).apply()
20+
get() = mPrefs.getBoolean(IS_FIRST_RUN, true)
21+
set(firstRun) = mPrefs.edit().putBoolean(IS_FIRST_RUN, firstRun).apply()
2222

2323
var isDarkTheme: Boolean
24-
get() = mPrefs.getBoolean(Constants.IS_DARK_THEME, false)
25-
set(isDarkTheme) = mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply()
24+
get() = mPrefs.getBoolean(IS_DARK_THEME, false)
25+
set(isDarkTheme) = mPrefs.edit().putBoolean(IS_DARK_THEME, isDarkTheme).apply()
2626

2727
var showHidden: Boolean
28-
get() = mPrefs.getBoolean(Constants.SHOW_HIDDEN, false)
29-
set(show) = mPrefs.edit().putBoolean(Constants.SHOW_HIDDEN, show).apply()
28+
get() = mPrefs.getBoolean(SHOW_HIDDEN, false)
29+
set(show) = mPrefs.edit().putBoolean(SHOW_HIDDEN, show).apply()
3030

3131
var treeUri: String
32-
get() = mPrefs.getString(Constants.TREE_URI, "")
33-
set(uri) = mPrefs.edit().putString(Constants.TREE_URI, uri).apply()
32+
get() = mPrefs.getString(TREE_URI, "")
33+
set(uri) = mPrefs.edit().putString(TREE_URI, uri).apply()
3434
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.simplemobiletools.filemanager
2+
3+
// shared preferences
4+
val PREFS_KEY = "File Manager"
5+
val IS_FIRST_RUN = "is_first_run"
6+
val IS_DARK_THEME = "is_dark_theme"
7+
val SHOW_HIDDEN = "show_hidden"
8+
val TREE_URI = "tree_uri"
9+
10+
// global intents
11+
val OPEN_DOCUMENT_TREE = 1000
12+
13+
object Constants {
14+
val PATH = "path"
15+
}

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import android.os.Build
77
import android.os.Bundle
88
import android.support.v7.app.AppCompatActivity
99
import android.view.MenuItem
10-
1110
import com.simplemobiletools.filemanager.Config
12-
import com.simplemobiletools.filemanager.Constants
11+
import com.simplemobiletools.filemanager.OPEN_DOCUMENT_TREE
1312
import com.simplemobiletools.filemanager.R
1413
import com.simplemobiletools.filepicker.extensions.isShowingWritePermissions
1514
import java.io.File
@@ -35,7 +34,7 @@ open class SimpleActivity : AppCompatActivity() {
3534

3635
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
3736
super.onActivityResult(requestCode, resultCode, resultData)
38-
if (requestCode == Constants.OPEN_DOCUMENT_TREE && resultCode == Activity.RESULT_OK && resultData != null) {
37+
if (requestCode == OPEN_DOCUMENT_TREE && resultCode == Activity.RESULT_OK && resultData != null) {
3938
saveTreeUri(resultData)
4039
}
4140
}
@@ -49,5 +48,5 @@ open class SimpleActivity : AppCompatActivity() {
4948
contentResolver.takePersistableUriPermission(treeUri, takeFlags)
5049
}
5150

52-
fun isShowingPermDialog(file: File) = isShowingWritePermissions(file, mConfig.treeUri, Constants.OPEN_DOCUMENT_TREE)
51+
fun isShowingPermDialog(file: File) = isShowingWritePermissions(file, mConfig.treeUri, OPEN_DOCUMENT_TREE)
5352
}

0 commit comments

Comments
 (0)