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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2013-11-26 13:32:22 +01:00
commit 6a75624cbf
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,8 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="tip_faq_t">Please visit following to url https://code.google.com/p/osmand/wiki/FAQ to see frequently asked question.</string>
<string name="tip_faq">Frequently Asked Questions</string>
<string name="local_osm_changes_delete_all_confirm">You are going to delete %1$d osm changes. Are you sure?</string> <string name="local_osm_changes_delete_all_confirm">You are going to delete %1$d osm changes. Are you sure?</string>
<string name="local_osm_changes_delete_all">Delete All</string> <string name="local_osm_changes_delete_all">Delete All</string>
<string name="animate_routing_route_not_calculated">Please, calculate the route first</string> <string name="animate_routing_route_not_calculated">Please, calculate the route first</string>

25
OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java
View file

@ -8,7 +8,10 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.text.SpannableString;
import android.text.method.LinkMovementMethod;
import android.text.method.ScrollingMovementMethod; import android.text.method.ScrollingMovementMethod;
import android.text.util.Linkify;
import android.view.View; import android.view.View;
import android.view.ViewGroup.LayoutParams; import android.view.ViewGroup.LayoutParams;
import android.widget.Button; import android.widget.Button;
@ -20,6 +23,7 @@ public class TipsAndTricksActivity {
{R.string.tip_update_index,R.string.tip_update_index_t}, {R.string.tip_update_index,R.string.tip_update_index_t},
{R.string.tip_navigation,R.string.tip_navigation_t}, {R.string.tip_navigation,R.string.tip_navigation_t},
{R.string.tip_app_mode,R.string.tip_app_mode_t_v2}, {R.string.tip_app_mode,R.string.tip_app_mode_t_v2},
{R.string.tip_faq,R.string.tip_faq_t},
{R.string.tip_search,R.string.tip_search_t}, {R.string.tip_search,R.string.tip_search_t},
{R.string.tip_favorites,R.string.tip_favorites_t}, {R.string.tip_favorites,R.string.tip_favorites_t},
{R.string.tip_map_context_menu,R.string.tip_map_context_menu_t}, {R.string.tip_map_context_menu,R.string.tip_map_context_menu_t},
@ -58,8 +62,9 @@ public class TipsAndTricksActivity {
public int getNextRandomTipToShow() { public int getNextRandomTipToShow() {
int l = getNumberOfTips(); int l = getNumberOfTips();
if (l != 0) { if (l != 0) {
int mod = (int) (System.currentTimeMillis() % l); // no random
return getNextTipToShow(mod); // int mod = (int) (System.currentTimeMillis() % l);
return getNextTipToShow(0);
} }
return -1; return -1;
} }
@ -98,18 +103,24 @@ public class TipsAndTricksActivity {
return ctx.getString(tipNamesAndDescriptions[ind][0]); return ctx.getString(tipNamesAndDescriptions[ind][0]);
} }
public String getTipDescription(int ind){ public CharSequence getTipDescription(int ind){
return ctx.getString(tipNamesAndDescriptions[ind][1]); String descr = ctx.getString(tipNamesAndDescriptions[ind][1]);
SpannableString spannable = new SpannableString(descr);
Linkify.addLinks(spannable, Linkify.ALL);
return spannable;
} }
public Dialog getDialogToShowTips(boolean showFirst, boolean random){ public Dialog getDialogToShowTips(boolean showFirst, boolean random){
final Dialog dlg = new Dialog(ctx); final Dialog dlg = new Dialog(ctx);
dlg.setContentView(R.layout.tips_and_tricks); dlg.setContentView(R.layout.tips_and_tricks);
dlg.getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); dlg.getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
final TextView tipDescription = (TextView) dlg.findViewById(R.id.TipDescription); final TextView tipDescription = (TextView) dlg.findViewById(R.id.TipDescription);
if (!((OsmandApplication)ctx.getApplicationContext()).getInternalAPI().accessibilityExtensions()) if (!((OsmandApplication)ctx.getApplicationContext()).getInternalAPI().accessibilityExtensions()) {
tipDescription.setMovementMethod(ScrollingMovementMethod.getInstance()); // tipDescription.setMovementMethod(ScrollingMovementMethod.getInstance());
tipDescription.setMovementMethod(LinkMovementMethod.getInstance());
}
tipDescription.setLinksClickable(true);
int nextInd = 0; int nextInd = 0;
final TIntArrayList toShow = new TIntArrayList(); final TIntArrayList toShow = new TIntArrayList();
final int[] historyInd = new int[1]; final int[] historyInd = new int[1];