From b1c04cc7b272f8296e4db563267457e7e5dbed98 Mon Sep 17 00:00:00 2001 From: Michael Schwartz Date: Mon, 29 Jan 2018 23:05:26 +0100 Subject: [PATCH] gradle and butterknife updated, fixed exception while setting flash at startup --- app/build.gradle | 2 +- .../sample/CameraFragmentMainActivity.java | 20 +++++++++---------- .../CameraFragmentMainActivityCustoms.java | 16 +++++++-------- build.gradle | 11 +++++++--- .../internal/manager/impl/Camera2Manager.java | 3 +++ .../internal/ui/BaseAnncaFragment.java | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bd540c2..85ca94e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,6 +15,6 @@ android { dependencies { compile "com.android.support:appcompat-v7:" + project.supportVersion - compile 'com.jakewharton:butterknife:7.0.1' + compile 'com.jakewharton:butterknife:8.8.1' compile project(':camerafragment') } \ No newline at end of file diff --git a/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivity.java b/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivity.java index 45d8459..1c9c2fc 100644 --- a/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivity.java +++ b/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivity.java @@ -30,7 +30,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -39,25 +39,25 @@ public class CameraFragmentMainActivity extends AppCompatActivity { public static final String FRAGMENT_TAG = "camera"; private static final int REQUEST_CAMERA_PERMISSIONS = 931; private static final int REQUEST_PREVIEW_CODE = 1001; - @Bind(R.id.settings_view) + @BindView(R.id.settings_view) CameraSettingsView settingsView; - @Bind(R.id.flash_switch_view) + @BindView(R.id.flash_switch_view) FlashSwitchView flashSwitchView; - @Bind(R.id.front_back_camera_switcher) + @BindView(R.id.front_back_camera_switcher) CameraSwitchView cameraSwitchView; - @Bind(R.id.record_button) + @BindView(R.id.record_button) RecordButton recordButton; - @Bind(R.id.photo_video_camera_switcher) + @BindView(R.id.photo_video_camera_switcher) MediaActionSwitchView mediaActionSwitchView; - @Bind(R.id.record_duration_text) + @BindView(R.id.record_duration_text) TextView recordDurationText; - @Bind(R.id.record_size_mb_text) + @BindView(R.id.record_size_mb_text) TextView recordSizeText; - @Bind(R.id.cameraLayout) + @BindView(R.id.cameraLayout) View cameraLayout; - @Bind(R.id.addCameraButton) + @BindView(R.id.addCameraButton) View addCameraButton; @Override diff --git a/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivityCustoms.java b/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivityCustoms.java index f42e521..0a4b61c 100644 --- a/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivityCustoms.java +++ b/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivityCustoms.java @@ -24,7 +24,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -35,14 +35,14 @@ public class CameraFragmentMainActivityCustoms extends AppCompatActivity { public static final String FRAGMENT_TAG = "camera"; - @Bind(R.id.settings_view) Button settingsView; - @Bind(R.id.flash_switch_view) Button flashSwitchView; - @Bind(R.id.front_back_camera_switcher) Button cameraSwitchView; - @Bind(R.id.record_button) Button recordButton; - @Bind(R.id.photo_video_camera_switcher) Button mediaActionSwitchView; + @BindView(R.id.settings_view) Button settingsView; + @BindView(R.id.flash_switch_view) Button flashSwitchView; + @BindView(R.id.front_back_camera_switcher) Button cameraSwitchView; + @BindView(R.id.record_button) Button recordButton; + @BindView(R.id.photo_video_camera_switcher) Button mediaActionSwitchView; - @Bind(R.id.cameraLayout) View cameraLayout; - @Bind(R.id.addCameraButton) View addCameraButton; + @BindView(R.id.cameraLayout) View cameraLayout; + @BindView(R.id.addCameraButton) View addCameraButton; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/build.gradle b/build.gradle index 3b4ec7f..21f6949 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,15 @@ buildscript { repositories { jcenter() + // to find com.android.tools.build:gradle:3.0.1 + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -22,6 +27,6 @@ ext { sdk = 25 buildTools = "25.0.0" //keep 25.0.0 for Continuous Integration minSdk = 10 - libraryVersion = "1.0.8" + libraryVersion = "1.0.8fork" supportVersion = "25.0.0" } 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 3daf714..f9ae216 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 @@ -701,6 +701,9 @@ public final class Camera2Manager extends BaseCameraManager extends Fragment implements Ca //} protected void setFlashMode(@Flash.FlashMode int mode) { + if (mode == currentFlashMode) + return; this.currentFlashMode = mode; onFlashModeChanged(); } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5b74428..6696a4b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu May 11 11:10:14 CEST 2017 +#Mon Jan 29 18:47:55 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip