gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

avoid hardcoded product name in "Share from Nextcloud"

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2021-04-06 10:45:17 +02:00
parent bd8edbc17f
commit f24addbcf6
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt
View File

@ -33,7 +33,7 @@ import com.nextcloud.talk.components.filebrowser.controllers.BrowserController
import com.nextcloud.talk.controllers.ChatController import com.nextcloud.talk.controllers.ChatController
class AttachmentDialog(val activity: Activity, var chatController :ChatController) : BottomSheetDialog(activity) { class AttachmentDialog(val activity: Activity, var chatController: ChatController) : BottomSheetDialog(activity) {
@BindView(R.id.txt_attach_file_from_local) @BindView(R.id.txt_attach_file_from_local)
@JvmField @JvmField
@ -49,11 +49,13 @@ class AttachmentDialog(val activity: Activity, var chatController :ChatControlle
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val view = layoutInflater.inflate(R.layout.dialog_attachment, null) val view = layoutInflater.inflate(R.layout.dialog_attachment, null)
setContentView(view) setContentView(view)
window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
unbinder = ButterKnife.bind(this, view) unbinder = ButterKnife.bind(this, view)
attachFromCloud?.text = chatController.resources?.let {
String.format(it.getString(R.string.nc_upload_from_cloud), it.getString(R.string.nc_server_product_name))
}
attachFromLocal?.setOnClickListener { attachFromLocal?.setOnClickListener {
chatController.sendSelectLocalFileIntent() chatController.sendSelectLocalFileIntent()
dismiss() dismiss()

1
app/src/main/res/layout/dialog_attachment.xml
View File

@ -39,7 +39,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:padding="15dp" android:padding="15dp"
android:text="@string/nc_upload_from_nextcloud"
android:textSize="20sp" /> android:textSize="20sp" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/values/strings.xml
View File

@ -337,7 +337,7 @@
<!-- Upload --> <!-- Upload -->
<string name="nc_upload_local_file">Upload local file</string> <string name="nc_upload_local_file">Upload local file</string>
<string name="nc_upload_from_nextcloud">Share from Nextcloud</string> <string name="nc_upload_from_cloud">Share from %1$s</string>
<string name="nc_upload_failed">Sorry, upload failed</string> <string name="nc_upload_failed">Sorry, upload failed</string>
<string name="nc_upload_choose_local_files">Choose files</string> <string name="nc_upload_choose_local_files">Choose files</string>
<string name="nc_upload_confirm_send_multiple">Send these files to %1$s?</string> <string name="nc_upload_confirm_send_multiple">Send these files to %1$s?</string>