Revert "Switch to using separate PreferenceScreens (so we can later move to... (4d273de1) · Commits · e / os / Camera

app/src/main/java/net/sourceforge/opencamera/MainActivity.java

+1 −47

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ import androidx.appcompat.app.AppCompatActivity;

		/** The main Activity for Open Camera.
		*/
		public class MainActivity extends AppCompatActivity implements PreferenceFragment.OnPreferenceStartFragmentCallback {
		public class MainActivity extends AppCompatActivity {
		private static final String TAG = "MainActivity";

		private static int activity_count = 0;
		@@ -3331,45 +3331,6 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
		editor.apply();
		}

		@Override
		public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
		if( MyDebug.LOG ) {
		Log.d(TAG, "onPreferenceStartFragment");
		Log.d(TAG, "pref: " + pref.getFragment());
		}

		// instantiate the new fragment
		//final Bundle args = pref.getExtras();
		// we want to pass the caller preference fragment's bundle to the new sub-screen (this will be a
		// copy of the bundle originally created in openSettings()
		final Bundle args = new Bundle(caller.getArguments());

		final Fragment fragment = Fragment.instantiate(this, pref.getFragment(), args);
		fragment.setTargetFragment(caller, 0);
		if( MyDebug.LOG )
		Log.d(TAG, "replace fragment");
		/*getFragmentManager().beginTransaction()
		.replace(R.id.content, fragment)
		.addToBackStack(null)
		.commit();*/
		getFragmentManager().beginTransaction().add(android.R.id.content, fragment, "PREFERENCE_FRAGMENT_"+pref.getFragment()).addToBackStack(null).commitAllowingStateLoss();

		/*
		// AndroidX version:
		final Fragment fragment = getSupportFragmentManager().getFragmentFactory().instantiate(
		getClassLoader(),
		pref.getFragment());
		fragment.setArguments(args);
		fragment.setTargetFragment(caller, 0);
		// replace the existing fragment with the new fragment:
		getSupportFragmentManager().beginTransaction()
		.replace(R.id.content, fragment)
		.addToBackStack(null)
		.commit();
		*/
		return true;
		}

		public void updateForSettings(boolean update_camera) {
		updateForSettings(update_camera, null);
		}
		@@ -3728,13 +3689,6 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
		}
		}

		public boolean isSettingsOnBackPressedCallbackEnabled() {
		if( settingsOnBackPressedCallback != null ) {
		return settingsOnBackPressedCallback.isEnabled();
		}
		return false;
		}

		public void enableSettingsOnBackPressedCallback(boolean enabled) {
		if( MyDebug.LOG )
		Log.d(TAG, "enableSettingsOnBackPressedCallback: " + enabled);

app/src/main/java/net/sourceforge/opencamera/MyPreferenceFragment.java

+831 −36

File changed.

Preview size limit exceeded, changes collapsed.

app/src/main/java/net/sourceforge/opencamera/PreferenceSubCameraControlsMore.java

deleted100644 → 0

+0 −248

Original line number	Diff line number	Diff line
		package net.sourceforge.opencamera;

		import android.app.AlertDialog;
		import android.content.DialogInterface;
		import android.content.SharedPreferences;
		import android.os.Build;
		import android.os.Bundle;
		import android.preference.ListPreference;
		import android.preference.Preference;
		import android.preference.PreferenceGroup;
		import android.preference.PreferenceManager;
		import android.util.Log;
		import android.widget.Toast;

		import net.sourceforge.opencamera.ui.FolderChooserDialog;

		import java.io.File;

		public class PreferenceSubCameraControlsMore extends PreferenceSubScreen {
		private static final String TAG = "PfSubCameraControlsMore";

		@Override
		public void onCreate(Bundle savedInstanceState) {
		if( MyDebug.LOG )
		Log.d(TAG, "onCreate");
		super.onCreate(savedInstanceState);
		addPreferencesFromResource(R.xml.preferences_sub_camera_controls_more);

		final Bundle bundle = getArguments();
		/*final int cameraId = bundle.getInt("cameraId");
		if( MyDebug.LOG )
		Log.d(TAG, "cameraId: " + cameraId);
		final int nCameras = bundle.getInt("nCameras");
		if( MyDebug.LOG )
		Log.d(TAG, "nCameras: " + nCameras);*/

		final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity());

		if( Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2 ) {
		// BluetoothLeService requires Android 4.3+
		Preference pref = findPreference("preference_screen_remote_control");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_camera_controls_more");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		final boolean can_disable_shutter_sound = bundle.getBoolean("can_disable_shutter_sound");
		if( MyDebug.LOG )
		Log.d(TAG, "can_disable_shutter_sound: " + can_disable_shutter_sound);
		if( Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1 \|\| !can_disable_shutter_sound ) {
		// Camera.enableShutterSound requires JELLY_BEAN_MR1 or greater
		Preference pref = findPreference("preference_shutter_sound");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_camera_controls_more");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		/*{
		EditTextPreference edit = (EditTextPreference)findPreference("preference_save_location");
		InputFilter filter = new InputFilter() {
		// whilst Android seems to allow any characters on internal memory, SD cards are typically formatted with FAT32
		String disallowed = "\|\\?*<\":>";
		public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
		for(int i=start;i<end;i++) {
		if( disallowed.indexOf( source.charAt(i) ) != -1 ) {
		return "";
		}
		}
		return null;
		}
		};
		edit.getEditText().setFilters(new InputFilter[]{filter});
		}*/
		{
		Preference pref = findPreference("preference_save_location");
		pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference arg0) {
		if( MyDebug.LOG )
		Log.d(TAG, "clicked save location");
		MainActivity main_activity = (MainActivity)PreferenceSubCameraControlsMore.this.getActivity();
		if( main_activity.getStorageUtils().isUsingSAF() ) {
		main_activity.openFolderChooserDialogSAF(true);
		return true;
		}
		else if( MainActivity.useScopedStorage() ) {
		// we can't use an EditTextPreference (or MyEditTextPreference) due to having to support non-scoped-storage, or when SAF is enabled...
		// anyhow, this means we can share code when called from gallery long-press anyway
		AlertDialog.Builder alertDialog = main_activity.createSaveFolderDialog();
		final AlertDialog alert = alertDialog.create();
		// AlertDialog.Builder.setOnDismissListener() requires API level 17, so do it this way instead
		alert.setOnDismissListener(new DialogInterface.OnDismissListener() {
		@Override
		public void onDismiss(DialogInterface arg0) {
		if( MyDebug.LOG )
		Log.d(TAG, "save folder dialog dismissed");
		dialogs.remove(alert);
		}
		});
		alert.show();
		dialogs.add(alert);
		return true;
		}
		else {
		File start_folder = main_activity.getStorageUtils().getImageFolder();

		FolderChooserDialog fragment = new MyPreferenceFragment.SaveFolderChooserDialog();
		fragment.setStartFolder(start_folder);
		fragment.show(getFragmentManager(), "FOLDER_FRAGMENT");
		return true;
		}
		}
		});
		}

		if( Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP ) {
		Preference pref = findPreference("preference_using_saf");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_camera_controls_more");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}
		else {
		final Preference pref = findPreference("preference_using_saf");
		pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference arg0) {
		if( pref.getKey().equals("preference_using_saf") ) {
		if( MyDebug.LOG )
		Log.d(TAG, "user clicked saf");
		if( sharedPreferences.getBoolean(PreferenceKeys.UsingSAFPreferenceKey, false) ) {
		if( MyDebug.LOG )
		Log.d(TAG, "saf is now enabled");
		// seems better to alway re-show the dialog when the user selects, to make it clear where files will be saved (as the SAF location in general will be different to the non-SAF one)
		//String uri = sharedPreferences.getString(PreferenceKeys.getSaveLocationSAFPreferenceKey(), "");
		//if( uri.length() == 0 )
		{
		MainActivity main_activity = (MainActivity)PreferenceSubCameraControlsMore.this.getActivity();
		Toast.makeText(main_activity, R.string.saf_select_save_location, Toast.LENGTH_SHORT).show();
		main_activity.openFolderChooserDialogSAF(true);
		}
		}
		else {
		if( MyDebug.LOG )
		Log.d(TAG, "saf is now disabled");
		}
		}
		return false;
		}
		});
		}

		{
		final Preference pref = findPreference("preference_calibrate_level");
		pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference arg0) {
		if( pref.getKey().equals("preference_calibrate_level") ) {
		if( MyDebug.LOG )
		Log.d(TAG, "user clicked calibrate level option");
		AlertDialog.Builder alertDialog = new AlertDialog.Builder(PreferenceSubCameraControlsMore.this.getActivity());
		alertDialog.setTitle(getActivity().getResources().getString(R.string.preference_calibrate_level));
		alertDialog.setMessage(R.string.preference_calibrate_level_dialog);
		alertDialog.setPositiveButton(R.string.preference_calibrate_level_calibrate, new DialogInterface.OnClickListener() {
		public void onClick(DialogInterface dialog, int id) {
		if( MyDebug.LOG )
		Log.d(TAG, "user clicked calibrate level");
		MainActivity main_activity = (MainActivity)PreferenceSubCameraControlsMore.this.getActivity();
		if( main_activity.getPreview().hasLevelAngleStable() ) {
		double current_level_angle = main_activity.getPreview().getLevelAngleUncalibrated();
		SharedPreferences.Editor editor = sharedPreferences.edit();
		editor.putFloat(PreferenceKeys.CalibratedLevelAnglePreferenceKey, (float)current_level_angle);
		editor.apply();
		main_activity.getPreview().updateLevelAngles();
		Toast.makeText(main_activity, R.string.preference_calibrate_level_calibrated, Toast.LENGTH_SHORT).show();
		}
		}
		});
		alertDialog.setNegativeButton(R.string.preference_calibrate_level_reset, new DialogInterface.OnClickListener() {
		public void onClick(DialogInterface dialog, int id) {
		if( MyDebug.LOG )
		Log.d(TAG, "user clicked reset calibration level");
		MainActivity main_activity = (MainActivity)PreferenceSubCameraControlsMore.this.getActivity();
		SharedPreferences.Editor editor = sharedPreferences.edit();
		editor.putFloat(PreferenceKeys.CalibratedLevelAnglePreferenceKey, 0.0f);
		editor.apply();
		main_activity.getPreview().updateLevelAngles();
		Toast.makeText(main_activity, R.string.preference_calibrate_level_calibration_reset, Toast.LENGTH_SHORT).show();
		}
		});
		final AlertDialog alert = alertDialog.create();
		// AlertDialog.Builder.setOnDismissListener() requires API level 17, so do it this way instead
		alert.setOnDismissListener(new DialogInterface.OnDismissListener() {
		@Override
		public void onDismiss(DialogInterface arg0) {
		if( MyDebug.LOG )
		Log.d(TAG, "calibration dialog dismissed");
		dialogs.remove(alert);
		}
		});
		alert.show();
		dialogs.add(alert);
		return false;
		}
		return false;
		}
		});
		}

		MyPreferenceFragment.setSummary(findPreference("preference_save_photo_prefix"));
		MyPreferenceFragment.setSummary(findPreference("preference_save_video_prefix"));

		setupDependencies();

		if( MyDebug.LOG )
		Log.d(TAG, "onCreate done");
		}

		/** Programmatically set up dependencies for preference types (e.g., ListPreference) that don't
		* support this in xml (such as SwitchPreference and CheckBoxPreference), or where this depends
		* on the device (e.g., Android version).
		*/
		private void setupDependencies() {
		// set up dependency for preference_audio_noise_control_sensitivity on preference_audio_control
		ListPreference pref = (ListPreference)findPreference("preference_audio_control");
		if( pref != null ) { // may be null if preference not supported
		pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
		@Override
		public boolean onPreferenceChange(Preference arg0, Object newValue) {
		String value = newValue.toString();
		setAudioNoiseControlSensitivityDependency(value);
		return true;
		}
		});
		setAudioNoiseControlSensitivityDependency(pref.getValue()); // ensure dependency is enabled/disabled as required for initial value
		}
		}

		private void setAudioNoiseControlSensitivityDependency(String newValue) {
		Preference dependent = findPreference("preference_audio_noise_control_sensitivity");
		if( dependent != null ) { // just in case
		boolean enable_dependent = "noise".equals(newValue);
		if( MyDebug.LOG )
		Log.d(TAG, "clicked audio control: " + newValue + " enable_dependent: " + enable_dependent);
		dependent.setEnabled(enable_dependent);
		}
		}

		}

