Эх сурвалжийг харах

Split up share internal link

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 5 жил өмнө
parent
commit
78adcfb3d6

+ 5 - 2
src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -217,8 +217,11 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
         internalLinkIcon.getDrawable().mutate().setColorFilter(getResources().getColor(R.color.black),
                                                                PorterDuff.Mode.SRC_IN);
 
-        internalLinkText.setText(getString(R.string.share_internal_link_text, file.isFolder() ?
-            getString(R.string.folder) : getString(R.string.file)));
+        if (file.isFolder()) {
+            internalLinkText.setText(getString(R.string.share_internal_link_to_folder_text));
+        } else {
+            internalLinkText.setText(getString(R.string.share_internal_link_to_file_text));
+        }
 
         return view;
     }

+ 1 - 2
src/main/res/layout/file_details_sharing_fragment.xml

@@ -215,8 +215,7 @@
                 <TextView
                     android:id="@+id/shareInternalLinkText"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/share_internal_link_text" />
+                    android:layout_height="wrap_content" />
             </LinearLayout>
 
         </LinearLayout>

+ 2 - 1
src/main/res/values/strings.xml

@@ -905,7 +905,8 @@
     <string name="file_detail_activity_error">Error retrieving activities for file</string>
     <string name="no_mutliple_accounts_allowed">Only one account allowed</string>
     <string name="remote_file_fetch_failed">Failed to find file!</string>
-    <string name="share_internal_link_text">Only works for users with access to this %1$s</string>
+    <string name="share_internal_link_to_folder_text">Only works for users with access to this folder</string>
+    <string name="share_internal_link_to_file_text">Only works for users with access to this file</string>
     <string name="folder">folder</string>
     <string name="file">file</string>
     <string name="share_internal_link">Share internal link</string>