From 9b395b001921644f4445aecc8d8d076d3322321b Mon Sep 17 00:00:00 2001 From: florent champigny Date: Wed, 27 Sep 2017 18:36:38 +0200 Subject: [PATCH] updated sample --- app/src/main/AndroidManifest.xml | 4 ++-- ...{MainActivity.java => CameraFragmentMainActivity.java} | 8 ++++---- ...ustoms.java => CameraFragmentMainActivityCustoms.java} | 8 ++++---- ...activity_main.xml => camerafragment_activity_main.xml} | 0 ...stoms.xml => camerafragment_activity_main_customs.xml} | 0 ...mple_widgets.xml => camerafragment_sample_widgets.xml} | 0 6 files changed, 10 insertions(+), 10 deletions(-) rename app/src/main/java/com/github/florent37/camerafragment/sample/{MainActivity.java => CameraFragmentMainActivity.java} (98%) rename app/src/main/java/com/github/florent37/camerafragment/sample/{MainActivityCustoms.java => CameraFragmentMainActivityCustoms.java} (97%) rename app/src/main/res/layout/{activity_main.xml => camerafragment_activity_main.xml} (100%) rename app/src/main/res/layout/{activity_main_customs.xml => camerafragment_activity_main_customs.xml} (100%) rename app/src/main/res/layout/{sample_widgets.xml => camerafragment_sample_widgets.xml} (100%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a7e0780..0e44469 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,13 +21,13 @@ android:theme="@style/ThemeFullscreen" /> diff --git a/app/src/main/java/com/github/florent37/camerafragment/sample/MainActivity.java b/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivity.java similarity index 98% rename from app/src/main/java/com/github/florent37/camerafragment/sample/MainActivity.java rename to app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivity.java index cf46e05..45d8459 100644 --- a/app/src/main/java/com/github/florent37/camerafragment/sample/MainActivity.java +++ b/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivity.java @@ -34,7 +34,7 @@ import butterknife.Bind; import butterknife.ButterKnife; import butterknife.OnClick; -public class MainActivity extends AppCompatActivity { +public class CameraFragmentMainActivity extends AppCompatActivity { public static final String FRAGMENT_TAG = "camera"; private static final int REQUEST_CAMERA_PERMISSIONS = 931; @@ -63,7 +63,7 @@ public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + setContentView(R.layout.camerafragment_activity_main); ButterKnife.bind(this); } @@ -165,13 +165,13 @@ public class MainActivity extends AppCompatActivity { //cameraFragment.setResultListener(new CameraFragmentResultListener() { // @Override // public void onVideoRecorded(String filePath) { - // Intent intent = PreviewActivity.newIntentVideo(MainActivity.this, filePath); + // Intent intent = PreviewActivity.newIntentVideo(CameraFragmentMainActivity.this, filePath); // startActivityForResult(intent, REQUEST_PREVIEW_CODE); // } // // @Override // public void onPhotoTaken(byte[] bytes, String filePath) { - // Intent intent = PreviewActivity.newIntentPhoto(MainActivity.this, filePath); + // Intent intent = PreviewActivity.newIntentPhoto(CameraFragmentMainActivity.this, filePath); // startActivityForResult(intent, REQUEST_PREVIEW_CODE); // } //}); diff --git a/app/src/main/java/com/github/florent37/camerafragment/sample/MainActivityCustoms.java b/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivityCustoms.java similarity index 97% rename from app/src/main/java/com/github/florent37/camerafragment/sample/MainActivityCustoms.java rename to app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivityCustoms.java index c3de537..f42e521 100644 --- a/app/src/main/java/com/github/florent37/camerafragment/sample/MainActivityCustoms.java +++ b/app/src/main/java/com/github/florent37/camerafragment/sample/CameraFragmentMainActivityCustoms.java @@ -28,7 +28,7 @@ import butterknife.Bind; import butterknife.ButterKnife; import butterknife.OnClick; -public class MainActivityCustoms extends AppCompatActivity { +public class CameraFragmentMainActivityCustoms extends AppCompatActivity { private static final int REQUEST_CAMERA_PERMISSIONS = 931; private static final int REQUEST_PREVIEW_CODE = 1001; @@ -47,7 +47,7 @@ public class MainActivityCustoms extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main_customs); + setContentView(R.layout.camerafragment_activity_main_customs); ButterKnife.bind(this); } @@ -71,13 +71,13 @@ public class MainActivityCustoms extends AppCompatActivity { cameraFragment.setResultListener(new CameraFragmentResultListener() { @Override public void onVideoRecorded(String filePath) { - Intent intent = PreviewActivity.newIntentVideo(MainActivityCustoms.this, filePath); + Intent intent = PreviewActivity.newIntentVideo(CameraFragmentMainActivityCustoms.this, filePath); startActivityForResult(intent, REQUEST_PREVIEW_CODE); } @Override public void onPhotoTaken(byte[] bytes, String filePath) { - Intent intent = PreviewActivity.newIntentPhoto(MainActivityCustoms.this, filePath); + Intent intent = PreviewActivity.newIntentPhoto(CameraFragmentMainActivityCustoms.this, filePath); startActivityForResult(intent, REQUEST_PREVIEW_CODE); } }); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/camerafragment_activity_main.xml similarity index 100% rename from app/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/camerafragment_activity_main.xml diff --git a/app/src/main/res/layout/activity_main_customs.xml b/app/src/main/res/layout/camerafragment_activity_main_customs.xml similarity index 100% rename from app/src/main/res/layout/activity_main_customs.xml rename to app/src/main/res/layout/camerafragment_activity_main_customs.xml diff --git a/app/src/main/res/layout/sample_widgets.xml b/app/src/main/res/layout/camerafragment_sample_widgets.xml similarity index 100% rename from app/src/main/res/layout/sample_widgets.xml rename to app/src/main/res/layout/camerafragment_sample_widgets.xml