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

[android] Use string resources

Browse source
This commit is contained in:
Roman Romanov 2017-04-13 08:40:53 +04:00
parent a949865cdb
commit de60c53326
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout/fragment_updater.xml
View file

@ -41,7 +41,7 @@
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="Update maps supports information about objects in the current state"/>
android:text="@string/update_maps_notice"/>
<FrameLayout
android:layout_width="match_parent"

14
android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
View file

@ -111,8 +111,8 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
for (CountryItem item : mOutdatedMaps.values())
progress += item.progress / mOutdatedMaps.size();
// TODO string resources
mTitle.setText(String.format(Locale.getDefault(), "%s %d%%", "Updating maps", (int) progress));
mTitle.setText(String.format(Locale.getDefault(), "%s %d%%",
getString(R.string.updating_maps), (int) progress));
}
};
@ -139,8 +139,8 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
MapManager.nativeUpdate(CountryItem.getRootId());
UiUtils.show(mProgressBar);
UiUtils.hide(mUpdateBtn);
// TODO string resources
mTitle.setText(String.format(Locale.getDefault(), "%s %d%%", "Updating maps", 0));
mTitle.setText(String.format(Locale.getDefault(), "%s %d%%",
getString(R.string.updating_maps), 0));
mCancelBtn.setText(R.string.cancel);
Statistics.INSTANCE.trackDownloaderDialogEvent(DOWNLOADER_DIALOG_MANUAL_DOWNLOAD,
@ -279,8 +279,8 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
mUpdateBtn.setOnClickListener(mUpdateClickListener);
mCancelBtn.setText(mAutoUpdate ? R.string.cancel : R.string.later);
mCancelBtn.setOnClickListener(mCancelClickListener);
// TODO string resources
mTitle.setText(mAutoUpdate ? String.format(Locale.getDefault(), "%s %d%%", "Updating maps", 0)
: "Update your downloaded maps");
mTitle.setText(mAutoUpdate ? String.format(Locale.getDefault(), "%s %d%%",
getString(R.string.updating_maps), 0)
: getString(R.string.update_maps_ask));
}
}