|
|
@@ -22,20 +22,23 @@ package com.owncloud.android.ui.dialog;
|
|
|
|
|
|
import android.app.Activity;
|
|
|
import android.app.Dialog;
|
|
|
+import android.content.DialogInterface;
|
|
|
+import android.content.Intent;
|
|
|
import android.os.Bundle;
|
|
|
import android.support.annotation.NonNull;
|
|
|
import android.support.v4.app.DialogFragment;
|
|
|
+import android.support.v7.app.AlertDialog;
|
|
|
import android.view.LayoutInflater;
|
|
|
import android.view.View;
|
|
|
import android.view.View.OnClickListener;
|
|
|
import android.view.ViewGroup;
|
|
|
-import android.widget.Button;
|
|
|
import android.widget.CheckBox;
|
|
|
import android.widget.TextView;
|
|
|
|
|
|
import com.owncloud.android.R;
|
|
|
import com.owncloud.android.datamodel.SyncedFolderItem;
|
|
|
import com.owncloud.android.lib.common.utils.Log_OC;
|
|
|
+import com.owncloud.android.ui.activity.FolderPickerActivity;
|
|
|
import com.owncloud.android.ui.dialog.parcel.SyncedFolderParcelable;
|
|
|
|
|
|
/**
|
|
|
@@ -46,15 +49,23 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
|
|
|
|
|
|
private final static String TAG = SyncedFolderPreferencesDialogFragment.class.getSimpleName();
|
|
|
public static final String SYNCED_FOLDER_PARCELABLE = "SyncedFolderParcelable";
|
|
|
+ public static final int REQUEST_CODE__SELECT_REMOTE_FOLDER = 0;
|
|
|
+
|
|
|
+ private CharSequence[] mUploadBehaviorItemStrings;
|
|
|
+ private CharSequence[] mUploadBehaviorItemValues;
|
|
|
|
|
|
protected View mView = null;
|
|
|
private CheckBox mUploadOnWifiCheckbox;
|
|
|
private CheckBox mUploadOnChargingCheckbox;
|
|
|
private CheckBox mUploadUseSubfoldersCheckbox;
|
|
|
+ private TextView mUploadBehaviorSummary;
|
|
|
+ private TextView mLocalFolderSummary;
|
|
|
+ private TextView mRemoteFolderSummary;
|
|
|
|
|
|
private SyncedFolderParcelable mSyncedFolder;
|
|
|
+ private int mSection;
|
|
|
|
|
|
- public static SyncedFolderPreferencesDialogFragment newInstance(SyncedFolderItem syncedFolder) {
|
|
|
+ public static SyncedFolderPreferencesDialogFragment newInstance(SyncedFolderItem syncedFolder, int section) {
|
|
|
SyncedFolderPreferencesDialogFragment dialogFragment = new SyncedFolderPreferencesDialogFragment();
|
|
|
|
|
|
if (syncedFolder == null) {
|
|
|
@@ -62,7 +73,7 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
|
|
|
}
|
|
|
|
|
|
Bundle args = new Bundle();
|
|
|
- args.putParcelable(SYNCED_FOLDER_PARCELABLE, new SyncedFolderParcelable(syncedFolder));
|
|
|
+ args.putParcelable(SYNCED_FOLDER_PARCELABLE, new SyncedFolderParcelable(syncedFolder, section));
|
|
|
dialogFragment.setArguments(args);
|
|
|
|
|
|
return dialogFragment;
|
|
|
@@ -72,7 +83,8 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
|
|
|
public void onAttach(Activity activity) {
|
|
|
super.onAttach(activity);
|
|
|
if (!(activity instanceof OnSyncedFolderPreferenceListener)) {
|
|
|
- throw new IllegalArgumentException("The host activity must implement " + OnSyncedFolderPreferenceListener.class.getCanonicalName());
|
|
|
+ throw new IllegalArgumentException("The host activity must implement "
|
|
|
+ + OnSyncedFolderPreferenceListener.class.getCanonicalName());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -82,11 +94,12 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
|
|
|
// keep the state of the fragment on configuration changes
|
|
|
setRetainInstance(true);
|
|
|
|
|
|
- // TODO check UX if it shouldn't be cancelable
|
|
|
- //setCancelable(false);
|
|
|
+ setCancelable(false);
|
|
|
mView = null;
|
|
|
|
|
|
mSyncedFolder = getArguments().getParcelable(SYNCED_FOLDER_PARCELABLE);
|
|
|
+ mUploadBehaviorItemStrings = getResources().getTextArray(R.array.pref_behaviour_entries);
|
|
|
+ mUploadBehaviorItemValues = getResources().getTextArray(R.array.pref_behaviour_entryValues);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -95,61 +108,128 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
|
|
|
|
|
|
mView = inflater.inflate(R.layout.folder_sync_settings_layout, container, false);
|
|
|
|
|
|
- Button save = (Button) mView.findViewById(R.id.save);
|
|
|
- save.setOnClickListener(new OnSyncedFolderSaveClickListener());
|
|
|
-
|
|
|
- Button cancel = (Button) mView.findViewById(R.id.cancel);
|
|
|
- cancel.setOnClickListener(new OnClickListener() {
|
|
|
- @Override
|
|
|
- public void onClick(View v) {
|
|
|
- dismiss();
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
((TextView) mView.findViewById(R.id.local_folder_summary)).setText(mSyncedFolder.getLocalPath());
|
|
|
((TextView) mView.findViewById(R.id.remote_folder_summary)).setText(mSyncedFolder.getRemotePath());
|
|
|
|
|
|
- // TODO add all necessary listeners and fields
|
|
|
+ setupDialogElements(mView);
|
|
|
+ setupListeners(mView);
|
|
|
+
|
|
|
+ return mView;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * find all relevant UI elements and set their values.
|
|
|
+ *
|
|
|
+ * @param view the parent view
|
|
|
+ */
|
|
|
+ private void setupDialogElements(View view) {
|
|
|
+ // find/saves UI elements
|
|
|
+ mLocalFolderSummary = (TextView) mView.findViewById(R.id.local_folder_summary);
|
|
|
+ mRemoteFolderSummary = (TextView) mView.findViewById(R.id.remote_folder_summary);
|
|
|
|
|
|
mUploadOnWifiCheckbox = (CheckBox) mView.findViewById(R.id.setting_instant_upload_on_wifi_checkbox);
|
|
|
mUploadOnChargingCheckbox = (CheckBox) mView.findViewById(R.id.setting_instant_upload_on_charging_checkbox);
|
|
|
mUploadUseSubfoldersCheckbox = (CheckBox) mView.findViewById(R.id
|
|
|
.setting_instant_upload_path_use_subfolders_checkbox);
|
|
|
|
|
|
- // TODO create separate setup methods to keep code easy to read
|
|
|
+ mUploadBehaviorSummary = (TextView) mView.findViewById(R.id.setting_instant_behaviour_summary);
|
|
|
|
|
|
- mView.findViewById(R.id.setting_instant_upload_on_wifi_container).setOnClickListener(new OnClickListener() {
|
|
|
- @Override
|
|
|
- public void onClick(View v) {
|
|
|
- // TODO save checkbox state to boolean
|
|
|
- mUploadOnWifiCheckbox.toggle();
|
|
|
- }
|
|
|
- });
|
|
|
+ // Set values
|
|
|
+ mLocalFolderSummary.setText(mSyncedFolder.getLocalPath());
|
|
|
+ mRemoteFolderSummary.setText(mSyncedFolder.getRemotePath());
|
|
|
|
|
|
- mView.findViewById(R.id.setting_instant_upload_on_charging_container).setOnClickListener(new OnClickListener() {
|
|
|
- @Override
|
|
|
- public void onClick(View v) {
|
|
|
- // TODO save checkbox state to boolean
|
|
|
- mUploadOnChargingCheckbox.toggle();
|
|
|
- }
|
|
|
- });
|
|
|
+ mUploadOnWifiCheckbox.setChecked(mSyncedFolder.getWifiOnly());
|
|
|
+ mUploadOnChargingCheckbox.setChecked(mSyncedFolder.getChargingOnly());
|
|
|
+ mUploadUseSubfoldersCheckbox.setChecked(mSyncedFolder.getSubfolderByDate());
|
|
|
+
|
|
|
+ mUploadBehaviorSummary.setText(mUploadBehaviorItemStrings[mSyncedFolder.getUploadAction()]);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * set (new) remote path on activity result of the folder picker activity. The result gets originally propagated
|
|
|
+ * to the underlying activity since the picker is an activity and the result can't get passed to the dialog
|
|
|
+ * fragment directly.
|
|
|
+ *
|
|
|
+ * @param path the remote path to be set
|
|
|
+ */
|
|
|
+ public void setRemoteFolderSummary(String path) {
|
|
|
+ mSyncedFolder.setRemotePath(path);
|
|
|
+ mRemoteFolderSummary.setText(path);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * setup all listeners.
|
|
|
+ *
|
|
|
+ * @param view the parent view
|
|
|
+ */
|
|
|
+ private void setupListeners(View view) {
|
|
|
+ view.findViewById(R.id.save).setOnClickListener(new OnSyncedFolderSaveClickListener());
|
|
|
+ view.findViewById(R.id.cancel).setOnClickListener(new OnSyncedFolderCancelClickListener());
|
|
|
+
|
|
|
+ view.findViewById(R.id.setting_instant_upload_on_wifi_container).setOnClickListener(
|
|
|
+ new OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View v) {
|
|
|
+ mSyncedFolder.setWifiOnly(!mSyncedFolder.getWifiOnly());
|
|
|
+ mUploadOnWifiCheckbox.toggle();
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ view.findViewById(R.id.setting_instant_upload_on_charging_container).setOnClickListener(
|
|
|
+ new OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View v) {
|
|
|
+ mSyncedFolder.setChargingOnly(!mSyncedFolder.getChargingOnly());
|
|
|
+ mUploadOnChargingCheckbox.toggle();
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ view.findViewById(R.id.setting_instant_upload_path_use_subfolders_container).setOnClickListener(
|
|
|
+ new OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View v) {
|
|
|
+ mSyncedFolder.setSubfolderByDate(!mSyncedFolder.getSubfolderByDate());
|
|
|
+ mUploadUseSubfoldersCheckbox.toggle();
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
- mView.findViewById(R.id.setting_instant_upload_path_use_subfolders_container).setOnClickListener(new OnClickListener() {
|
|
|
+ view.findViewById(R.id.remote_folder_container).setOnClickListener(new OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(View v) {
|
|
|
- // TODO save checkbox state to boolean
|
|
|
- mUploadUseSubfoldersCheckbox.toggle();
|
|
|
+ Intent action = new Intent(getActivity(), FolderPickerActivity.class);
|
|
|
+ action.putExtra(
|
|
|
+ FolderPickerActivity.EXTRA_ACTION, getResources().getText(R.string.choose_remote_folder));
|
|
|
+ getActivity().startActivityForResult(action, REQUEST_CODE__SELECT_REMOTE_FOLDER);
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- return mView;
|
|
|
+ view.findViewById(R.id.setting_instant_behaviour_container).setOnClickListener(
|
|
|
+ new OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View v) {
|
|
|
+ AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
|
|
+ builder.setTitle(R.string.prefs_instant_behaviour_dialogTitle)
|
|
|
+ .setSingleChoiceItems(getResources().getTextArray(R.array.pref_behaviour_entries),
|
|
|
+ mSyncedFolder.getUploadAction(),
|
|
|
+ new
|
|
|
+ DialogInterface.OnClickListener() {
|
|
|
+ public void onClick(DialogInterface dialog, int which) {
|
|
|
+ mSyncedFolder.setUploadAction(which);
|
|
|
+ mUploadBehaviorSummary.setText(SyncedFolderPreferencesDialogFragment
|
|
|
+ .this.mUploadBehaviorItemStrings[which]);
|
|
|
+ dialog.dismiss();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ builder.create().show();
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@NonNull
|
|
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
|
final Dialog dialog = super.onCreateDialog(savedInstanceState);
|
|
|
- dialog.setTitle(R.string.folder_sync_preferences);
|
|
|
+ dialog.setTitle(null);
|
|
|
return dialog;
|
|
|
}
|
|
|
|
|
|
@@ -165,11 +245,21 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
|
|
|
@Override
|
|
|
public void onClick(View v) {
|
|
|
dismiss();
|
|
|
- ((OnSyncedFolderPreferenceListener) getActivity()).onSaveSyncedFolderPreference();
|
|
|
+ ((OnSyncedFolderPreferenceListener) getActivity()).onSaveSyncedFolderPreference(mSyncedFolder);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private class OnSyncedFolderCancelClickListener implements OnClickListener {
|
|
|
+ @Override
|
|
|
+ public void onClick(View v) {
|
|
|
+ dismiss();
|
|
|
+ ((OnSyncedFolderPreferenceListener) getActivity()).onCancelSyncedFolderPreference();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
public interface OnSyncedFolderPreferenceListener {
|
|
|
- public void onSaveSyncedFolderPreference();
|
|
|
+ public void onSaveSyncedFolderPreference(SyncedFolderParcelable syncedFolder);
|
|
|
+
|
|
|
+ public void onCancelSyncedFolderPreference();
|
|
|
}
|
|
|
}
|
AndyScherzinger