Skip to content

Commit c34316f

Browse files
committed
Code refactored.
1 parent 1a14557 commit c34316f

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
106106

107107
@Inject UserAccountManager accountManager;
108108
@Inject ClientFactory clientFactory;
109-
@Inject ViewThemeUtils viewThemeUtils;
110109
@Inject EditorUtils editorUtils;
110+
@Inject ViewThemeUtils viewThemeUtils;
111111

112112
public static FileDetailSharingFragment newInstance(OCFile file, User user) {
113113
FileDetailSharingFragment fragment = new FileDetailSharingFragment();

app/src/main/res/drawable/ic_pencil_edit.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
android:height="24dp"
44
android:viewportWidth="24"
55
android:viewportHeight="24">
6-
<path
7-
android:pathData="M21.25,19.5C21.65,19.5 22,19.85 22,20.25C22,20.65 21.65,21 21.25,21L21.25,21L8.05,21L9.1,19.5ZM3.35,17.15L6.5,19.35L3,21L3.35,17.15ZM13.9,2.1C14.45,1.3 15.7,1.05 16.55,1.65L16.55,1.65L16.6863,1.7496C17.4688,2.3753 17.6184,3.4947 17.05,4.3L17.05,4.3L7.35,18.1L4.2,15.9Z"
8-
android:strokeWidth="1"
9-
android:fillColor="#262626"
10-
android:fillType="evenOdd"
11-
android:strokeColor="#00000000"/>
12-
</vector>
6+
<path
7+
android:pathData="M21.25,19.5C21.65,19.5 22,19.85 22,20.25C22,20.65 21.65,21 21.25,21L21.25,21L8.05,21L9.1,19.5ZM3.35,17.15L6.5,19.35L3,21L3.35,17.15ZM13.9,2.1C14.45,1.3 15.7,1.05 16.55,1.65L16.55,1.65L16.6863,1.7496C17.4688,2.3753 17.6184,3.4947 17.05,4.3L17.05,4.3L7.35,18.1L4.2,15.9Z"
8+
android:strokeWidth="1"
9+
android:fillColor="#262626"
10+
android:fillType="evenOdd"
11+
android:strokeColor="#00000000"/>
12+
</vector>

app/src/main/res/values/strings.xml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<string name="filedetails_sync_file">Sync</string>
110110
<string name="filedetails_renamed_in_upload_msg">File renamed %1$s during upload</string>
111111
<string name="list_layout">Listed layout</string>
112-
<string name="action_send_share">Sharing</string>
112+
<string name="action_send_share">Send/Share</string>
113113
<string name="common_yes">Yes</string>
114114
<string name="common_no">No</string>
115115
<string name="common_ok">OK</string>
@@ -980,19 +980,11 @@
980980
<string name="dialog_close">Close</string>
981981
<!-- sharing related strings start -->
982982
<string name="link_share_read_only">Read only</string>
983-
<string name="share_permission_read_only">Read only</string>
984-
<string name="share_permission_can_edit">Can edit</string>
985-
<string name="share_permission_file_drop">Filedrop only</string>
986-
<string name="permissions">Permissions</string>
987-
<string name="advance_permissions">Advanced Permissions</string>
988-
<string name="send_share">Send Share</string>
989-
<string name="no_share_permission_selected">Please select at least one permission to share.</string>
990983
<string name="share_link_empty_exp_date">You must select expiration date.</string>
991984
<string name="share_link_empty_note_message">Please enter note.</string>
992985
<string name="send_email">Send email</string>
993986
<string name="share_open_in">Open in…</string>
994987
<string name="share_advanced_permissions">Advanced permissions</string>
995-
<string name="share_send_new_email">Send new email</string>
996988
<string name="sharing_description">You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.</string>
997989
<string name="your_message">Your Message</string>
998990
<string name="personal_share_email">Personal share by mail</string>
@@ -1022,8 +1014,21 @@
10221014
<string name="create">Create</string>
10231015
<string name="select_one_template">Please select one template</string>
10241016
<string name="choose_template_helper_text">Please choose a template and enter a file name.</string>
1017+
<string name="share_permission_read_only">Read only</string>
1018+
<string name="share_permission_can_edit">Can edit</string>
1019+
<string name="share_permission_file_drop">Filedrop only</string>
10251020
<string name="share_permission_secure_file_drop">Secure file drop</string>
1021+
<string name="permissions">Permissions</string>
1022+
<string name="advance_permissions">Advanced Permissions</string>
10261023
<string name="common_next">Next</string>
1024+
<string name="send_share">Send Share</string>
1025+
<string name="no_share_permission_selected">Please select at least one permission to share.</string>
1026+
<string name="share_copy_link">Share &amp; Copy Link</string>
1027+
<string name="set_note">Set Note</string>
1028+
<string name="share_send_new_email">Send new email</string>
1029+
<string name="link_name">Link Name</string>
1030+
<string name="delete_link">Delete Link</string>
1031+
<string name="share_settings">Settings</string>
10271032
<string name="common_confirm">Confirm</string>
10281033
<string name="strict_mode">Strict mode: no HTTP connection allowed!</string>
10291034
<string name="destination_filename">Destination filename</string>

0 commit comments

Comments
 (0)