TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 08:35:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

String changes

Browse Source
This commit is contained in:
khanhduytran0 2020-12-05 05:56:51 +07:00
parent 235282d812
commit 598f6b76f5
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/kdt/handleview/ActionPopupWindow.java
View File

@ -83,7 +83,7 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe
AlertDialog.Builder alert = new AlertDialog.Builder(view.getContext());
alert.setCancelable(false);
if (view == mEditTextView) {
alert.setTitle(view.getResources().getString(R.string.global_edit) + " " + mHandleView.mView.getText());
alert.setTitle(view.getResources().getString(R.string.customctrl_edit, mHandleView.mView.getText()));
alert.setView(R.layout.control_setting);
alert.setPositiveButton(android.R.string.ok, null);
alert.setNegativeButton(android.R.string.cancel, null);
@ -222,8 +222,8 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe
dialog.show();
} else if (view == mDeleteTextView) {
alert.setMessage(view.getContext().getString(R.string.global_remove) + " " + mHandleView.mView.getText() + "?");
alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
alert.setMessage(view.getContext().getString(R.string.customctrl_remove, mHandleView.mView.getText()) + "?");
alert.setPositiveButton(R.string.global_remove, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface p1, int p2)

2
app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
View File

@ -179,7 +179,7 @@ public abstract class BaseLauncherActivity extends BaseActivity {
try{
final ProgressDialog barrier = new ProgressDialog(this);
barrier.setMessage("Waiting");
barrier.setMessage(R.string.global_waiting);
barrier.setProgressStyle(barrier.STYLE_SPINNER);
barrier.setCancelable(false);
barrier.show();

4
app/src/main/res/layout/launcher_main.xml
View File

@ -51,7 +51,7 @@
android:layout_height="20dp"
android:layout_below="@id/progressDownloadBar"
android:gravity="center_horizontal"
android:text="Looks like you are stucking on it. Restart the launcher to fix."
android:text="@string/global_waiting"
android:id="@+id/progressDownloadText"
android:visibility="gone"/>
@ -148,7 +148,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="20dp"
android:text="Please log in to continue!"
android:text="@string/global_waiting"
android:id="@+id/launcherMainVersionView"
android:textSize="12sp"
android:gravity="center"/>

4
app/src/main/res/layout/launcher_main_v3.xml
View File

@ -86,7 +86,7 @@
android:layout_height="20dp"
android:layout_below="@id/progressDownloadBar"
android:gravity="center_horizontal"
android:text="Looks like you are stucking on it. Restart the launcher to fix."
android:text="@string/global_waiting"
android:id="@+id/progressDownloadText"
android:visibility="gone"/>
@ -183,7 +183,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="20dp"
android:text="Please log in to continue!"
android:text="@string/global_waiting"
android:id="@+id/launcherMainVersionView"
android:textSize="12sp"
android:gravity="center"/>

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

@ -34,12 +34,7 @@
<string name="hint_select_account">To select, click it. To delete an account, hold it.</string>
<string name="hint_control_mapping">"Swipe from right to left to open menu ◀\nHold a button to customize: edit, resize or delete."</string>
<!-- Warning -->
<string name="warning_title">Warning</string>
<string name="warning_msg">This app may not compatible with your Android version (above or equals than Android 7.0). You can use VMOS then install this app to VMOS instead. But VMOS is removed by Play Store, you must install it manually.</string>
<string name="warning_noshowagain">Don\'t show again</string>
<string name="warning_action_install">Install VMOS</string>
<string name="warning_action_tryanyway">Try anyway</string>
<!-- Warnings -->
<string name="warning_action_exit">Exit</string>
<string name="warning_remove_account">This account will be removed!</string>
@ -125,6 +120,7 @@
<string name="global_save">Save</string>
<string name="global_unpacking">Unpacking %s</string>
<string name="global_error_field_empty">This field can\'t be empty</string>
<string name="global_waiting">Waiting</string>
<!--
<string name="mcl_about">
@ -190,6 +186,9 @@
<string name="control_more3"></string>
<string name="control_more4"></string>
<string name="customctrl_edit">Edit %s</string>
<string name="customctrl_remove">%s will be removed</string>
<string name="customctrl_keyname">Keycode</string>
<string name="customctrl_specialkey">Special Key</string>
<string name="customctrl_hidden">Hidden</string>
@ -212,7 +211,7 @@
<string name="main_options">Options</string>
<string name="main_play">Play</string>
<string name="main_welcome">Welcome,</string>
<string name="main_welcome">Welcome, %s</string>
<string name="main_infodev">Info (DEV)</string>
<string name="main_switchuser">Switch user</string>
<string name="main_version">Version:</string>