diff --git a/README.md b/README.md index 2b69d88..5beecbb 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,13 @@ CameraFragment comes with some default views [![png](https://raw.githubusercontent.com/florent37/CameraFragment/master/media/buttons.png)](https://github.com/florent37/CameraFragment) +#Download + +In your module [![Download](https://api.bintray.com/packages/florent37/maven/CameraFragment/images/download.svg)](https://bintray.com/florent37/maven/CameraFragment/_latestVersion) +```groovy +compile 'com.github.florent37:camerafragment:1.0.0' +``` + #Community Forked from [https://github.com/memfis19/Annca](https://github.com/memfis19/Annca) diff --git a/app/build.gradle b/app/build.gradle index c61e543..bd540c2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,28 +1,20 @@ apply plugin: 'com.android.application' -ext { - PUBLISH_VERSION = '1.2.0' - PUBLISH_VERSION_CODE = 3 - SUPPORT_VERSION = '25.1.0' - TARGET_SDK = 24 - MIN_SDK = 10 - BUILD_TOOLS = "24.0.3" -} - android { - compileSdkVersion TARGET_SDK - buildToolsVersion BUILD_TOOLS + compileSdkVersion project.sdk + buildToolsVersion project.buildTools defaultConfig { - minSdkVersion MIN_SDK - targetSdkVersion TARGET_SDK - versionCode PUBLISH_VERSION_CODE - versionName PUBLISH_VERSION + minSdkVersion project.minSdk + targetSdkVersion project.sdk + + versionCode 1 + versionName "1.0" } } dependencies { - compile "com.android.support:appcompat-v7:$SUPPORT_VERSION" + compile "com.android.support:appcompat-v7:" + project.supportVersion compile 'com.jakewharton:butterknife:7.0.1' compile project(':camerafragment') -} +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index e894cea..7226d0f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -14,9 +14,14 @@ buildscript { allprojects { repositories { jcenter() + maven { url "https://jitpack.io" } } } -task clean(type: Delete) { - delete rootProject.buildDir -} +ext { + sdk = 25 + buildTools = "24.0.3" + minSdk = 10 + libraryVersion = "1.0.0" + supportVersion = "25.1.0" +} \ No newline at end of file diff --git a/camerafragment/build.gradle b/camerafragment/build.gradle index 096bcab..7ce901d 100644 --- a/camerafragment/build.gradle +++ b/camerafragment/build.gradle @@ -1,32 +1,54 @@ apply plugin: 'com.android.library' - -ext { - PUBLISH_VERSION = '0.3.2' - PUBLISH_VERSION_CODE = 6 - SUPPORT_VERSION = '25.1.0' - TARGET_SDK = 24 - MIN_SDK = 10 - BUILD_TOOLS = "24.0.3" -} - android { - compileSdkVersion TARGET_SDK - buildToolsVersion BUILD_TOOLS + compileSdkVersion project.sdk + buildToolsVersion project.buildTools defaultConfig { - minSdkVersion MIN_SDK - targetSdkVersion TARGET_SDK - versionCode PUBLISH_VERSION_CODE - versionName PUBLISH_VERSION + minSdkVersion project.minSdk + targetSdkVersion project.sdk + + versionCode 1 + versionName "1.0" } } dependencies { - compile "com.android.support:support-v4:$SUPPORT_VERSION" - compile "com.android.support:appcompat-v7:$SUPPORT_VERSION" + compile "com.android.support:support-v4:"+ project.supportVersion + compile "com.android.support:appcompat-v7:"+ project.supportVersion } task wrapper(type: Wrapper) { gradleVersion = '2.4' +} + + +ext { + bintrayRepo = 'maven' + bintrayName = 'CameraFragment' + orgName = 'florent37' + + publishedGroupId = 'com.github.florent37' + libraryName = 'CameraFragment' + artifact = 'camerafragment' + + libraryDescription = 'CameraFragment' + + siteUrl = 'https://github.com/florent37/CameraFragment' + gitUrl = 'https://github.com/florent37/CameraFragment.git' + + libraryVersion = rootProject.ext.libraryVersion + + developerId = 'florent37' + developerName = 'Florent Champigny' + developerEmail = 'champigny.florent@gmail.com' + + licenseName = 'The Apache Software License, Version 2.0' + licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + allLicenses = ["Apache-2.0"] +} + +if (project.rootProject.file('local.properties').exists()) { + apply from: rootProject.file('gradle/install-v1.gradle') + apply from: rootProject.file('gradle/bintray-android-v1.gradle') } \ No newline at end of file diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/CameraFragmentApi.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/CameraFragmentApi.java index bb15899..63865b5 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/CameraFragmentApi.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/CameraFragmentApi.java @@ -5,7 +5,7 @@ import com.github.florent37.camerafragment.listeners.CameraFragmentResultListene import com.github.florent37.camerafragment.listeners.CameraFragmentStateListener; import com.github.florent37.camerafragment.listeners.CameraFragmentVideoRecordTextListener; -/** +/* * Created by florentchampigny on 16/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/PreviewActivity.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/PreviewActivity.java index 241f0e6..fd0deac 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/PreviewActivity.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/PreviewActivity.java @@ -27,7 +27,7 @@ import com.github.florent37.camerafragment.internal.ui.view.AspectFrameLayout; import com.github.florent37.camerafragment.internal.utils.ImageLoader; import com.github.florent37.camerafragment.internal.utils.Utils; -/** +/* * Created by memfis on 7/6/16. */ public class PreviewActivity extends AppCompatActivity implements View.OnClickListener { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/Configuration.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/Configuration.java index 9d2fd34..8a39701 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/Configuration.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/Configuration.java @@ -7,7 +7,7 @@ import java.io.Serializable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** +/* * Created by memfis on 7/6/16. * Updated by Florent37 */ @@ -116,7 +116,7 @@ public final class Configuration implements Serializable { return this; } - /*** + /** * @param videoDurationInMilliseconds - video duration in milliseconds * @return */ @@ -125,7 +125,7 @@ public final class Configuration implements Serializable { return this; } - /*** + /** * @param minimumVideoDurationInMilliseconds - minimum video duration in milliseconds, used only in video mode * for auto quality. * @return @@ -135,7 +135,7 @@ public final class Configuration implements Serializable { return this; } - /*** + /** * @param videoSizeInBytes - file size in bytes * @return */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/ConfigurationProvider.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/ConfigurationProvider.java index 01e7e11..285f78c 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/ConfigurationProvider.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/ConfigurationProvider.java @@ -1,6 +1,6 @@ package com.github.florent37.camerafragment.configuration; -/** +/* * Created by memfis on 7/6/16. */ public interface ConfigurationProvider { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/ConfigurationProviderImpl.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/ConfigurationProviderImpl.java index cbb8a64..a1c8747 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/ConfigurationProviderImpl.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/configuration/ConfigurationProviderImpl.java @@ -1,6 +1,6 @@ package com.github.florent37.camerafragment.configuration; -/** +/* * Created by florentchampigny on 12/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/CameraController.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/CameraController.java index b68af52..83acba8 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/CameraController.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/CameraController.java @@ -8,7 +8,7 @@ import com.github.florent37.camerafragment.configuration.Configuration; import com.github.florent37.camerafragment.internal.manager.CameraManager; import com.github.florent37.camerafragment.listeners.CameraFragmentResultListener; -/** +/* * Created by memfis on 7/6/16. */ public interface CameraController { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/impl/Camera1Controller.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/impl/Camera1Controller.java index eb618d2..8835fa8 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/impl/Camera1Controller.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/impl/Camera1Controller.java @@ -23,7 +23,7 @@ import com.github.florent37.camerafragment.internal.utils.CameraHelper; import com.github.florent37.camerafragment.internal.utils.Size; import com.github.florent37.camerafragment.listeners.CameraFragmentResultListener; -/** +/* * Created by memfis on 7/7/16. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/impl/Camera2Controller.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/impl/Camera2Controller.java index 10994f4..d075daa 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/impl/Camera2Controller.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/impl/Camera2Controller.java @@ -25,7 +25,7 @@ import com.github.florent37.camerafragment.internal.utils.CameraHelper; import com.github.florent37.camerafragment.internal.utils.Size; import com.github.florent37.camerafragment.listeners.CameraFragmentResultListener; -/** +/* * Created by memfis on 7/6/16. */ @TargetApi(Build.VERSION_CODES.LOLLIPOP) diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/view/CameraView.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/view/CameraView.java index c73a0c9..a10f768 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/view/CameraView.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/controller/view/CameraView.java @@ -7,7 +7,7 @@ import com.github.florent37.camerafragment.configuration.Configuration; import com.github.florent37.camerafragment.internal.utils.Size; import com.github.florent37.camerafragment.listeners.CameraFragmentResultListener; -/** +/* * Created by memfis on 7/6/16. */ public interface CameraView { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/CameraManager.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/CameraManager.java index 9a27309..4499d55 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/CameraManager.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/CameraManager.java @@ -13,7 +13,7 @@ import com.github.florent37.camerafragment.internal.manager.listener.CameraVideo import com.github.florent37.camerafragment.internal.utils.Size; import com.github.florent37.camerafragment.listeners.CameraFragmentResultListener; -/** +/* * Created by memfis on 8/14/16. */ public interface CameraManager { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/BaseCameraManager.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/BaseCameraManager.java index 7d782df..d01fd51 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/BaseCameraManager.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/BaseCameraManager.java @@ -15,7 +15,7 @@ import com.github.florent37.camerafragment.configuration.ConfigurationProvider; import com.github.florent37.camerafragment.internal.manager.CameraManager; import com.github.florent37.camerafragment.internal.utils.Size; -/** +/* * Created by memfis on 8/14/16. */ abstract class BaseCameraManager diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera1Manager.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera1Manager.java index 7cc96ec..73fe799 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera1Manager.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera1Manager.java @@ -32,7 +32,7 @@ import com.github.florent37.camerafragment.internal.utils.CameraHelper; import com.github.florent37.camerafragment.internal.utils.Size; import com.github.florent37.camerafragment.listeners.CameraFragmentResultListener; -/** +/* * Created by memfis on 8/14/16. */ @SuppressWarnings("deprecation") diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera2Manager.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera2Manager.java index 4674f92..0b513f1 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera2Manager.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera2Manager.java @@ -50,7 +50,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -/** +/* * Created by memfis on 8/9/16. */ @TargetApi(Build.VERSION_CODES.LOLLIPOP) diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraCloseListener.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraCloseListener.java index 55d049e..284268d 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraCloseListener.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraCloseListener.java @@ -1,6 +1,6 @@ package com.github.florent37.camerafragment.internal.manager.listener; -/** +/* * Created by memfis on 8/14/16. */ public interface CameraCloseListener { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraOpenListener.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraOpenListener.java index bfb4c79..5cfd19d 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraOpenListener.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraOpenListener.java @@ -2,7 +2,7 @@ package com.github.florent37.camerafragment.internal.manager.listener; import com.github.florent37.camerafragment.internal.utils.Size; -/** +/* * Created by memfis on 8/14/16. */ public interface CameraOpenListener { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraPhotoListener.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraPhotoListener.java index ab8face..dc80bd8 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraPhotoListener.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraPhotoListener.java @@ -4,7 +4,7 @@ import com.github.florent37.camerafragment.listeners.CameraFragmentResultListene import java.io.File; -/** +/* * Created by memfis on 8/14/16. */ public interface CameraPhotoListener { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraVideoListener.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraVideoListener.java index 6529fc2..9c8cc0f 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraVideoListener.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/listener/CameraVideoListener.java @@ -5,7 +5,7 @@ import java.io.File; import com.github.florent37.camerafragment.internal.utils.Size; import com.github.florent37.camerafragment.listeners.CameraFragmentResultListener; -/** +/* * Created by memfis on 8/14/16. */ public interface CameraVideoListener { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/CountdownTask.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/CountdownTask.java index a76bd2f..e1e37d9 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/CountdownTask.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/CountdownTask.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import com.github.florent37.camerafragment.internal.utils.DateTimeUtils; -/** +/* * Created by florentchampigny on 13/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/TimerTask.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/TimerTask.java index e51db13..c434338 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/TimerTask.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/TimerTask.java @@ -2,7 +2,7 @@ package com.github.florent37.camerafragment.internal.timer; import com.github.florent37.camerafragment.internal.utils.DateTimeUtils; -/** +/* * Created by florentchampigny on 13/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/TimerTaskBase.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/TimerTaskBase.java index 57d9a51..47ada5e 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/TimerTaskBase.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/timer/TimerTaskBase.java @@ -3,7 +3,7 @@ package com.github.florent37.camerafragment.internal.timer; import android.os.Handler; import android.os.Looper; -/** +/* * Created by florentchampigny on 13/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/BaseAnncaFragment.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/BaseAnncaFragment.java index 103350f..13f9777 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/BaseAnncaFragment.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/BaseAnncaFragment.java @@ -51,7 +51,7 @@ import com.github.florent37.camerafragment.listeners.CameraFragmentVideoRecordTe import java.io.File; -/** +/* * Created by memfis on 12/1/16. * Updated by Florent37 */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/model/PhotoQualityOption.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/model/PhotoQualityOption.java index 5814a73..37efe86 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/model/PhotoQualityOption.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/model/PhotoQualityOption.java @@ -3,7 +3,7 @@ package com.github.florent37.camerafragment.internal.ui.model; import com.github.florent37.camerafragment.configuration.Configuration; import com.github.florent37.camerafragment.internal.utils.Size; -/** +/* * Created by memfis on 12/1/16. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/model/VideoQualityOption.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/model/VideoQualityOption.java index 4ec27b5..6975923 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/model/VideoQualityOption.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/model/VideoQualityOption.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import com.github.florent37.camerafragment.configuration.Configuration; -/** +/* * Created by memfis on 12/1/16. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AspectFrameLayout.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AspectFrameLayout.java index 655b53f..22a0628 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AspectFrameLayout.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AspectFrameLayout.java @@ -4,7 +4,7 @@ import android.content.Context; import android.util.AttributeSet; import android.widget.FrameLayout; -/** +/* * Layout that adjusts to maintain a specific aspect ratio. */ public class AspectFrameLayout extends FrameLayout { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AutoFitSurfaceView.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AutoFitSurfaceView.java index 96de853..7746c91 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AutoFitSurfaceView.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AutoFitSurfaceView.java @@ -6,7 +6,7 @@ import android.support.annotation.NonNull; import android.view.SurfaceHolder; import android.view.SurfaceView; -/** +/* * Created by memfis on 7/6/16. */ @SuppressWarnings("deprecation") @@ -29,7 +29,7 @@ public class AutoFitSurfaceView extends SurfaceView { this.surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS); } - /** + /* * Sets the aspect ratio for this view. The size of the view will be measured based on the ratio * calculated fromList the parameters. Note that the actual sizes of parameters don't matter, that * is, calling setAspectRatio(2, 3) and setAspectRatio(4, 6) make the same result. diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AutoFitTextureView.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AutoFitTextureView.java index 0402b43..e984e2a 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AutoFitTextureView.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/view/AutoFitTextureView.java @@ -6,7 +6,7 @@ import android.content.Context; import android.os.Build; import android.view.TextureView; -/** +/* * Created by memfis on 7/6/16. */ @SuppressLint("ViewConstructor") @@ -23,7 +23,7 @@ public class AutoFitTextureView extends TextureView { setSurfaceTextureListener(surfaceTextureListener); } - /** + /* * Sets the aspect ratio for this view. The size of the view will be measured based on the ratio * calculated fromList the parameters. Note that the actual sizes of parameters don't matter, that * is, calling setAspectRatio(2, 3) and setAspectRatio(4, 6) make the same result. diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/CameraHelper.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/CameraHelper.java index 1a25fef..681be86 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/CameraHelper.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/CameraHelper.java @@ -22,7 +22,7 @@ import java.util.List; import com.github.florent37.camerafragment.configuration.Configuration; -/** +/* * Created by memfis on 7/6/16. *

* Class with some common methods to work with camera. diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/DateTimeUtils.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/DateTimeUtils.java index d9e32b3..b4ca6a0 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/DateTimeUtils.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/DateTimeUtils.java @@ -1,6 +1,6 @@ package com.github.florent37.camerafragment.internal.utils; -/** +/* * Created by memfis on 6/27/16. */ public final class DateTimeUtils { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/ImageLoader.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/ImageLoader.java index 8890c05..a5bde50 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/ImageLoader.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/ImageLoader.java @@ -18,7 +18,7 @@ import android.widget.ImageView; import java.io.IOException; -/** +/* * Created by memfis on 7/18/16. */ public final class ImageLoader { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/ImageSaver.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/ImageSaver.java index 7dbb7da..7b21849 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/ImageSaver.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/ImageSaver.java @@ -10,7 +10,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -/** +/* * Created by memfis on 7/6/16. */ public class ImageSaver implements Runnable { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/Size.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/Size.java index 2623974..6440c69 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/Size.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/Size.java @@ -7,7 +7,7 @@ import android.os.Build; import java.util.ArrayList; import java.util.List; -/** +/* * Created by memfis on 12/1/16. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/Utils.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/Utils.java index bc774c8..8047c71 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/Utils.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/internal/utils/Utils.java @@ -9,7 +9,7 @@ import android.view.Surface; import android.view.WindowManager; import android.webkit.MimeTypeMap; -/** +/* * Created by memfis on 7/18/16. */ public class Utils { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentControlsListener.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentControlsListener.java index f8065ef..03324bc 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentControlsListener.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentControlsListener.java @@ -1,6 +1,6 @@ package com.github.florent37.camerafragment.listeners; -/** +/* * Created by florentchampigny on 13/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentResultListener.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentResultListener.java index c57410c..4384d06 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentResultListener.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentResultListener.java @@ -1,6 +1,6 @@ package com.github.florent37.camerafragment.listeners; -/** +/* * Created by florentchampigny on 13/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentStateListener.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentStateListener.java index c216210..8ec57e5 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentStateListener.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentStateListener.java @@ -2,7 +2,7 @@ package com.github.florent37.camerafragment.listeners; import java.io.File; -/** +/* * Created by florentchampigny on 13/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentVideoRecordTextListener.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentVideoRecordTextListener.java index 95a34cc..5f936e3 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentVideoRecordTextListener.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/listeners/CameraFragmentVideoRecordTextListener.java @@ -1,6 +1,6 @@ package com.github.florent37.camerafragment.listeners; -/** +/* * Created by florentchampigny on 13/01/2017. */ diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/CameraSettingsView.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/CameraSettingsView.java index b0691cb..1c0d154 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/CameraSettingsView.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/CameraSettingsView.java @@ -8,7 +8,7 @@ import android.widget.ImageButton; import com.github.florent37.camerafragment.R; -/** +/* * Created by memfis on 8/23/16. */ public class CameraSettingsView extends ImageButton { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/CameraSwitchView.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/CameraSwitchView.java index aa4ff37..c2ce623 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/CameraSwitchView.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/CameraSwitchView.java @@ -13,7 +13,7 @@ import android.view.View; import com.github.florent37.camerafragment.R; import com.github.florent37.camerafragment.internal.utils.Utils; -/** +/* * Created by memfis on 6/24/16. */ public class CameraSwitchView extends AppCompatImageButton { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/FlashSwitchView.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/FlashSwitchView.java index d6865e0..45cbfe2 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/FlashSwitchView.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/FlashSwitchView.java @@ -14,7 +14,7 @@ import android.widget.ImageButton; import com.github.florent37.camerafragment.R; -/** +/* * Created by memfis on 7/6/16. */ public class FlashSwitchView extends ImageButton { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/MediaActionSwitchView.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/MediaActionSwitchView.java index ba5de5b..17d8948 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/MediaActionSwitchView.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/MediaActionSwitchView.java @@ -13,7 +13,7 @@ import android.widget.ImageButton; import com.github.florent37.camerafragment.R; import com.github.florent37.camerafragment.internal.utils.Utils; -/** +/* * Created by memfis on 6/24/16. */ public class MediaActionSwitchView extends ImageButton { diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/RecordButton.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/RecordButton.java index ebdb85f..ba489e4 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/RecordButton.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/widgets/RecordButton.java @@ -13,7 +13,7 @@ import android.widget.ImageButton; import com.github.florent37.camerafragment.R; import com.github.florent37.camerafragment.internal.utils.Utils; -/** +/* * Created by memfis on 7/6/16. */ public class RecordButton extends ImageButton { diff --git a/gradle/bintray-android-v1.gradle b/gradle/bintray-android-v1.gradle new file mode 100644 index 0000000..0101dd5 --- /dev/null +++ b/gradle/bintray-android-v1.gradle @@ -0,0 +1,52 @@ +apply plugin: 'com.jfrog.bintray' + +version = libraryVersion + +task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' +} + +task javadoc(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} +artifacts { + archives javadocJar + archives sourcesJar +} + +// Bintray +Properties properties = new Properties() +properties.load(project.rootProject.file('local.properties').newDataInputStream()) + +bintray { + user = properties.getProperty("bintray.user") + key = properties.getProperty("bintray.apikey") + + configurations = ['archives'] + pkg { + repo = bintrayRepo + name = bintrayName + desc = libraryDescription + userOrg = orgName + websiteUrl = siteUrl + vcsUrl = gitUrl + licenses = allLicenses + publish = true + publicDownloadNumbers = true + version { + desc = libraryDescription + gpg { + sign = true //Determines whether to GPG sign the files. The default is false + passphrase = properties.getProperty("bintray.gpg.password") + //Optional. The passphrase for GPG signing' + } + } + } +} \ No newline at end of file diff --git a/gradle/bintray-java-v1.gradle b/gradle/bintray-java-v1.gradle new file mode 100644 index 0000000..67025d7 --- /dev/null +++ b/gradle/bintray-java-v1.gradle @@ -0,0 +1,49 @@ +apply plugin: 'com.jfrog.bintray' + +version = libraryVersion + +task sourcesJar(type: Jar) { + from sourceSets.main.allSource + classifier = 'sources' +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} +artifacts { + archives javadocJar + archives sourcesJar +} + +// Bintray +Properties properties = new Properties() +properties.load(project.rootProject.file('local.properties').newDataInputStream()) + +bintray { + user = properties.getProperty("bintray.user") + key = properties.getProperty("bintray.apikey") + + configurations = ['archives'] + pkg { + repo = bintrayRepo + name = bintrayName + desc = libraryDescription + userOrg = orgName + websiteUrl = siteUrl + vcsUrl = gitUrl + licenses = ['Apache-2.0'] + publish = true + publicDownloadNumbers = true + version { + desc = libraryDescription + gpg { + sign = true //Determines whether to GPG sign the files. The default is false + passphrase = properties.getProperty("bintray.gpg.password") + //Optional. The passphrase for GPG signing' + } + } + } +} + +//from https://github.com/workarounds/bundler/blob/master/gradle/bintray-java-v1.gradle \ No newline at end of file diff --git a/gradle/install-v1.gradle b/gradle/install-v1.gradle new file mode 100644 index 0000000..79980d1 --- /dev/null +++ b/gradle/install-v1.gradle @@ -0,0 +1,44 @@ +apply plugin: 'com.github.dcendents.android-maven' + +group = publishedGroupId // Maven Group ID for the artifact + +install { + repositories.mavenInstaller { + // This generates POM.xml with proper parameters + pom { + project { + packaging 'aar' + groupId publishedGroupId + artifactId artifact + + // Add your description here + name libraryName + description libraryDescription + url siteUrl + + // Set your license + licenses { + license { + name licenseName + url licenseUrl + } + } + developers { + developer { + id developerId + name developerName + email developerEmail + } + } + scm { + connection gitUrl + developerConnection gitUrl + url siteUrl + + } + } + } + } +} + +//from https://github.com/workarounds/bundler/blob/master/gradle/install-v1.gradle \ No newline at end of file