gradle and butterknife updated, fixed exception while setting flash at startup

pull/85/head
Michael Schwartz 8 years ago
parent fb307da4b9
commit b1c04cc7b2
  1. 2
      app/build.gradle
  2. 20
      app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivity.java
  3. 16
      app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivityCustoms.java
  4. 11
      build.gradle
  5. 3
      camerafragment/src/main/java/com/github/florent37/camerafragment/internal/manager/impl/Camera2Manager.java
  6. 2
      camerafragment/src/main/java/com/github/florent37/camerafragment/internal/ui/BaseAnncaFragment.java
  7. 4
      gradle/wrapper/gradle-wrapper.properties

@ -15,6 +15,6 @@ android {
dependencies { dependencies {
compile "com.android.support:appcompat-v7:" + project.supportVersion 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') compile project(':camerafragment')
} }

@ -30,7 +30,7 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.Bind; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
@ -39,25 +39,25 @@ public class CameraFragmentMainActivity extends AppCompatActivity {
public static final String FRAGMENT_TAG = "camera"; public static final String FRAGMENT_TAG = "camera";
private static final int REQUEST_CAMERA_PERMISSIONS = 931; private static final int REQUEST_CAMERA_PERMISSIONS = 931;
private static final int REQUEST_PREVIEW_CODE = 1001; private static final int REQUEST_PREVIEW_CODE = 1001;
@Bind(R.id.settings_view) @BindView(R.id.settings_view)
CameraSettingsView settingsView; CameraSettingsView settingsView;
@Bind(R.id.flash_switch_view) @BindView(R.id.flash_switch_view)
FlashSwitchView flashSwitchView; FlashSwitchView flashSwitchView;
@Bind(R.id.front_back_camera_switcher) @BindView(R.id.front_back_camera_switcher)
CameraSwitchView cameraSwitchView; CameraSwitchView cameraSwitchView;
@Bind(R.id.record_button) @BindView(R.id.record_button)
RecordButton recordButton; RecordButton recordButton;
@Bind(R.id.photo_video_camera_switcher) @BindView(R.id.photo_video_camera_switcher)
MediaActionSwitchView mediaActionSwitchView; MediaActionSwitchView mediaActionSwitchView;
@Bind(R.id.record_duration_text) @BindView(R.id.record_duration_text)
TextView recordDurationText; TextView recordDurationText;
@Bind(R.id.record_size_mb_text) @BindView(R.id.record_size_mb_text)
TextView recordSizeText; TextView recordSizeText;
@Bind(R.id.cameraLayout) @BindView(R.id.cameraLayout)
View cameraLayout; View cameraLayout;
@Bind(R.id.addCameraButton) @BindView(R.id.addCameraButton)
View addCameraButton; View addCameraButton;
@Override @Override

@ -24,7 +24,7 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.Bind; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
@ -35,14 +35,14 @@ public class CameraFragmentMainActivityCustoms extends AppCompatActivity {
public static final String FRAGMENT_TAG = "camera"; public static final String FRAGMENT_TAG = "camera";
@Bind(R.id.settings_view) Button settingsView; @BindView(R.id.settings_view) Button settingsView;
@Bind(R.id.flash_switch_view) Button flashSwitchView; @BindView(R.id.flash_switch_view) Button flashSwitchView;
@Bind(R.id.front_back_camera_switcher) Button cameraSwitchView; @BindView(R.id.front_back_camera_switcher) Button cameraSwitchView;
@Bind(R.id.record_button) Button recordButton; @BindView(R.id.record_button) Button recordButton;
@Bind(R.id.photo_video_camera_switcher) Button mediaActionSwitchView; @BindView(R.id.photo_video_camera_switcher) Button mediaActionSwitchView;
@Bind(R.id.cameraLayout) View cameraLayout; @BindView(R.id.cameraLayout) View cameraLayout;
@Bind(R.id.addCameraButton) View addCameraButton; @BindView(R.id.addCameraButton) View addCameraButton;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

@ -1,10 +1,15 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
// to find com.android.tools.build:gradle:3.0.1
maven {
url 'https://maven.google.com/'
name 'Google'
}
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -22,6 +27,6 @@ ext {
sdk = 25 sdk = 25
buildTools = "25.0.0" //keep 25.0.0 for Continuous Integration buildTools = "25.0.0" //keep 25.0.0 for Continuous Integration
minSdk = 10 minSdk = 10
libraryVersion = "1.0.8" libraryVersion = "1.0.8fork"
supportVersion = "25.0.0" supportVersion = "25.0.0"
} }

@ -701,6 +701,9 @@ public final class Camera2Manager extends BaseCameraManager<String, TextureView.
} }
private void setFlashModeAndBuildPreviewRequest(@Configuration.FlashMode int flashMode) { private void setFlashModeAndBuildPreviewRequest(@Configuration.FlashMode int flashMode) {
// at init-phase we often do not have a previewRequestBuilder, so ignore that FlashBuildRequest and leave the default
if (previewRequestBuilder == null)
return;
try { try {
switch (flashMode) { switch (flashMode) {

@ -552,6 +552,8 @@ public abstract class BaseAnncaFragment<CameraId> extends Fragment implements Ca
//} //}
protected void setFlashMode(@Flash.FlashMode int mode) { protected void setFlashMode(@Flash.FlashMode int mode) {
if (mode == currentFlashMode)
return;
this.currentFlashMode = mode; this.currentFlashMode = mode;
onFlashModeChanged(); onFlashModeChanged();
} }

@ -1,6 +1,6 @@
#Thu May 11 11:10:14 CEST 2017 #Mon Jan 29 18:47:55 CET 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

Loading…
Cancel
Save