app/src/main/java/net/sourceforge/opencamera/PreferenceSubGUI.java

deleted100644 → 0

+0 −121

Original line number	Diff line number	Diff line
		package net.sourceforge.opencamera;

		import android.content.SharedPreferences;
		import android.os.Build;
		import android.os.Bundle;
		import android.preference.Preference;
		import android.preference.PreferenceGroup;
		import android.preference.PreferenceManager;
		import android.util.Log;

		public class PreferenceSubGUI extends PreferenceSubScreen {
		private static final String TAG = "PreferenceSubGUI";

		@Override
		public void onCreate(Bundle savedInstanceState) {
		if( MyDebug.LOG )
		Log.d(TAG, "onCreate");
		super.onCreate(savedInstanceState);
		addPreferencesFromResource(R.xml.preferences_sub_gui);

		final Bundle bundle = getArguments();

		final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity());

		final boolean camera_open = bundle.getBoolean("camera_open");
		if( MyDebug.LOG )
		Log.d(TAG, "camera_open: " + camera_open);

		final boolean supports_face_detection = bundle.getBoolean("supports_face_detection");
		if( MyDebug.LOG )
		Log.d(TAG, "supports_face_detection: " + supports_face_detection);

		final boolean supports_flash = bundle.getBoolean("supports_flash");
		if( MyDebug.LOG )
		Log.d(TAG, "supports_flash: " + supports_flash);

		final boolean supports_auto_stabilise = bundle.getBoolean("supports_auto_stabilise");
		if( MyDebug.LOG )
		Log.d(TAG, "supports_auto_stabilise: " + supports_auto_stabilise);

		final boolean supports_raw = bundle.getBoolean("supports_raw");
		if( MyDebug.LOG )
		Log.d(TAG, "supports_raw: " + supports_raw);

		final boolean supports_white_balance_lock = bundle.getBoolean("supports_white_balance_lock");
		if( MyDebug.LOG )
		Log.d(TAG, "supports_white_balance_lock: " + supports_white_balance_lock);

		final boolean supports_exposure_lock = bundle.getBoolean("supports_exposure_lock");
		if( MyDebug.LOG )
		Log.d(TAG, "supports_exposure_lock: " + supports_exposure_lock);

		final boolean is_multi_cam = bundle.getBoolean("is_multi_cam");
		if( MyDebug.LOG )
		Log.d(TAG, "is_multi_cam: " + is_multi_cam);

		if( Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT ) {
		// Some immersive modes require KITKAT - simpler to require Kitkat for any of the menu options
		Preference pref = findPreference("preference_immersive_mode");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		if( !supports_face_detection && ( camera_open \|\| sharedPreferences.getBoolean(PreferenceKeys.FaceDetectionPreferenceKey, false) == false ) ) {
		// if camera not open, we'll think this setting isn't supported - but should only remove
		// this preference if it's set to the default (otherwise if user sets to a non-default
		// value that causes camera to not open, user won't be able to put it back to the
		// default!)
		Preference pref = findPreference("preference_show_face_detection");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		if( !supports_flash ) {
		Preference pref = findPreference("preference_show_cycle_flash");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		if( !supports_auto_stabilise ) {
		Preference pref = findPreference("preference_show_auto_level");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		if( !supports_raw ) {
		Preference pref = findPreference("preference_show_cycle_raw");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		if( !supports_white_balance_lock ) {
		Preference pref = findPreference("preference_show_white_balance_lock");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		if( !supports_exposure_lock ) {
		Preference pref = findPreference("preference_show_exposure_lock");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		if( !is_multi_cam ) {
		Preference pref = findPreference("preference_multi_cam_button");
		//PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");
		PreferenceGroup pg = (PreferenceGroup)this.findPreference("preferences_root");
		pg.removePreference(pref);
		}

		if( MyDebug.LOG )
		Log.d(TAG, "onCreate done");
		}
		}

app/src/main/java/net/sourceforge/opencamera/PreferenceSubLicences.java

deleted100644 → 0

+0 −122

Original line number	Diff line number	Diff line
		package net.sourceforge.opencamera;

		import android.app.AlertDialog;
		import android.content.DialogInterface;
		import android.os.Bundle;
		import android.preference.Preference;
		import android.util.Log;

		import java.io.IOException;
		import java.io.InputStream;
		import java.util.Scanner;

		public class PreferenceSubLicences extends PreferenceSubScreen {
		private static final String TAG = "PreferenceSubLicences";

		@Override
		public void onCreate(Bundle savedInstanceState) {
		if( MyDebug.LOG )
		Log.d(TAG, "onCreate");
		super.onCreate(savedInstanceState);
		addPreferencesFromResource(R.xml.preferences_sub_licences);

		{
		final Preference pref = findPreference("preference_licence_open_camera");
		pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference arg0) {
		if( pref.getKey().equals("preference_licence_open_camera") ) {
		if( MyDebug.LOG )
		Log.d(TAG, "user clicked open camera licence");
		// display the GPL v3 text
		displayTextDialog(R.string.preference_licence_open_camera, "gpl-3.0.txt");
		return false;
		}
		return false;
		}
		});
		}

		{
		final Preference pref = findPreference("preference_licence_androidx");
		pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference arg0) {
		if( pref.getKey().equals("preference_licence_androidx") ) {
		if( MyDebug.LOG )
		Log.d(TAG, "user clicked androidx licence");
		// display the Apache licence 2.0 text
		displayTextDialog(R.string.preference_licence_androidx, "androidx_LICENSE-2.0.txt");
		return false;
		}
		return false;
		}
		});
		}

		{
		final Preference pref = findPreference("preference_licence_google_icons");
		pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference arg0) {
		if( pref.getKey().equals("preference_licence_google_icons") ) {
		if( MyDebug.LOG )
		Log.d(TAG, "user clicked google material design icons licence");
		// display the Apache licence 2.0 text
		displayTextDialog(R.string.preference_licence_google_icons, "google_material_design_icons_LICENSE-2.0.txt");
		return false;
		}
		return false;
		}
		});
		}

		{
		final Preference pref = findPreference("preference_licence_online");
		pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference arg0) {
		if( pref.getKey().equals("preference_licence_online") ) {
		if( MyDebug.LOG )
		Log.d(TAG, "user clicked online licences");
		MainActivity main_activity = (MainActivity)PreferenceSubLicences.this.getActivity();
		main_activity.launchOnlineLicences();
		return false;
		}
		return false;
		}
		});
		}

		if( MyDebug.LOG )
		Log.d(TAG, "onCreate done");
		}

		/* Displays a dialog with text loaded from a file in assets.
		*/
		private void displayTextDialog(int title_id, String file) {
		try {
		InputStream inputStream = getActivity().getAssets().open(file);
		Scanner scanner = new Scanner(inputStream).useDelimiter("\\A");
		AlertDialog.Builder alertDialog = new AlertDialog.Builder(PreferenceSubLicences.this.getActivity());
		alertDialog.setTitle(getActivity().getResources().getString(title_id));
		alertDialog.setMessage(scanner.next());
		alertDialog.setPositiveButton(android.R.string.ok, null);
		final AlertDialog alert = alertDialog.create();
		// AlertDialog.Builder.setOnDismissListener() requires API level 17, so do it this way instead
		alert.setOnDismissListener(new DialogInterface.OnDismissListener() {
		@Override
		public void onDismiss(DialogInterface arg0) {
		if( MyDebug.LOG )
		Log.d(TAG, "text dialog dismissed");
		dialogs.remove(alert);
		}
		});
		alert.show();
		dialogs.add(alert);
		}
		catch(IOException e) {
		e.printStackTrace();
		}
		}
		}