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

Merge pull request #1101 from nextcloud/removeNextcloudTalkHardcoding

Browse source 
Remove "Nextcloud" hardcoding
This commit is contained in:
Marcel Hibbe 2021-04-07 10:54:36 +02:00 committed by GitHub
commit 1251ef7254
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View file

@ -2363,11 +2363,9 @@ public class CallController extends BaseController {
private String getDescriptionForCallType() {
String appName = getResources().getString(R.string.nc_app_name);
if (isVoiceOnlyCall){
return String.format(getResources().getString(R.string.nc_call_voice),
getResources().getString(R.string.nc_app_name));
return String.format(getResources().getString(R.string.nc_call_voice), appName);
} else {
return String.format(getResources().getString(R.string.nc_call_video),
getResources().getString(R.string.nc_app_name));
return String.format(getResources().getString(R.string.nc_call_video), appName);
}
}

15
app/src/main/java/com/nextcloud/talk/models/database/User.java
View file

@ -207,4 +207,19 @@ public interface User extends Parcelable, Persistable, Serializable {
}
return "/Talk";
}
default String getServerName() {
if (getCapabilities() != null) {
Capabilities capabilities;
try {
capabilities = LoganSquare.parse(getCapabilities(), Capabilities.class);
if (capabilities != null && capabilities.getThemingCapability() != null) {
return capabilities.getThemingCapability().getName();
}
} catch (IOException e) {
Log.e("User.java", "Failed to get server name", e);
}
}
return "";
}
}

2
app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java
View file

@ -28,7 +28,7 @@ import org.parceler.Parcel;
@Parcel
@Data
@JsonObject
class ThemingCapability {
public class ThemingCapability {
@JsonField(name = "name")
String name;

12
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
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)
@JvmField
@ -49,11 +49,17 @@ class AttachmentDialog(val activity: Activity, var chatController :ChatControlle
super.onCreate(savedInstanceState)
val view = layoutInflater.inflate(R.layout.dialog_attachment, null)
setContentView(view)
window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
unbinder = ButterKnife.bind(this, view)
var serverName = chatController.conversationUser?.serverName
attachFromCloud?.text = chatController.resources?.let {
if(serverName.isNullOrEmpty()){
serverName = it.getString(R.string.nc_server_product_name)
}
String.format(it.getString(R.string.nc_upload_from_cloud), serverName)
}
attachFromLocal?.setOnClickListener {
chatController.sendSelectLocalFileIntent()
dismiss()

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

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

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

@ -337,7 +337,7 @@
<!-- Upload -->
<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_choose_local_files">Choose files</string>
<string name="nc_upload_confirm_send_multiple">Send these files to %1$s?</string>