TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Translations

Browse Source
This commit is contained in:
serso
2016-03-27 14:43:16 +02:00
parent 339b82adba
commit dc9836ec40
64 changed files with 93 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@@ -110,7 +110,8 @@ public class CalculatorActivity extends BaseActivity implements SharedPreference
private void updateModeMenuItem() {
final Menu menu = toolbar.getMenu();
final MenuItem modeMenuItem = menu.findItem(R.id.menu_mode);
modeMenuItem.setTitle(getString(R.string.cpp_mode_status, getString(getActivityMode().name)));
final String modeName = getString(getActivityMode().name);
modeMenuItem.setTitle(getString(R.string.cpp_mode) + ": " + modeName);
}
@Override

2
app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java
View File

@@ -45,7 +45,7 @@ public class FloatingCalculatorActivity extends AppCompatActivity {
@Override
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
final String permission = getString(R.string.cpp_permission_overlay);
builder.setMessage(getString(R.string.cpp_missing_permission_msg, permission));
builder.setMessage(getString(R.string.cpp_missing_permission_message, permission));
builder.setTitle(R.string.cpp_missing_permission_title);
builder.setPositiveButton(android.R.string.ok, null);
}

4
app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
View File

@@ -309,10 +309,10 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements
clearError(paramLabel);
} else if (!Engine.isValidName(parameter)) {
valid = false;
setError(paramLabel, getString(R.string.invalid_name));
setError(paramLabel, getString(R.string.cpp_invalid_name));
} else if (usedParameters.contains(parameter)) {
valid = false;
setError(paramLabel, getString(R.string.function_duplicate_parameter));
setError(paramLabel, getString(R.string.cpp_fn_duplicate_parameter));
} else {
usedParameters.add(parameter);
clearError(paramLabel);

2
app/src/main/java/org/solovyev/android/calculator/functions/FunctionParamsView.java
View File

@@ -200,7 +200,7 @@ public class FunctionParamsView extends LinearLayout {
paramView.setInputType(EditorInfo.TYPE_CLASS_TEXT);
paramView.setId(id);
paramView.setTag(PARAM_VIEW_TAG);
paramView.setHint(R.string.c_function_parameter);
paramView.setHint(R.string.cpp_fn_parameter);
paramLabel.addView(paramView, new TextInputLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
rowView.addView(paramLabel, new LayoutParams(0, WRAP_CONTENT, 1));

2
app/src/main/java/org/solovyev/android/views/AutoResizeTextView.java
View File

@@ -14,6 +14,7 @@ package org.solovyev.android.views; /**
* 0. You just DO WHAT YOU WANT TO.
*/
import android.annotation.SuppressLint;
import android.content.Context;
import android.text.Layout.Alignment;
import android.text.StaticLayout;
@@ -223,6 +224,7 @@ public class AutoResizeTextView extends TextView {
/**
* Resize the text size with specified width and height
*/
@SuppressLint("SetTextI18n")
public void resizeText(int width, int height) {
mTimer.reset(TAG, "resizeText");
CharSequence text = getText();