mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 13:15:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Polish UI to edit permissions

Browse source
This commit is contained in:
David A. Velasco 2016-01-11 15:34:41 +01:00
parent bba66e773d
commit e7901656a1
15 changed files with 130 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_action_delete.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 481 B

BIN
res/drawable-hdpi/ic_navigate_next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 353 B

BIN
res/drawable-mdpi/ic_action_delete.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 301 B

BIN
res/drawable-mdpi/ic_navigate_next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 256 B

BIN
res/drawable-xhdpi/ic_action_delete.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 407 B

BIN
res/drawable-xhdpi/ic_navigate_next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 292 B

BIN
res/drawable-xxhdpi/ic_action_delete.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 655 B

BIN
res/drawable-xxhdpi/ic_navigate_next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 499 B

BIN
res/drawable-xxxhdpi/ic_action_delete.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 552 B

BIN
res/drawable-xxxhdpi/ic_navigate_next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 386 B

84
res/layout/edit_share_layout.xml
View file

@ -1,21 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application
@author David A. Velasco
Copyright (C) 2015 ownCloud Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
tools:context="com.owncloud.android.ui.fragment.ShareFileFragment">
<CheckBox
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/canShareCheckBox"
android:text="@string/share_privilege_can_share"
/>
<CheckBox
<!--CheckBox
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/canEditCheckBox"
android:text="@string/share_privilege_can_edit"
/-->
<Switch
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/two_line_primary_text_size"
android:text="@string/share_privilege_can_edit"
android:id="@+id/canEditSwitch"
android:layout_gravity="start"
android:padding="@dimen/standard_half_padding"
android:layout_marginTop="@dimen/standard_half_margin"
android:background="@color/actionbar_start_color"
android:textColor="@color/white"
/>
<CheckBox
@ -42,29 +67,42 @@
android:visibility="gone"
/>
<!-- ImageView
<!-- CheckBox
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/canShareCheckBox"
android:text="@string/share_privilege_can_share"
/-->
<Switch
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/two_line_primary_text_size"
android:text="@string/share_privilege_can_share"
android:id="@+id/canShareSwitch"
android:layout_gravity="start"
android:padding="@dimen/standard_half_padding"
android:layout_marginTop="@dimen/standard_half_margin"
android:background="@color/actionbar_start_color"
android:textColor="@color/white"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/unshareButton"
android:src="@drawable/ic_cancel"
android:layout_gravity="center_horizontal"
/-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/unshareButton"
style="@style/ownCloud.Button"
android:drawableRight="@drawable/ic_cancel"
android:drawableEnd="@drawable/ic_cancel"
style="@style/Button.Primary"
android:theme="@style/Button.Primary"
android:drawableRight="@drawable/ic_action_delete"
android:drawableEnd="@drawable/ic_action_delete"
android:text="@string/edit_share_unshare"
android:layout_gravity="center_horizontal"
/>
<android.support.v7.widget.AppCompatButton
android:id="@+id/doneButton"
style="@style/ownCloud.Button"
android:layout_width="wrap_content"
style="@style/Button.Primary"
android:theme="@style/Button.Primary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/edit_share_done"

18
res/layout/share_user_item.xml
View file

@ -30,7 +30,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:textSize="16dip"
android:textSize="@dimen/two_line_primary_text_size"
android:text="@string/username"
android:id="@+id/userOrGroupName"
android:layout_margin="12dp"
@ -42,20 +42,20 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.1"
android:id="@+id/editShareButton"
android:src="@android:drawable/ic_menu_edit"
android:layout_marginRight="8dp"
android:layout_marginLeft="4dp"
android:id="@+id/unshareButton"
android:src="@drawable/ic_action_delete"
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_gravity="center_horizontal"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.1"
android:id="@+id/unshareButton"
android:src="@drawable/ic_cancel"
android:layout_marginRight="8dp"
android:layout_marginLeft="4dp"
android:id="@+id/editShareButton"
android:src="@drawable/ic_navigate_next"
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_gravity="center_horizontal"/>
</LinearLayout>

2
res/values/dims.xml
View file

