RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Improved Loading dialog

Browse source
This commit is contained in:
Alex Zolotarev 2012-02-26 21:51:16 +03:00 • committed by Alex Zolotarev
parent eca299b804
commit adcdbd28b1
5 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/values-es/strings.xml
View file

@ -22,5 +22,5 @@
<string name="close">Cerrar</string>
<string name="empty_model">Para poder ver detalles\n de esta zona debes descargar\nel mapa de este país. Pulse el botón\nbajo la pantalla para descargar.</string>
<string name="unsupported_phone">Un hardware aceleró OpenGL se requiere. Desgraciadamente, el dispositivo móvil no es compatible.</string>
<string name="loading">Carga de %s...</string>
<string name="loading">Carga de %s</string>
</resources>

2
android/res/values-fr/strings.xml
View file

@ -22,5 +22,5 @@
<string name="close">Fermer</string>
<string name="empty_model">Pour scharger cette carte,\ntoucher le bouton au bas de l`écran</string>
<string name="unsupported_phone">Le programme a besoin d`OpenGL pour travailler. Votre appareil n`est pas appuyé maleuresement.</string>
<string name="loading">Chargement %s...</string>
<string name="loading">Chargement %s</string>
</resources>

2
android/res/values-ru/strings.xml
View file

@ -27,7 +27,7 @@
<string name="empty_model">Чтобы загрузить карту\nэтого места, нажмите на\nкнопку загрузки внизу экрана</string>
<string name="unsupported_phone">Для работы приложения необходим аппаратно ускоренный OpenGL. К сожалению, ваше устройство не поддерживается.</string>
<string name="not_enough_free_space_on_sdcard">Недостаточно свободного места на SD карте/в памяти устройства для использования программы</string>
<string name="loading">Запуск %s…</string>
<string name="loading">Запуск %s</string>
<string name="not_enough_memory">Недостаточно памяти для запуска программы</string>
<string name="free_space_for_country">Для загрузки %2$s нужно %1$s свободного места</string>
</resources>

2
android/res/values/strings.xml
View file

@ -27,7 +27,7 @@
<string name="empty_model">Nothing found. Have you tried\ndownloading maps of the countries?\nJust click the download button\nat the bottom of the screen.</string>
<string name="unsupported_phone">A hardware accelerated OpenGL is required. Unfortunately, your device is not supported.</string>
<string name="not_enough_free_space_on_sdcard">Please free some space on SD card/USB storage first in order to use the app</string>
<string name="loading">Loading %s…</string>
<string name="loading">Loading %s</string>
<string name="not_enough_memory">Not enough memory to launch app</string>
<string name="free_space_for_country">Please free %1$s on your device first in order to download %2$s</string>
</resources>

19
android/src/com/mapswithme/maps/CopyResourcesActivity.java
View file

@ -147,14 +147,24 @@ public class CopyResourcesActivity extends Activity
}
}
private String getProgressString(int current, int total)
{
final String str = getString(R.string.app_name);
int len = current * str.length() / total;
if (len <= 0)
len = 1;
else if (len > str.length())
len = str.length();
return String.format(getString(R.string.loading), str.substring(0, len));
}
@Override
protected Dialog onCreateDialog(int totalBytesToCopy)
{
m_dialog = new ProgressDialog(this);
m_dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
m_dialog.setMessage(String.format(getString(R.string.loading), getString(R.string.app_name)));
m_dialog.setMessage(getProgressString(0, totalBytesToCopy));
m_dialog.setCancelable(false);
m_dialog.setIndeterminate(false);
m_dialog.setIndeterminate(true);
m_dialog.setMax(totalBytesToCopy);
return m_dialog;
}
@ -162,7 +172,10 @@ public class CopyResourcesActivity extends Activity
public void onCopyResourcesProgress(int copiedBytes)
{
if (m_dialog != null)
{
m_dialog.setMessage(getProgressString(copiedBytes, m_dialog.getMax()));
m_dialog.setProgress(copiedBytes);
}
}
private native void nativeMoveMaps(String fromFolder, String toFolder);