From a016f514f810691d1550e94a124e2103a68063b6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 3 Dec 2017 21:20:51 +0100 Subject: [PATCH] moving some files in subfolders + renaming extension files to first capital letter --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../com/simplemobiletools/camera/activities/MainActivity.kt | 4 +++- .../camera/dialogs/ChangeResolutionDialog.kt | 2 +- .../camera/extensions/{activity.kt => Activity.kt} | 0 .../camera/extensions/{context.kt => Context.kt} | 2 +- .../simplemobiletools/camera/extensions/{int.kt => Int.kt} | 4 ++-- .../simplemobiletools/camera/extensions/{size.kt => Size.kt} | 0 .../com/simplemobiletools/camera/{ => helpers}/Config.kt | 2 +- .../com/simplemobiletools/camera/{ => helpers}/Constants.kt | 2 +- .../simplemobiletools/camera/{ => helpers}/PhotoProcessor.kt | 3 ++- .../camera/{ => receivers}/HardwareShutterReceiver.kt | 2 +- .../com/simplemobiletools/camera/{ => views}/Preview.kt | 5 ++++- 13 files changed, 18 insertions(+), 12 deletions(-) rename app/src/main/kotlin/com/simplemobiletools/camera/extensions/{activity.kt => Activity.kt} (100%) rename app/src/main/kotlin/com/simplemobiletools/camera/extensions/{context.kt => Context.kt} (96%) rename app/src/main/kotlin/com/simplemobiletools/camera/extensions/{int.kt => Int.kt} (69%) rename app/src/main/kotlin/com/simplemobiletools/camera/extensions/{size.kt => Size.kt} (100%) rename app/src/main/kotlin/com/simplemobiletools/camera/{ => helpers}/Config.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/camera/{ => helpers}/Constants.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/camera/{ => helpers}/PhotoProcessor.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/camera/{ => receivers}/HardwareShutterReceiver.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/camera/{ => views}/Preview.kt (99%) diff --git a/app/build.gradle b/app/build.gradle index 915bac3e..826ea35f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.0.22' + implementation 'com.simplemobiletools:commons:3.0.23' debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e6f0acbf..66faa859 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -94,7 +94,7 @@ android:parentActivityName=".activities.MainActivity"/> + android:name=".receivers.HardwareShutterReceiver"> diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt index d8f84661..b50a8ce9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -17,10 +17,12 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions import com.simplemobiletools.camera.* -import com.simplemobiletools.camera.Preview.PreviewListener +import com.simplemobiletools.camera.views.Preview.PreviewListener import com.simplemobiletools.camera.extensions.config import com.simplemobiletools.camera.extensions.navBarHeight +import com.simplemobiletools.camera.helpers.* import com.simplemobiletools.camera.views.FocusRectView +import com.simplemobiletools.camera.views.Preview import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_CAMERA import com.simplemobiletools.commons.helpers.PERMISSION_RECORD_AUDIO diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/dialogs/ChangeResolutionDialog.kt b/app/src/main/kotlin/com/simplemobiletools/camera/dialogs/ChangeResolutionDialog.kt index d6f22b35..68551465 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/dialogs/ChangeResolutionDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/dialogs/ChangeResolutionDialog.kt @@ -4,11 +4,11 @@ import android.hardware.Camera import android.support.v7.app.AlertDialog import android.view.LayoutInflater import android.view.View -import com.simplemobiletools.camera.Config import com.simplemobiletools.camera.R import com.simplemobiletools.camera.activities.SimpleActivity import com.simplemobiletools.camera.extensions.config import com.simplemobiletools.camera.extensions.getAspectRatio +import com.simplemobiletools.camera.helpers.Config import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.models.RadioItem diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/activity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/Activity.kt similarity index 100% rename from app/src/main/kotlin/com/simplemobiletools/camera/extensions/activity.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/extensions/Activity.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/context.kt b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/Context.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/camera/extensions/context.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/extensions/Context.kt index 98f32636..4abf9892 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/Context.kt @@ -3,7 +3,7 @@ package com.simplemobiletools.camera.extensions import android.content.Context import android.graphics.Point import android.view.WindowManager -import com.simplemobiletools.camera.Config +import com.simplemobiletools.camera.helpers.Config import java.io.File import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/int.kt b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/Int.kt similarity index 69% rename from app/src/main/kotlin/com/simplemobiletools/camera/extensions/int.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/extensions/Int.kt index 67c2840c..84f9edc3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/int.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/Int.kt @@ -1,8 +1,8 @@ package com.simplemobiletools.camera.extensions import android.hardware.Camera -import com.simplemobiletools.camera.ORIENT_LANDSCAPE_LEFT -import com.simplemobiletools.camera.ORIENT_LANDSCAPE_RIGHT +import com.simplemobiletools.camera.helpers.ORIENT_LANDSCAPE_LEFT +import com.simplemobiletools.camera.helpers.ORIENT_LANDSCAPE_RIGHT fun Int.compensateDeviceRotation(currCameraId: Int) = when { this == ORIENT_LANDSCAPE_LEFT -> 270 diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/size.kt b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/Size.kt similarity index 100% rename from app/src/main/kotlin/com/simplemobiletools/camera/extensions/size.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/extensions/Size.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/camera/Config.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt index c5cb3c0e..13066ff8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.camera +package com.simplemobiletools.camera.helpers import android.content.Context import android.hardware.Camera diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Constants.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/helpers/Constants.kt index c29f2d07..58fc3215 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Constants.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.camera +package com.simplemobiletools.camera.helpers val ORIENT_PORTRAIT = 0 val ORIENT_LANDSCAPE_LEFT = 1 diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt index 6b6483ff..fbe73dd2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.camera +package com.simplemobiletools.camera.helpers import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -8,6 +8,7 @@ import android.media.ExifInterface import android.net.Uri import android.os.AsyncTask import android.os.Environment +import com.simplemobiletools.camera.R import com.simplemobiletools.camera.activities.MainActivity import com.simplemobiletools.camera.extensions.compensateDeviceRotation import com.simplemobiletools.camera.extensions.config diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/HardwareShutterReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/camera/receivers/HardwareShutterReceiver.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/camera/HardwareShutterReceiver.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/receivers/HardwareShutterReceiver.kt index 2686a47e..08ca4cf6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/HardwareShutterReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/receivers/HardwareShutterReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.camera +package com.simplemobiletools.camera.receivers import android.content.BroadcastReceiver import android.content.Context diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/Preview.kt similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/views/Preview.kt index dbd85ecb..c7241c2d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/Preview.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.camera +package com.simplemobiletools.camera.views import android.content.Context import android.graphics.Point @@ -13,9 +13,12 @@ import android.view.ScaleGestureDetector import android.view.SurfaceHolder import android.view.SurfaceView import android.view.ViewGroup +import com.simplemobiletools.camera.helpers.PhotoProcessor +import com.simplemobiletools.camera.R import com.simplemobiletools.camera.activities.MainActivity import com.simplemobiletools.camera.dialogs.ChangeResolutionDialog import com.simplemobiletools.camera.extensions.* +import com.simplemobiletools.camera.helpers.Config import com.simplemobiletools.commons.extensions.* import java.io.File import java.io.IOException