gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-08 23:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #106

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-02-27 18:53:34 +01:00
parent a8bb2ce1a7
commit 9ab28762fa
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
View File

@ -120,7 +120,8 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
private void prepareIntent() { private void prepareIntent() {
shareIntent = new Intent(Intent.ACTION_SEND); shareIntent = new Intent(Intent.ACTION_SEND);
shareIntent.setType("text/plain"); shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_SUBJECT, getResources().getString(R.string.nc_share_subject)); shareIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(getResources().getString(R.string.nc_share_subject),
getResources().getString(R.string.app_name)));
} }
private void prepareMenu() { private void prepareMenu() {

4
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
View File

@ -253,6 +253,7 @@ public class EntryMenuController extends BaseController {
case 11: case 11:
case 2: case 2:
labelText = getResources().getString(R.string.nc_call_name); labelText = getResources().getString(R.string.nc_call_name);
editText.setInputType(InputType.TYPE_CLASS_TEXT);
break; break;
case 4: case 4:
labelText = getResources().getString(R.string.nc_new_password); labelText = getResources().getString(R.string.nc_new_password);
@ -267,12 +268,13 @@ public class EntryMenuController extends BaseController {
break; break;
case 10: case 10:
labelText = getResources().getString(R.string.nc_conversation_link); labelText = getResources().getString(R.string.nc_conversation_link);
editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
break; break;
default: default:
break; break;
} }
textFieldBoxes.setLabelText(labelText); textFieldBoxes.setLabelText(labelText);
editText.requestFocus(); textFieldBoxes.requestFocus();
} }
} }

12
app/src/main/java/com/nextcloud/talk/events/ShowScreenEvent.java
View File

@ -27,15 +27,15 @@ import lombok.Data;
@Data @Data
public class ShowScreenEvent { public class ShowScreenEvent {
public enum ScreenType { @Nullable
CONTACTS_SCREEN private final Bundle bundle;
}
@Nullable private final Bundle bundle;
private final ScreenType screenType; private final ScreenType screenType;
public ShowScreenEvent(ScreenType screenType, @Nullable Bundle bundle) { public ShowScreenEvent(ScreenType screenType, @Nullable Bundle bundle) {
this.bundle = bundle; this.bundle = bundle;
this.screenType = screenType; this.screenType = screenType;
} }
public enum ScreenType {
CONTACTS_SCREEN
}
} }

4
app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java
View File

@ -55,10 +55,6 @@ public class ShareUtils {
if (!TextUtils.isEmpty(password)) { if (!TextUtils.isEmpty(password)) {
shareString += String.format(context.getResources().getString(R.string.nc_share_text_pass), password); shareString += String.format(context.getResources().getString(R.string.nc_share_text_pass), password);
} }
shareString += String.format(context.getResources().getString(R.string.nc_talk_soon), userEntity
.getDisplayName()
);
} }
return shareString; return shareString;

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

@ -126,11 +126,9 @@
<string name="nc_proceed">Proceed</string> <string name="nc_proceed">Proceed</string>
<string name="nc_call_name_is_same">The name you entered is the same as the existing one</string> <string name="nc_call_name_is_same">The name you entered is the same as the existing one</string>
<string name="nc_wrong_link">Conversation link is not valid</string> <string name="nc_wrong_link">Conversation link is not valid</string>
<string name="nc_share_text">Hello,\n\nI would like you to join a call with me.\n\nYou can join this call via <string name="nc_share_text">Join the conversation at %1$s/index.php/call/%2$s</string>
%1$s/index.php/call/%2$s</string> <string name="nc_share_subject">%1$s invitation</string>
<string name="nc_talk_soon">\n\nTalk soon,\n %1$s</string> <string name="nc_share_text_pass">\nPassword: %1$s</string>
<string name="nc_share_subject">Call invitation</string>
<string name="nc_share_text_pass">\n\nPassword for the call is: %1$s</string>
<!-- Magical stuff --> <!-- Magical stuff -->
<string name="nc_empty"></string> <string name="nc_empty"></string>