From b2869fc6ba9d94071d1795d18f389dc8f2b5036c Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 15 Nov 2016 23:59:56 +0100 Subject: [PATCH] convert Constants to kotlin --- .../simplemobiletools/camera/Constants.java | 29 ---------- .../com/simplemobiletools/camera/Preview.java | 4 +- .../com/simplemobiletools/camera/Config.kt | 54 +++++++++---------- .../com/simplemobiletools/camera/Constants.kt | 30 +++++++++++ .../camera/PhotoProcessor.kt | 6 +-- .../camera/activities/SettingsActivity.kt | 29 +++++----- 6 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 app/src/main/java/com/simplemobiletools/camera/Constants.java create mode 100644 app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt diff --git a/app/src/main/java/com/simplemobiletools/camera/Constants.java b/app/src/main/java/com/simplemobiletools/camera/Constants.java deleted file mode 100644 index bd6ac395..00000000 --- a/app/src/main/java/com/simplemobiletools/camera/Constants.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.simplemobiletools.camera; - -public class Constants { - public static final int ORIENT_PORTRAIT = 0; - public static final int ORIENT_LANDSCAPE_LEFT = 1; - public static final int ORIENT_LANDSCAPE_RIGHT = 2; - - public static final int TWO_MPX = 3000000; - public static final int FIVE_MPX = 6000000; - public static final int EIGHT_MPX = 9000000; - - public static final int P480 = 400000; - public static final int P720 = 1000000; - public static final int P1080 = 2100000; - - // shared preferences - public static final String PREFS_KEY = "Camera"; - public static final String IS_FIRST_RUN = "is_first_run"; - public static final String IS_DARK_THEME = "is_dark_theme"; - public static final String SAVE_PHOTOS = "save_photos"; - public static final String SOUND = "sound"; - public static final String FORCE_RATIO = "force_ratio"; - public static final String MAX_PHOTO_RESOLUTION = "max_photo_resolution"; - public static final String MAX_VIDEO_RESOLUTION = "max_video_resolution"; - public static final String MAX_RESOLUTION = "max_resolution"; - public static final String LAST_USED_CAMERA = "last_used_camera"; - public static final String LAST_FLASHLIGHT_STATE = "last_flashlight_state"; - public static final String TREE_URI = "tree_uri"; -} diff --git a/app/src/main/java/com/simplemobiletools/camera/Preview.java b/app/src/main/java/com/simplemobiletools/camera/Preview.java index bfaa99a2..73f4eb35 100644 --- a/app/src/main/java/com/simplemobiletools/camera/Preview.java +++ b/app/src/main/java/com/simplemobiletools/camera/Preview.java @@ -396,9 +396,9 @@ public class Preview extends ViewGroup int degrees = 0; boolean isFrontCamera = (mCurrCameraId == Camera.CameraInfo.CAMERA_FACING_FRONT); int deviceOrientation = mCallback.getCurrentOrientation(); - if (deviceOrientation == Constants.ORIENT_LANDSCAPE_LEFT) { + if (deviceOrientation == Constants.INSTANCE.getORIENT_LANDSCAPE_LEFT()) { degrees += isFrontCamera ? 90 : 270; - } else if (deviceOrientation == Constants.ORIENT_LANDSCAPE_RIGHT) { + } else if (deviceOrientation == Constants.INSTANCE.getORIENT_LANDSCAPE_RIGHT()) { degrees += isFrontCamera ? 270 : 90; } return degrees; diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt index c5939783..f3fa2df5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt @@ -13,66 +13,66 @@ class Config(context: Context) { } init { - mPrefs = context.getSharedPreferences(Constants.PREFS_KEY, Context.MODE_PRIVATE) + mPrefs = context.getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE) } var isFirstRun: Boolean - get() = mPrefs.getBoolean(Constants.IS_FIRST_RUN, true) - set(firstRun) = mPrefs.edit().putBoolean(Constants.IS_FIRST_RUN, firstRun).apply() + get() = mPrefs.getBoolean(IS_FIRST_RUN, true) + set(firstRun) = mPrefs.edit().putBoolean(IS_FIRST_RUN, firstRun).apply() var isDarkTheme: Boolean - get() = mPrefs.getBoolean(Constants.IS_DARK_THEME, false) - set(isDarkTheme) = mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply() + get() = mPrefs.getBoolean(IS_DARK_THEME, false) + set(isDarkTheme) = mPrefs.edit().putBoolean(IS_DARK_THEME, isDarkTheme).apply() var savePhotosFolder: String - get() = mPrefs.getString(Constants.SAVE_PHOTOS, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString()) - set(path) = mPrefs.edit().putString(Constants.SAVE_PHOTOS, path).apply() + get() = mPrefs.getString(SAVE_PHOTOS, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString()) + set(path) = mPrefs.edit().putString(SAVE_PHOTOS, path).apply() var forceRatioEnabled: Boolean - get() = mPrefs.getBoolean(Constants.FORCE_RATIO, true) - set(enabled) = mPrefs.edit().putBoolean(Constants.FORCE_RATIO, enabled).apply() + get() = mPrefs.getBoolean(FORCE_RATIO, true) + set(enabled) = mPrefs.edit().putBoolean(FORCE_RATIO, enabled).apply() // todo: delete this val maxResolution: Int - get() = mPrefs.getInt(Constants.MAX_RESOLUTION, -1) + get() = mPrefs.getInt(MAX_RESOLUTION, -1) var maxPhotoResolution: Int - get() = mPrefs.getInt(Constants.MAX_PHOTO_RESOLUTION, oldDefaultResolution) - set(maxRes) = mPrefs.edit().putInt(Constants.MAX_PHOTO_RESOLUTION, maxRes).apply() + get() = mPrefs.getInt(MAX_PHOTO_RESOLUTION, oldDefaultResolution) + set(maxRes) = mPrefs.edit().putInt(MAX_PHOTO_RESOLUTION, maxRes).apply() private val oldDefaultResolution: Int get() { return when (maxResolution) { - 1 -> Constants.EIGHT_MPX + 1 -> EIGHT_MPX 2 -> 0 - else -> Constants.FIVE_MPX + else -> FIVE_MPX } } var maxVideoResolution: Int get() { - val maxRes = mPrefs.getInt(Constants.MAX_VIDEO_RESOLUTION, Constants.P720) + val maxRes = mPrefs.getInt(MAX_VIDEO_RESOLUTION, P720) return when (maxRes) { - 0 -> Constants.P480 - 2 -> Constants.P1080 - else -> Constants.P720 + 0 -> P480 + 2 -> P1080 + else -> P720 } } - set(maxRes) = mPrefs.edit().putInt(Constants.MAX_VIDEO_RESOLUTION, maxRes).apply() + set(maxRes) = mPrefs.edit().putInt(MAX_VIDEO_RESOLUTION, maxRes).apply() var isSoundEnabled: Boolean - get() = mPrefs.getBoolean(Constants.SOUND, true) - set(enabled) = mPrefs.edit().putBoolean(Constants.SOUND, enabled).apply() + get() = mPrefs.getBoolean(SOUND, true) + set(enabled) = mPrefs.edit().putBoolean(SOUND, enabled).apply() var lastUsedCamera: Int - get() = mPrefs.getInt(Constants.LAST_USED_CAMERA, Camera.CameraInfo.CAMERA_FACING_BACK) - set(cameraId) = mPrefs.edit().putInt(Constants.LAST_USED_CAMERA, cameraId).apply() + get() = mPrefs.getInt(LAST_USED_CAMERA, Camera.CameraInfo.CAMERA_FACING_BACK) + set(cameraId) = mPrefs.edit().putInt(LAST_USED_CAMERA, cameraId).apply() var lastFlashlightState: Boolean - get() = mPrefs.getBoolean(Constants.LAST_FLASHLIGHT_STATE, false) - set(enabled) = mPrefs.edit().putBoolean(Constants.LAST_FLASHLIGHT_STATE, enabled).apply() + get() = mPrefs.getBoolean(LAST_FLASHLIGHT_STATE, false) + set(enabled) = mPrefs.edit().putBoolean(LAST_FLASHLIGHT_STATE, enabled).apply() var treeUri: String - get() = mPrefs.getString(Constants.TREE_URI, "") - set(uri) = mPrefs.edit().putString(Constants.TREE_URI, uri).apply() + get() = mPrefs.getString(TREE_URI, "") + set(uri) = mPrefs.edit().putString(TREE_URI, uri).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt new file mode 100644 index 00000000..62ad796b --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt @@ -0,0 +1,30 @@ +package com.simplemobiletools.camera + +object Constants { + val ORIENT_PORTRAIT = 0 + val ORIENT_LANDSCAPE_LEFT = 1 + val ORIENT_LANDSCAPE_RIGHT = 2 +} + +val TWO_MPX = 3000000 +val FIVE_MPX = 6000000 +val EIGHT_MPX = 9000000 + +val P480 = 400000 +val P720 = 1000000 +val P1080 = 2100000 + +// shared preferences +val PREFS_KEY = "Camera" +val IS_FIRST_RUN = "is_first_run" +val IS_DARK_THEME = "is_dark_theme" +val SAVE_PHOTOS = "save_photos" +val SOUND = "sound" +val FORCE_RATIO = "force_ratio" +val MAX_PHOTO_RESOLUTION = "max_photo_resolution" +val MAX_VIDEO_RESOLUTION = "max_video_resolution" +val MAX_RESOLUTION = "max_resolution" +val LAST_USED_CAMERA = "last_used_camera" +val LAST_FLASHLIGHT_STATE = "last_flashlight_state" +val TREE_URI = "tree_uri" + diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt b/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt index 68c680f7..ccfd9cb3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt @@ -57,14 +57,14 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?) : AsyncTask 0 - Constants.FIVE_MPX -> 1 - Constants.EIGHT_MPX -> 2 + TWO_MPX -> 0 + FIVE_MPX -> 1 + EIGHT_MPX -> 2 else -> 3 } } private fun getMaxPhotoPx(index: Int): Int { return when (index) { - 0 -> Constants.TWO_MPX - 1 -> Constants.FIVE_MPX - 2 -> Constants.EIGHT_MPX + 0 -> TWO_MPX + 1 -> FIVE_MPX + 2 -> EIGHT_MPX else -> -1 } } @@ -179,18 +178,18 @@ class SettingsActivity : SimpleActivity() { private fun getMaxVideoSelection(): Int { val maxRes = config.maxVideoResolution return when (maxRes) { - Constants.P480 -> 0 - Constants.P720 -> 1 - Constants.P1080 -> 2 + P480 -> 0 + P720 -> 1 + P1080 -> 2 else -> 3 } } private fun getMaxVideoPx(index: Int): Int { return when (index) { - 0 -> Constants.P480 - 1 -> Constants.P720 - 2 -> Constants.P1080 + 0 -> P480 + 1 -> P720 + 2 -> P1080 else -> -1 } }