@ -25,7 +25,9 @@
<dimen name="file_icon_size">32dp</dimen>
<dimen name="file_icon_size_grid">128dp</dimen>
<dimen name="standard_padding">16dp</dimen>
<dimen name="standard_half_padding">8dp</dimen>
<dimen name="standard_margin">16dp</dimen>
<dimen name="standard_half_margin">8dp</dimen>
<dimen name="two_line_primary_text_size">16sp</dimen>
<dimen name="two_line_secondary_text_size">14sp</dimen>

113
src/com/owncloud/android/ui/fragment/EditShareFragment.java
View file

@ -29,6 +29,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.Switch;
import android.widget.TextView;
import com.owncloud.android.R;
@ -149,52 +150,52 @@ public class EditShareFragment extends Fragment {
setListener = true;
}
int sharePermissions = mShare.getPermissions();
CheckBox checkBox;
CompoundButton compound;
checkBox = (CheckBox) editShareView.findViewById(R.id.canShareCheckBox);
checkBox.setChecked((sharePermissions & OCShare.SHARE_PERMISSION_FLAG) > 0);
compound = (CompoundButton) editShareView.findViewById(R.id.canShareSwitch);
compound.setChecked((sharePermissions & OCShare.SHARE_PERMISSION_FLAG) > 0);
if (setListener) {
checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
compound.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
}
checkBox = (CheckBox) editShareView.findViewById(R.id.canEditCheckBox);
compound = (CompoundButton) editShareView.findViewById(R.id.canEditSwitch);
int anyUpdatePermission =
OCShare.CREATE_PERMISSION_FLAG |
OCShare.UPDATE_PERMISSION_FLAG |
OCShare.DELETE_PERMISSION_FLAG
;
boolean canEdit = (sharePermissions & anyUpdatePermission) > 0;
checkBox.setChecked(canEdit);
compound.setChecked(canEdit);
if (setListener) {
checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
compound.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
}
if (mFile.isFolder()) {
checkBox = (CheckBox) editShareView.findViewById(R.id.canEditCreateCheckBox);
compound = (CompoundButton) editShareView.findViewById(R.id.canEditCreateCheckBox);
if (canEdit) {
checkBox.setVisibility(View.VISIBLE);
checkBox.setChecked((sharePermissions & OCShare.CREATE_PERMISSION_FLAG) > 0);
compound.setVisibility(View.VISIBLE);
compound.setChecked((sharePermissions & OCShare.CREATE_PERMISSION_FLAG) > 0);
}
if (setListener) {
checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
compound.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
}
checkBox = (CheckBox) editShareView.findViewById(R.id.canEditChangeCheckBox);
compound = (CompoundButton) editShareView.findViewById(R.id.canEditChangeCheckBox);
if (canEdit) {
checkBox.setVisibility(View.VISIBLE);
checkBox.setChecked((sharePermissions & OCShare.UPDATE_PERMISSION_FLAG) > 0);
compound.setVisibility(View.VISIBLE);
compound.setChecked((sharePermissions & OCShare.UPDATE_PERMISSION_FLAG) > 0);
}
if (setListener) {
checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
compound.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
}
checkBox = (CheckBox) editShareView.findViewById(R.id.canEditDeleteCheckBox);
compound = (CompoundButton) editShareView.findViewById(R.id.canEditDeleteCheckBox);
if (canEdit) {
checkBox.setVisibility(View.VISIBLE);
checkBox.setChecked((sharePermissions & OCShare.DELETE_PERMISSION_FLAG) > 0);
compound.setVisibility(View.VISIBLE);
compound.setChecked((sharePermissions & OCShare.DELETE_PERMISSION_FLAG) > 0);
}
if (setListener) {
checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
compound.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
}
} // else, trust in visibility GONE in R.layout.edit_share_layout
@ -225,13 +226,14 @@ public class EditShareFragment extends Fragment {
implements CompoundButton.OnCheckedChangeListener {
/**
* Called by R.id.shareViaLinkSectionSwitch to create or delete a public link.
* Called by every {@link Switch} and {@link CheckBox} in the fragment to update
* the state of its associated permission.
*
* @param checkBoxView {@link CheckBox} toggled by the user
* @param compound {@link CompoundButton} toggled by the user
* @param isChecked New switch state.
*/
@Override
public void onCheckedChanged(CompoundButton checkBoxView, boolean isChecked) {
public void onCheckedChanged(CompoundButton compound, boolean isChecked) {
if (!isResumed()) {
// very important, setCheched(...) is called automatically during
// Fragment recreation on device rotations
@ -239,9 +241,9 @@ public class EditShareFragment extends Fragment {
}
/// else, getView() cannot be NULL
CheckBox subordinate;
switch(checkBoxView.getId()) {
case R.id.canShareCheckBox:
CompoundButton subordinate;
switch(compound.getId()) {
case R.id.canShareSwitch:
Log_OC.v(TAG, "canShareCheckBox toggled to " + isChecked);
/// TODO?
// option 1: direct update approach
@ -252,14 +254,14 @@ public class EditShareFragment extends Fragment {
// option 2: nothing?
break;
case R.id.canEditCheckBox:
case R.id.canEditSwitch:
Log_OC.v(TAG, "canEditCheckBox toggled to " + isChecked);
/// sync subordinate CheckBoxes
if (mFile.isFolder()) {
if (isChecked) {
for (int i = 0; i < sSubordinateCheckBoxIds.length; i++) {
//noinspection ConstantConditions, prevented in the method beginning
subordinate = (CheckBox) getView().findViewById(sSubordinateCheckBoxIds[i]);
subordinate = (CompoundButton) getView().findViewById(sSubordinateCheckBoxIds[i]);
subordinate.setVisibility(View.VISIBLE);
if (!subordinate.isChecked()) {
toggleDisablingListener(subordinate);
@ -268,7 +270,7 @@ public class EditShareFragment extends Fragment {
} else {
for (int i = 0; i < sSubordinateCheckBoxIds.length; i++) {
//noinspection ConstantConditions, prevented in the method beginning
subordinate = (CheckBox) getView().findViewById(sSubordinateCheckBoxIds[i]);
subordinate = (CompoundButton) getView().findViewById(sSubordinateCheckBoxIds[i]);
subordinate.setVisibility(View.GONE);
if (subordinate.isChecked()) {
toggleDisablingListener(subordinate);
@ -281,19 +283,19 @@ public class EditShareFragment extends Fragment {
case R.id.canEditCreateCheckBox:
Log_OC.v(TAG, "canEditCreateCheckBox toggled to " + isChecked);
syncCanEditCheckBox(checkBoxView, isChecked);
syncCanEditSwitch(compound, isChecked);
/// TODO - anything else?; only if modification-on-change approach is taken
break;
case R.id.canEditChangeCheckBox:
Log_OC.v(TAG, "canEditChangeCheckBox toggled to " + isChecked);
syncCanEditCheckBox(checkBoxView, isChecked);
syncCanEditSwitch(compound, isChecked);
/// TODO - anything else?; only if modification-on-change approach is taken
break;
case R.id.canEditDeleteCheckBox:
Log_OC.v(TAG, "canEditDeleteCheckBox toggled to " + isChecked);
syncCanEditCheckBox(checkBoxView, isChecked);
syncCanEditSwitch(compound, isChecked);
/// TODO - anything else?; only if modification-on-change approach is taken
break;
}
@ -309,20 +311,20 @@ public class EditShareFragment extends Fragment {
}
/**
* Sync value of "can edit" CheckBox according to a change in one of its subordinate checkboxes.
* Sync value of "can edit" {@link Switch} according to a change in one of its subordinate checkboxes.
*
* If all the subordinates are disabled, "can edit" has to be disabled.
*
* If any subordinate is enabled, "can edit" has to be enabled.
*
* @param subordinateCheckBoxView Subordinate CheckBox that was changed.
* @param subordinateCheckBoxView Subordinate {@link CheckBox} that was changed.
* @param isChecked 'true' iif subordinateCheckBoxView was checked.
*/
private void syncCanEditCheckBox(View subordinateCheckBoxView, boolean isChecked) {
CheckBox canEditCheckBox = (CheckBox) getView().findViewById(R.id.canEditCheckBox);
private void syncCanEditSwitch(View subordinateCheckBoxView, boolean isChecked) {
CompoundButton canEditCompound = (CompoundButton) getView().findViewById(R.id.canEditSwitch);
if (isChecked) {
if (!canEditCheckBox.isChecked()) {
toggleDisablingListener(canEditCheckBox);
if (!canEditCompound.isChecked()) {
toggleDisablingListener(canEditCompound);
}
} else {
boolean allDisabled = true;
@ -332,8 +334,8 @@ public class EditShareFragment extends Fragment {
!((CheckBox) getView().findViewById(sSubordinateCheckBoxIds[i])).isChecked()
;
}
if (canEditCheckBox.isChecked() && allDisabled) {
toggleDisablingListener(canEditCheckBox);
if (canEditCompound.isChecked() && allDisabled) {
toggleDisablingListener(canEditCompound);
for (int i=0; i<sSubordinateCheckBoxIds.length; i++) {
getView().findViewById(sSubordinateCheckBoxIds[i]).setVisibility(View.GONE);
}
@ -343,14 +345,15 @@ public class EditShareFragment extends Fragment {
/**
* Toggle value of received CheckBox granting that its change listener is not called.
* Toggle value of received {@link CompoundButton} granting that its change listener is not called.
*
* @param checkBoxView CheckBox to toggle without reporting to the change listener
* @param compound {@link CompoundButton} (switch or checkBox) to toggle without reporting to
* the change listener
*/
private void toggleDisablingListener(CheckBox checkBoxView) {
checkBoxView.setOnCheckedChangeListener(null);
checkBoxView.toggle();
checkBoxView.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
private void toggleDisablingListener(CompoundButton compound) {
compound.setOnCheckedChangeListener(null);
compound.toggle();
compound.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
}
}
@ -388,13 +391,13 @@ public class EditShareFragment extends Fragment {
@Override
public void onClick(View v) {
SharePermissionsBuilder spb = new SharePermissionsBuilder();
spb.setSharePermission(getCanShareCheckBox().isChecked());
spb.setSharePermission(getCanShareSwitch().isChecked());
if (mFile.isFolder()) {
spb.setUpdatePermission(getCanEditChangeCheckBox().isChecked())
.setCreatePermission(getCanEditCreateCheckBox().isChecked())
.setDeletePermission(getCanEditDeleteCheckBox().isChecked());
} else {
spb.setUpdatePermission(getCanEditCheckBox().isChecked());
spb.setUpdatePermission(getCanEditSwitch().isChecked());
}
int permissions = spb.build();
@ -408,23 +411,23 @@ public class EditShareFragment extends Fragment {
}
/**
* Shortcut to access {@link CheckBox} R.id.canShareCheckBox
* Shortcut to access {@link Switch} R.id.canShareSwitch
*
* @return {@link CheckBox} R.id.canShareCheckBox or null if called before
* @return {@link Switch} R.id.canShareCheckBox or null if called before
* {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} finished.
*/
private CheckBox getCanShareCheckBox() {
return (CheckBox) getView().findViewById(R.id.canShareCheckBox);
private Switch getCanShareSwitch() {
return (Switch) getView().findViewById(R.id.canShareSwitch);
}
/**
* Shortcut to access {@link CheckBox} R.id.canEditCheckBox
* Shortcut to access {@link Switch} R.id.canEditSwitch
*
* @return {@link CheckBox} R.id.canEditCheckBox or null if called before
* @return {@link Switch} R.id.canEditSwitch or null if called before
* {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} finished.
*/
private CheckBox getCanEditCheckBox() {
return (CheckBox) getView().findViewById(R.id.canEditCheckBox);
private Switch getCanEditSwitch() {
return (Switch) getView().findViewById(R.id.canEditSwitch);
}
/**

7
src/com/owncloud/android/ui/fragment/ShareFileFragment.java
View file

@ -206,13 +206,6 @@ public class ShareFileFragment extends Fragment
}
});
// Switch to create public share
mOnShareViaLinkSwitchCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
}
};
// Set listener for user actions on switch for sharing/unsharing via link
initShareViaLinkListener(view);