Userguides

res/layout/rbs_userguide_dialog.xml

@@ -7,6 +7,17 @@
 	android:layout_width="fill_parent"
 	android:orientation="vertical">
 
+    <ImageView
+        android:id="@+id/ug_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="5dp"
+        android:adjustViewBounds="true"
+        android:background="@color/gray_dark"
+        android:padding="1dp"
+        android:scaleType="centerInside" />
+
 	<ScrollView
 	    android:id="@+id/ug_ScrollView"
 	    android:layout_width="match_parent"
@@ -20,17 +31,6 @@
 		    android:layout_height="wrap_content"
 		    android:orientation="vertical" >
 
-			<ImageView
-			    android:id="@+id/ug_image"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_gravity="center_horizontal"
-			    android:layout_marginBottom="5dp"
-			    android:adjustViewBounds="true"
-			    android:background="@color/gray_dark"
-			    android:padding="1dp"
-			    android:scaleType="centerInside" />
-
 			<TextView
 			    android:id="@+id/ug_txt_HowTo"
 			    android:layout_width="wrap_content"

res/values/strings_notrans.xml

@@ -20,8 +20,8 @@
 	</string-array>
 	
 	<string name="caption_UserguideParams">1. %1$s\n2. %2$s\n3. %3$s\n4. %4$s\n5. %5$s\n6. %6$s\n7. %7$s\n\n%8$s\n\n%9$s</string>
-	<string name="caption_UserguideRiserParams">1. %1$s\n2. %2$s\n3. %3$s\n4. %4$s</string>
-	<string name="caption_UserguideSightParams">1. %1$s\n2. %2$s\n3. %3$s\n4. %4$s\n5. %5$s\n6. %6$s\n7. %7$s</string>
+	<string name="caption_UserguideRiserParams">&lt;b>1. %1$s&lt;/b>\n\n&lt;b>2. %2$s&lt;/b>\n%3$s\n\n&lt;b>4. %4$s&lt;/b>\n\n&lt;b>5. %5$s&lt;/b>\n\n%6$s</string>
+	<string name="caption_UserguideSightParams">&lt;b>1. %1$s&lt;/b>\n\n&lt;b>2. %2$s&lt;/b>\n%3$s\n\n&lt;b>3. %4$s&lt;/b>\n%5$s\n\n&lt;b>4. %6$s&lt;/b>\n\n&lt;b>5. %7$s&lt;/b>\n\n&lt;b>6. %8$s&lt;/b>\n\n&lt;b>7. %9$s&lt;/b>\n\n%10$s</string>
 	<string name="caption_UserguideArcherySetupParams">%1$s\n\n%2$s\n\n%3$s\n\n%4$s\n\n%5$s\n\n%6$s\n\n%7$s\n\n%8$s</string>
 		
 </resources>

src/ch/spherIC/recurvebowsight/DialogFactory.java

