Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2014-12-06 13:18:02 +01:00
commit 14d0f7ff4a
5 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/dashboard.xml
View file

@ -38,6 +38,7 @@
android:textSize="20sp" />
</LinearLayout>
<!-- All Copyright notes and links have been put on the 'About' screen
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -62,6 +63,7 @@
android:text="@string/openstreetmap_copyright"
android:textSize="14sp" />
</LinearLayout>
-->
</LinearLayout>
</LinearLayout>

1
OsmAnd/res/values-it/strings.xml
View file

@ -2038,4 +2038,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="use_opengl_render_descr">Utilizzare il rendering opengl accelerato via hardware (potrebbe non funzionare in alcuni dispositivi)</string>
<string name="everything_up_to_date">Tutto aggiornato</string>
<string name="dismiss">Abbandona</string>
<string name="no_internet_connection">Non è possibile scaricare. Prego, connettersi al Wi-Fi per procedere.</string>
</resources>

5
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1831,7 +1831,7 @@
<string name="wake_on_voice_never">永不</string>
<string name="advanced_settings">進階</string>
<string name="osmo_use_https_descr">使用安全協定連線於伺服器</string>
<string name="osmo_use_https">使用 https</string>
<string name="osmo_use_https">使用 HTTPS</string>
<string name="map_update">地圖</string>
<string name="search_for">查尋</string>
<string name="show_map">顯示地圖</string>
@ -1841,6 +1841,7 @@
<string name="error_avoid_specific_road">找不到最近的路</string>
<string name="everything_up_to_date">一切都為最新的</string>
<string name="use_opengl_render">使用 OpenGL 繪製</string>
<string name="use_opengl_render_descr">使用硬體加速 OpenGL 繪製（可能在某些裝置無法工作）</string>
<string name="use_opengl_render_descr">使用硬體加速 OpenGL 繪製（可能在某些裝置上無法工作）</string>
<string name="dismiss">排除</string>
<string name="no_internet_connection">不能下載。請連接到 Wifi 網路進行。</string>
</resources>

5
OsmAnd/res/values/no_translate.xml
View file

@ -16,11 +16,10 @@
<string name="versionFeatures">+play_market +gps_status -parking_plugin -blackberry -free_version -amazon</string>
<string name="next_tips_and_tricks_not_translate"></string>
<string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
<string name="about_content">Data is powered by OpenStreetMaps ODbL
<string name="about_content">Data is powered by OpenStreetMap ODbL, &#169; <a href="http://www.openstreetmap.org/copyright">http://www.openstreetmap.org/copyright</a>.
\n\nAll rights belong to OsmAnd app.
\n\nAll rights belong to OsmAnd app, Copyright &#169; 2010-2014 OsmAnd.
\n\nCopyright &#169; 2010-2014 OsmAnd
\n\nCredits to all major Contributors/Developers :
\n\tVictor Shcherb - project lead.
\n\tDr. Hardy Mueller - map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.

66
OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
View file

@ -113,28 +113,28 @@ public class DashboardActivity extends BaseDownloadActivity {
protected void setupContributionVersion() {
findViewById(R.id.credentials).setVisibility(View.VISIBLE);
final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
final Calendar inst = Calendar.getInstance();
inst.setTime(new Date());
final String textVersion = "\u00A9 OsmAnd " + inst.get(Calendar.YEAR);
textVersionView.setText(textVersion);
//Copyright notes and links have been put on the 'About' screen
// final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
// final Calendar inst = Calendar.getInstance();
// inst.setTime(new Date());
// final String textVersion = "\u00A9 OsmAnd " + inst.get(Calendar.YEAR);
// textVersionView.setText(textVersion);
final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
textVersionView.setOnClickListener(new OnClickListener(){
int i = 0;
@Override
public void onClick(View v) {
if(i++ > 8 && Version.isDeveloperVersion(getMyApplication())) {
prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
enableLink(DashboardActivity.this, textVersion, textVersionView);
}
}
});
// textVersionView.setOnClickListener(new OnClickListener(){
// int i = 0;
// @Override
// public void onClick(View v) {
// if(i++ > 8 && Version.isDeveloperVersion(getMyApplication())) {
// prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
// enableLink(DashboardActivity.this, textVersion, textVersionView);
// }
// }
// });
// only one commit should be with contribution version flag
// prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
if (prefs.contains(CONTRIBUTION_VERSION_FLAG) && Version.isDeveloperVersion(getMyApplication())) {
enableLink(this, textVersion, textVersionView);
}
// if (prefs.contains(CONTRIBUTION_VERSION_FLAG) && Version.isDeveloperVersion(getMyApplication())) {
// enableLink(this, textVersion, textVersionView);
// }
final TextView about = (TextView) findViewById(R.id.About);
final String aboutString = getString(R.string.about_settings);
SpannableString ss = new SpannableString(aboutString);
@ -202,7 +202,7 @@ public class DashboardActivity extends BaseDownloadActivity {
PackageManager pm = activity.getPackageManager();
ApplicationInfo appInfo = pm.getApplicationInfo(OsmandApplication.class.getPackage().getName(), 0);
Date date = new Date(new File(appInfo.sourceDir).lastModified());
edition = activity.getString(R.string.local_index_installed) + " :\t" + DateFormat.getDateFormat(app).format(date);
edition = activity.getString(R.string.local_index_installed) + " : \t" + DateFormat.getDateFormat(app).format(date);
} catch (Exception e) {
}
SpannableString content = new SpannableString(vt + version +"\n" +
@ -401,19 +401,19 @@ public class DashboardActivity extends BaseDownloadActivity {
}
private static void enableLink(final Activity activity, String textVersion, TextView textVersionView) {
SpannableString content = new SpannableString(textVersion);
content.setSpan(new ClickableSpan() {
@Override
public void onClick(View widget) {
final Intent mapIntent = new Intent(activity, ContributionVersionActivity.class);
activity.startActivityForResult(mapIntent, 0);
}
}, 0, content.length(), 0);
textVersionView.setText(content);
textVersionView.setMovementMethod(LinkMovementMethod.getInstance());
}
// private static void enableLink(final Activity activity, String textVersion, TextView textVersionView) {
// SpannableString content = new SpannableString(textVersion);
// content.setSpan(new ClickableSpan() {
//
// @Override
// public void onClick(View widget) {
// final Intent mapIntent = new Intent(activity, ContributionVersionActivity.class);
// activity.startActivityForResult(mapIntent, 0);
// }
// }, 0, content.length(), 0);
// textVersionView.setText(content);
// textVersionView.setMovementMethod(LinkMovementMethod.getInstance());
// }
@Override
public void updateProgress(boolean updateOnlyProgress) {