android-projects/RpyPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Строки вынесены в ресурсы

Browse Source
This commit is contained in:
Victor 2015-04-24 13:37:54 +03:00
parent 564145f2e2
commit 3432fb3ab2
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@ -7,9 +7,16 @@
<string name="to_next_scene">Следующая сцена</string> <string name="to_next_scene">Следующая сцена</string>
<string name="navigate">Навигация</string> <string name="navigate">Навигация</string>
<string name="save">Сохранить</string> <string name="save">Сохранить</string>
<string name="saved">Сохранено</string>
<string name="load">Загрузить</string> <string name="load">Загрузить</string>
<string name="loaded">Загружено</string>
<string name="remove">Удалить</string> <string name="remove">Удалить</string>
<string name="removed">Удалено</string> <string name="removed">Удалено</string>
<string name="no_saves">Нет доступных сохранений</string>
<string name="no_data">Нет данных для отображения</string>
<string name="no_scripts">Нет скриптов в папке %1$s</string>
<string name="error_open_file">Ошибка при открытии файла %1$s</string>
<string-array name="menu_items"> <string-array name="menu_items">
<item>@string/to_prev_scene</item> <item>@string/to_prev_scene</item>
@ -18,5 +25,4 @@
<item>@string/save</item> <item>@string/save</item>
<item>@string/load</item> <item>@string/load</item>
</string-array> </string-array>
</resources> </resources>

2
src/com/annimon/everlastingsummer/MainActivity.java
View File

@ -27,7 +27,7 @@ public final class MainActivity extends ListActivity {
scripts = null; scripts = null;
} }
if (scripts == null || scripts.length == 0) { if (scripts == null || scripts.length == 0) {
Toast.makeText(this, "Нет скриптов в папке " + PathResolver.SCRIPT_ASSETS, Toast.makeText(this, getString(R.string.no_scripts, PathResolver.SCRIPT_ASSETS),
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
finish(); finish();
} }

12
src/com/annimon/everlastingsummer/ViewActivity.java
View File

@ -86,13 +86,13 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
InputStream stream = null; InputStream stream = null;
if (save != null) { if (save != null) {
stream = fromSave(save); stream = fromSave(save);
Toast.makeText(this, "Загружено", Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.loaded, Toast.LENGTH_SHORT).show();
} else if (intent.hasExtra(EXTRA_NAME)) { } else if (intent.hasExtra(EXTRA_NAME)) {
stream = fromAssets( PathResolver.script(intent.getStringExtra(EXTRA_NAME)) ); stream = fromAssets( PathResolver.script(intent.getStringExtra(EXTRA_NAME)) );
} else if (intent.getData() != null) { } else if (intent.getData() != null) {
stream = fromFile(intent.getData()); stream = fromFile(intent.getData());
} else { } else {
Toast.makeText(this, "Нет данных для отображения", Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.no_data, Toast.LENGTH_LONG).show();
finish(); finish();
} }
@ -100,7 +100,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
Parser.getInstance().next(); Parser.getInstance().next();
stream = null; stream = null;
} catch (Exception ex) { } catch (Exception ex) {
final String message = "Ошибка при открытии файла " + scriptPath; final String message = getString(R.string.error_open_file, scriptPath);
if (Logger.DEBUG) Logger.log(message, ex); if (Logger.DEBUG) Logger.log(message, ex);
Toast.makeText(this, message, Toast.LENGTH_LONG).show(); Toast.makeText(this, message, Toast.LENGTH_LONG).show();
finish(); finish();
@ -398,7 +398,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
private void showLoadStateDialog() { private void showLoadStateDialog() {
final List<SaveInfo> saves = IOUtil.listSaves(getApplicationContext()); final List<SaveInfo> saves = IOUtil.listSaves(getApplicationContext());
if (saves == null || saves.isEmpty()) { if (saves == null || saves.isEmpty()) {
Toast.makeText(this, "Нет доступных сохранений", Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.no_saves, Toast.LENGTH_SHORT).show();
return; return;
} }
Dialogs.with(this).showSaves(saves, new DialogInterface.OnClickListener() { Dialogs.with(this).showSaves(saves, new DialogInterface.OnClickListener() {
@ -409,7 +409,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
// Восстанавливаем сохранение текущего сценария. // Восстанавливаем сохранение текущего сценария.
Variables.setVariables(save.getVariables()); Variables.setVariables(save.getVariables());
Parser.getInstance().setPosition(save.getPosition()); Parser.getInstance().setPosition(save.getPosition());
Toast.makeText(ViewActivity.this, "Загружено", Toast.LENGTH_SHORT).show(); Toast.makeText(ViewActivity.this, R.string.loaded, Toast.LENGTH_SHORT).show();
} else { } else {
// Пересоздаём активити // Пересоздаём активити
final Intent intent = new Intent(ViewActivity.this, ViewActivity.class); final Intent intent = new Intent(ViewActivity.this, ViewActivity.class);
@ -431,7 +431,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
try { try {
final String filename = Long.toString(timestamp); final String filename = Long.toString(timestamp);
IOUtil.writeSaveInfo(getApplicationContext(), filename, info); IOUtil.writeSaveInfo(getApplicationContext(), filename, info);
Toast.makeText(this, "Сохранено", Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.saved, Toast.LENGTH_SHORT).show();
} catch (IOException ioe) { } catch (IOException ioe) {
if (Logger.DEBUG) Logger.log("Ошибка сохранения", ioe); if (Logger.DEBUG) Logger.log("Ошибка сохранения", ioe);
} }