@@ -41,9 +41,6 @@ import java.util.StringTokenizer;
  */
 public final class DialogFactory {
 
-
-    private static Dialog userGuideAsDialog = null;
-
     /**
      * Static main method to initialize classes
      *
@@ -79,10 +76,7 @@ public final class DialogFactory {
             break;
 
         case RBSMainActivity.DLG_USERGUIDE_AS_CFG:
-            if (userGuideAsDialog == null) {
-                userGuideAsDialog = createUserguideArcherySetupDialog(parent);
-            }
-            dlg = userGuideAsDialog;
+            dlg = createUserguideArcherySetupDialog(parent);
             break;
 
         default:
@@ -146,13 +140,14 @@ public final class DialogFactory {
         image.setImageResource(R.drawable.userguide_riser);
 
         TextView text = (TextView) dialog.findViewById(R.id.ug_txt_HowTo);
-        String vVisHStr = parent.getResources().getString(R.string.rcVvisHLbl) + ".\n"
-                          + parent.getResources().getString(R.string.ug_UserguideRiserParams_Add1);
-        text.setText(parent.getResources().getString(R.string.caption_UserguideRiserParams, //
-                                                     parent.getResources().getString(R.string.rcVvisVLbl), //
-                                                     vVisHStr,                          //
-                                                     parent.getResources().getString(R.string.ug_UserguideRiserParams_Add2), //
-                                                     parent.getResources().getString(R.string.ug_UserguideRiserParams_Add3)));
+        String html = String.format(parent.getResources().getText(R.string.caption_UserguideRiserParams).toString(),
+                                    parent.getResources().getString(R.string.rcVvisVLbl),                                                                           //
+                                    parent.getResources().getString(R.string.rcVvisHLbl),                                                                           //
+                                    parent.getResources().getString(R.string.ug_UserguideRiserParams_Add1),
+                                    parent.getResources().getString(R.string.ug_UserguideRiserParams_Add2),                                                         //
+                                    parent.getResources().getString(R.string.ug_UserguideRiserParams_Add3),
+                                    createButtonsGuideString(parent, true)).replaceAll("\n", "<br>");
+        text.setText(Html.fromHtml(html));
 
         ((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() {
 
@@ -184,16 +179,19 @@ public final class DialogFactory {
 
         StringTokenizer st = new StringTokenizer(parent.getResources().getString(R.string.scaVLbl), "/");
         String aVStr = st.nextToken();
-        String aHStr = st.nextToken() + ".\n" + parent.getResources().getString(R.string.ug_UserguideSightParams_Add1);
-        String vHorzSettStr = parent.getResources().getString(R.string.scHeVSLbl) + ".\n"
-                              + parent.getResources().getString(R.string.ug_UserguideSightParams_Add2);
-
-        text.setText(parent.getResources().getString(R.string.caption_UserguideSightParams, //
-                                                     aVStr.trim(), aHStr.trim(), vHorzSettStr.trim(), //
-                                                     parent.getResources().getString(R.string.scVertScaleRngMinLbl),
-                                                     parent.getResources().getString(R.string.scVertScaleRngMaxLbl),
-                                                     parent.getResources().getString(R.string.scVertSkalaMiddleLbl),
-                                                     parent.getResources().getString(R.string.scEvSLbl)));
+        String aHStr = st.nextToken();
+        String html = String.format(parent.getResources().getText(R.string.caption_UserguideSightParams).toString(),                                                         //
+                                    aVStr.trim(),
+                                    aHStr.trim(),
+                                    parent.getResources().getString(R.string.ug_UserguideSightParams_Add1),
+                                    parent.getResources().getString(R.string.scHeVSLbl),                                                                                     //
+                                    parent.getResources().getString(R.string.ug_UserguideSightParams_Add2),                                                                  //
+                                    parent.getResources().getString(R.string.scVertScaleRngMinLbl),
+                                    parent.getResources().getString(R.string.scVertScaleRngMaxLbl),
+                                    parent.getResources().getString(R.string.scVertSkalaMiddleLbl),
+                                    parent.getResources().getString(R.string.scEvSLbl),
+                                    createButtonsGuideString(parent, true)).replaceAll("\n", "<br>");
+        text.setText(Html.fromHtml(html));
 
         ((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() {
 
@@ -217,9 +215,6 @@ public final class DialogFactory {
         dialog.setContentView(R.layout.rbs_userguide_dialog);
         dialog.setTitle(parent.getResources().getText(R.string.menuUserGuide).toString());
 
-//        ImageView image = (ImageView) dialog.findViewById(R.id.ug_image);
-//        image.setImageResource(R.drawable.userguide_sight);
-
         TextView text = (TextView) dialog.findViewById(R.id.ug_txt_HowTo);
 
         String str1 = parent.getResources().getString(R.string.ug_UserguideASParams_Add1,
@@ -240,8 +235,8 @@ public final class DialogFactory {
 
         String str8 = createButtonsGuideString(parent, true);
 
-        String html = parent.getResources().getString(R.string.caption_UserguideArcherySetupParams, str1, str2, str3, str4, str5, str6, str7, str8)
-                            .replaceAll("\n", "<br>");
+        String html = parent.getResources().getString(R.string.caption_UserguideArcherySetupParams, str1, str2, str3,
+                                                      str4, str5, str6, str7, str8).replaceAll("\n", "<br>");
 
         text.setText(Html.fromHtml(html));