mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4782 from nextcloud/internalLinkWording

Browse source 
use file/folder in "copy internal link" description
This commit is contained in:
Tobias Kaminsky 2019-11-01 15:17:11 +01:00 committed by GitHub
commit 62fc6fa53d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
View file

@ -140,6 +140,9 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
@BindView(R.id.copy_internal_link_icon)
ImageView internalLinkIcon;
@BindView(R.id.shareInternalLinkText)
TextView internalLinkText;
@Inject UserAccountManager accountManager;
public static FileDetailSharingFragment newInstance(OCFile file, Account account) {
@ -210,6 +213,9 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
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)));
return view;
}

8
src/main/res/layout/file_details_sharing_fragment.xml
View file

@ -206,17 +206,17 @@
android:orientation="vertical">
<TextView
android:id="@+id/copyInternalLink"
android:id="@+id/shareInternalLink"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_color"
android:text="@string/copy_internal_link" />
android:text="@string/share_internal_link" />
<TextView
android:id="@+id/copyInternalLinkSubline"
android:id="@+id/shareInternalLinkText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/copy_internal_link_subline" />
android:text="@string/share_internal_link_text" />
</LinearLayout>
</LinearLayout>

6
src/main/res/values/strings.xml
View file

@ -878,8 +878,6 @@
<string name="associated_account_not_found">Associated account not found!</string>
<string name="error_retrieving_file">Error retrieving file</string>
<string name="could_not_retrieve_url">Could not retrieve url</string>
<string name="copy_internal_link">Copy internal link</string>
<string name="copy_internal_link_subline">Only works for users with access to this folder</string>
<string name="failed_to_download">Failed to pass file to download manager</string>
<string name="failed_to_print">Failed to print file</string>
<string name="autoupload_disable_power_save_check">Disable power save check</string>
@ -902,4 +900,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="folder">folder</string>
<string name="file">file</string>
<string name="share_internal_link">Share internal link</string>
</resources>