mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-27 08:55:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1380 from nextcloud/feature/noid/shortenedLaucherLabel

Browse source 
Shortened launcher label
This commit is contained in:
Andy Scherzinger 2021-07-01 10:58:30 +02:00 committed by GitHub
commit 3cf20258b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java
View file

@ -244,8 +244,10 @@ public class AccountVerificationController extends BaseController {
fetchProfile(credentials);
} else {
if (getActivity() != null && getResources() != null) {
getActivity().runOnUiThread(() -> progressText.setText(String.format(getResources().getString(
R.string.nc_nextcloud_talk_app_not_installed), getResources().getString(R.string.nc_app_name))));
getActivity().runOnUiThread(() -> progressText.setText(
String.format(
getResources().getString(R.string.nc_nextcloud_talk_app_not_installed),
getResources().getString(R.string.nc_app_product_name))));
}
ApplicationWideMessageHolder.getInstance().setMessageType(
@ -258,8 +260,10 @@ public class AccountVerificationController extends BaseController {
@Override
public void onError(Throwable e) {
if (getActivity() != null && getResources() != null) {
getActivity().runOnUiThread(() -> progressText.setText(String.format(getResources().getString(
R.string.nc_nextcloud_talk_app_not_installed), getResources().getString(R.string.nc_app_name))));
getActivity().runOnUiThread(() -> progressText.setText(
String.format(
getResources().getString(R.string.nc_nextcloud_talk_app_not_installed),
getResources().getString(R.string.nc_app_product_name))));
}
ApplicationWideMessageHolder.getInstance().setMessageType(

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

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

15
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View file

@ -284,11 +284,13 @@ public class CallNotificationController extends BaseController {
"conversation-call-flags");
if (hasCallFlags) {
if (isInCallWithVideo(currentConversation.callFlag)) {
incomingCallVoiceOrVideoTextView.setText(String.format(getResources().getString(R.string.nc_call_video),
getResources().getString(R.string.nc_app_name)));
incomingCallVoiceOrVideoTextView.setText(
String.format(getResources().getString(R.string.nc_call_video),
getResources().getString(R.string.nc_app_product_name)));
} else {
incomingCallVoiceOrVideoTextView.setText(String.format(getResources().getString(R.string.nc_call_voice),
getResources().getString(R.string.nc_app_name)));
incomingCallVoiceOrVideoTextView.setText(
String.format(getResources().getString(R.string.nc_call_voice),
getResources().getString(R.string.nc_app_product_name)));
}
}
}
@ -328,8 +330,9 @@ public class CallNotificationController extends BaseController {
super.onViewBound(view);
String callDescriptionWithoutTypeInfo =
String.format(getResources().getString(R.string.nc_call_unknown), getResources().getString(R.string.nc_app_name));
String.format(
getResources().getString(R.string.nc_call_unknown),
getResources().getString(R.string.nc_app_product_name));
incomingCallVoiceOrVideoTextView.setText(callDescriptionWithoutTypeInfo);

5
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View file

@ -2145,7 +2145,10 @@ class ChatController(args: Bundle) :
R.id.action_copy_message -> {
val clipboardManager =
activity?.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
val clipData = ClipData.newPlainText(resources?.getString(R.string.nc_app_name), message?.text)
val clipData = ClipData.newPlainText(
resources?.getString(R.string.nc_app_product_name),
message?.text
)
clipboardManager.setPrimaryClip(clipData)
true
}

2
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View file

@ -815,7 +815,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
} else if (isNewConversationView) {
return getResources().getString(R.string.nc_select_participants);
} else {
return getResources().getString(R.string.nc_app_name);
return getResources().getString(R.string.nc_app_product_name);
}
}

2
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View file

@ -737,7 +737,7 @@ public class ConversationsListController extends BaseController implements Searc
@Override
protected String getTitle() {
return getResources().getString(R.string.nc_app_name);
return getResources().getString(R.string.nc_app_product_name);
}
@Override

2
app/src/main/java/com/nextcloud/talk/controllers/LockedController.kt
View file

@ -99,7 +99,7 @@ class LockedController : NewBaseController(R.layout.controller_locked) {
.setTitle(
String.format(
context.getString(R.string.nc_biometric_unlock),
context.getString(R.string.nc_app_name)
context.getString(R.string.nc_app_product_name)
)
)
.setNegativeButtonText(context.getString(R.string.nc_cancel))

2
app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java
View file

@ -265,7 +265,7 @@ public class ServerSelectionController extends BaseController {
} else if (!status.getVersion().startsWith("13.")) {
setErrorText(String.format(getResources().
getString(R.string.nc_server_version),
getResources().getString(R.string.nc_app_name),
getResources().getString(R.string.nc_app_product_name),
productName));
}

2
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View file

@ -276,7 +276,7 @@ public class SettingsController extends BaseController {
} else {
screenLockSwitchPreference.setSummary(String.format(Locale.getDefault(),
getResources().getString(R.string.nc_settings_screen_lock_desc),
getResources().getString(R.string.nc_app_name)));
getResources().getString(R.string.nc_app_product_name)));
}

2
app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java
View file

@ -149,7 +149,7 @@ public class WebViewLoginController extends BaseController {
private String getWebLoginUserAgent() {
return Build.MANUFACTURER.substring(0, 1).toUpperCase(Locale.getDefault()) +
Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) + " " + Build.MODEL + " ("
+ getResources().getString(R.string.nc_app_name) + ")";
+ getResources().getString(R.string.nc_app_product_name) + ")";
}
@Override

2
app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java
View file

@ -260,6 +260,6 @@ public abstract class BaseController extends ButterKnifeController {
}
public String getSearchHint() {
return context.getString(R.string.appbar_search_in, context.getString(R.string.nc_app_name));
return context.getString(R.string.appbar_search_in, context.getString(R.string.nc_app_product_name));
}
}

2
app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt
View file

@ -300,7 +300,7 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
open val appBarLayoutType: AppBarLayoutType
get() = AppBarLayoutType.TOOLBAR
val searchHint: String
get() = context!!.getString(R.string.appbar_search_in, context!!.getString(R.string.nc_app_name))
get() = context!!.getString(R.string.appbar_search_in, context!!.getString(R.string.nc_app_product_name))
companion object {
private val TAG = BaseController::class.java.simpleName

2
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
View file

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

2
app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
View file

@ -44,7 +44,7 @@ public class DatabaseModule {
@Singleton
public SqlCipherDatabaseSource provideSqlCipherDatabaseSource(@NonNull final Context context) {
return new SqlCipherDatabaseSource(context, Models.DEFAULT,
context.getResources().getString(R.string.nc_app_name).toLowerCase()
context.getResources().getString(R.string.nc_app_product_name).toLowerCase()
.replace(" ", "_").trim() + ".sqlite",
context.getString(R.string.nc_talk_database_encryption_key), 6);
}

2
app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt
View file

@ -79,7 +79,7 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
val currentUser = userUtils.currentUser
accountName = context.getString(R.string.nc_app_name)
accountName = context.getString(R.string.nc_app_product_name)
accountType = BuildConfig.APPLICATION_ID
if (currentUser == null) {

2
app/src/main/res/layout/activity_main.xml
View file

@ -141,7 +141,7 @@
app:navigationIconTint="@color/fontAppbar"
app:popupTheme="@style/appActionBarPopupMenu"
app:titleTextColor="@color/fontAppbar"
tools:title="@string/nc_app_name">
tools:title="@string/nc_app_product_name">
<ProgressBar
android:id="@+id/toolbarProgressBar"

2
app/src/main/res/layout/controller_conversations_rv.xml
View file

@ -53,7 +53,7 @@
android:id="@+id/empty_list_icon"
android:layout_width="match_parent"
android:layout_height="72dp"
android:contentDescription="@string/nc_app_name"
android:contentDescription="@string/nc_app_product_name"
android:src="@drawable/ic_logo"
app:tint="#989898" />

2
app/src/main/res/layout/controller_locked.xml
View file

@ -39,7 +39,7 @@
android:id="@+id/appLogo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/nc_app_name"
android:contentDescription="@string/nc_app_product_name"
android:src="@drawable/ic_logo" />
<ImageView

2
app/src/main/res/layout/controller_server_selection.xml
View file

@ -43,7 +43,7 @@
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_marginBottom="@dimen/standard_margin"
android:contentDescription="@string/nc_app_name"
android:contentDescription="@string/nc_app_product_name"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_logo" />

2
app/src/main/res/layout/controller_settings.xml
View file

@ -368,7 +368,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
apc:mp_summary="v0.1"
apc:mp_title="@string/nc_app_name" />
apc:mp_title="@string/nc_app_product_name" />
</com.yarolegovich.mp.MaterialPreferenceCategory>

3
app/src/main/res/values/setup.xml
View file

@ -25,7 +25,8 @@
<string name="nc_talk_login_scheme" translatable="false">nc</string>
<bool name="nc_is_debug">false</bool>
<string name="nc_app_name">Nextcloud Talk</string>
<string name="nc_app_name">Talk</string>
<string name="nc_app_product_name">Nextcloud Talk</string>
<string name="nc_server_product_name">Nextcloud</string>
<string name="nc_push_server_url" translatable="false">https://push-notifications.nextcloud.com</string>

2
app/src/main/res/xml/auth.xml
View file

@ -23,4 +23,4 @@
android:accountType="com.nextcloud.talk2"
android:icon="@mipmap/ic_launcher"
android:smallIcon="@mipmap/ic_launcher"
android:label="@string/nc_app_name"/>
android:label="@string/nc_app_product_name"/>

3
app/src/qa/res/values/setup.xml
View file

@ -20,6 +20,7 @@
-->
<resources>
<string name="nc_app_name">Nextcloud Talk QA</string>
<string name="nc_app_name">Talk QA</string>
<string name="nc_app_product_name">Nextcloud Talk QA</string>
<string name="nc_server_product_name">Nextcloud</string>
</resources>