fenix
/
Simple-Camera
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove the Focus before capture feature

This commit is contained in:
tibbi 2016-09-20 20:35:03 +02:00
parent 1c113e5472
commit 276c47d4f0
12 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/simplemobiletools/camera/Config.java
View File

@ -38,14 +38,6 @@ public class Config {
mPrefs.edit().putBoolean(Constants.USE_DCIM, useDCIM).apply();
}
public boolean getFocusBeforeCaptureEnabled() {
return mPrefs.getBoolean(Constants.FOCUS_BEFORE_CAPTURE, false);
}
public void setFocusBeforeCaptureEnabled(boolean enabled) {
mPrefs.edit().putBoolean(Constants.FOCUS_BEFORE_CAPTURE, enabled).apply();
}
public boolean getForceRatioEnabled() {
return mPrefs.getBoolean(Constants.FORCE_RATIO, true);
}

1
app/src/main/java/com/simplemobiletools/camera/Constants.java
View File

@ -10,7 +10,6 @@ public class Constants {
public static final String IS_FIRST_RUN = "is_first_run";
public static final String IS_DARK_THEME = "is_dark_theme";
public static final String USE_DCIM = "use_dcim";
public static final String FOCUS_BEFORE_CAPTURE = "focus_before_capture";
public static final String SOUND = "sound";
public static final String FORCE_RATIO = "force_ratio";
public static final String MAX_RESOLUTION = "max_resolution";

12
app/src/main/java/com/simplemobiletools/camera/Preview.java
View File

@ -59,7 +59,6 @@ public class Preview extends ViewGroup
private static boolean mIsSurfaceCreated;
private static boolean mSwitchToVideoAsap;
private static boolean mSetupPreviewAfterMeasure;
private static boolean mFocusBeforeCapture;
private static boolean mForceAspectRatio;
private static boolean mWasZooming;
private static int mLastClickX;
@ -156,7 +155,6 @@ public class Preview extends ViewGroup
}
final Config config = Config.newInstance(mContext);
mFocusBeforeCapture = config.getFocusBeforeCaptureEnabled();
mForceAspectRatio = config.getForceRatioEnabled();
return true;
@ -258,15 +256,7 @@ public class Preview extends ViewGroup
}
}
public void tryTakePicture() {
if (mFocusBeforeCapture) {
focusArea(true);
} else {
takePicture();
}
}
private void takePicture() {
public void takePicture() {
if (mCanTakePicture) {
if (mIsFlashEnabled) {
mParameters.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);

2
app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java
View File

@ -291,7 +291,7 @@ public class MainActivity extends SimpleActivity
private void handleShutter() {
if (mIsInPhotoMode) {
mShutterBtn.animate().rotationBy(90).start();
mPreview.tryTakePicture();
mPreview.takePicture();
} else {
final Resources res = getResources();
final boolean isRecording = mPreview.toggleRecording();

12
app/src/main/java/com/simplemobiletools/camera/activities/SettingsActivity.java
View File

@ -19,7 +19,6 @@ import butterknife.OnItemSelected;
public class SettingsActivity extends SimpleActivity {
@BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch;
@BindView(R.id.settings_use_dcim) SwitchCompat mUseDCIMSwitch;
@BindView(R.id.settings_focus_before_capture) SwitchCompat mFocusBeforeCaptureSwitch;
@BindView(R.id.settings_sound) SwitchCompat mSoundSwitch;
@BindView(R.id.settings_force_ratio) SwitchCompat mForceRatioSwitch;
@BindView(R.id.settings_max_photo_resolution) AppCompatSpinner mMaxPhotoResolutionSpinner;
@ -36,7 +35,6 @@ public class SettingsActivity extends SimpleActivity {
setupDarkTheme();
setupUseDCIM();
setupFocusBeforeCapture();
setupSound();
setupForceRatio();
setupMaxPhotoResolution();
@ -69,10 +67,6 @@ public class SettingsActivity extends SimpleActivity {
mUseDCIMSwitch.setChecked(mConfig.getUseDCIMFolder());
}
private void setupFocusBeforeCapture() {
mFocusBeforeCaptureSwitch.setChecked(mConfig.getFocusBeforeCaptureEnabled());
}
private void setupSound() {
mSoundSwitch.setChecked(mConfig.getIsSoundEnabled());
}
@ -102,12 +96,6 @@ public class SettingsActivity extends SimpleActivity {
mConfig.setUseDCIMFolder(mUseDCIMSwitch.isChecked());
}
@OnClick(R.id.settings_focus_before_capture_holder)
public void handleFocusBeforeCapture() {
mFocusBeforeCaptureSwitch.setChecked(!mFocusBeforeCaptureSwitch.isChecked());
mConfig.setFocusBeforeCaptureEnabled(mFocusBeforeCaptureSwitch.isChecked());
}
@OnClick(R.id.settings_sound_holder)
public void handleSound() {
mSoundSwitch.setChecked(!mSoundSwitch.isChecked());

26
app/src/main/res/layout/activity_settings.xml
View File

@ -64,32 +64,6 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_focus_before_capture_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
<TextView
android:id="@+id/settings_focus_before_capture_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:text="@string/focus_before_capture"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/settings_focus_before_capture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_sound_holder"
android:layout_width="match_parent"

1
app/src/main/res/values-de/strings.xml
View File

@ -19,7 +19,6 @@
<string name="settings">Einstellungen</string>
<string name="dark_theme">Dunkles Thema</string>
<string name="use_dcim_folder">Speichere Dateien im vorgegebenen DCIM Ordner</string>
<string name="focus_before_capture">Vor der Aufnahme fokussieren</string>
<string name="force_ratio">Erzwinge 16:9 Format</string>
<string name="max_photo_size">Maximale Fotoauflösung</string>
<string name="max_video_size">Maximale Videoauflösung</string>

1
app/src/main/res/values-it/strings.xml
View File

@ -19,7 +19,6 @@
<string name="settings">Impostazioni</string>
<string name="dark_theme">Tema scuro</string>
<string name="use_dcim_folder">Store media in the default DCIM folder</string>
<string name="focus_before_capture">Messa a fuoco prima della cattura</string>
<string name="force_ratio">Forza proporzione 16:9</string>
<string name="max_photo_size">Limite risoluzione foto</string>
<string name="max_video_size">Video resolution limit</string>

1
app/src/main/res/values-ja/strings.xml
View File

@ -19,7 +19,6 @@
<string name="settings">設定</string>
<string name="dark_theme">ダークテーマ</string>
<string name="use_dcim_folder">Store media in the default DCIM folder</string>
<string name="focus_before_capture">キャプチャ前に再度焦点を合わせる</string>
<string name="force_ratio">強制的に 16:9 レシオにする</string>
<string name="max_photo_size">写真解像度の限度</string>
<string name="max_video_size">Video resolution limit</string>

1
app/src/main/res/values-ru/strings.xml
View File

@ -19,7 +19,6 @@
<string name="settings">Настройки</string>
<string name="dark_theme">темная тема</string>
<string name="use_dcim_folder">Store media in the default DCIM folder</string>
<string name="focus_before_capture">Перефокусировка перед захватом</string>
<string name="force_ratio">Принудительное соотношение сторон 16:9</string>
<string name="max_photo_size">Лимит разрешения фото</string>
<string name="max_video_size">Video resolution limit</string>

1
app/src/main/res/values-sv/strings.xml
View File

@ -19,7 +19,6 @@
<string name="settings">Inställningar</string>
<string name="dark_theme">Mörkt tema</string>
<string name="use_dcim_folder">Store media in the default DCIM folder</string>
<string name="focus_before_capture">Fokusera om innan bildtagning</string>
<string name="force_ratio">Tvinga 16:9-förhållande</string>
<string name="max_photo_size">Bildupplösningsgräns</string>
<string name="max_video_size">Video resolution limit</string>

1
app/src/main/res/values/strings.xml
View File

@ -19,7 +19,6 @@
<string name="settings">Settings</string>
<string name="dark_theme">Dark theme</string>
<string name="use_dcim_folder">Store media in the default DCIM folder</string>
<string name="focus_before_capture">Refocus before capture</string>
<string name="force_ratio">Use 16:9 ratio</string>
<string name="max_photo_size">Photo resolution limit</string>
<string name="max_video_size">Video resolution limit</string>