gitsvn
12 년 전
BIN
res/drawable-hdpi/userguide_params_2.png
파일 보기
+ 60
- 53
res/layout/rbs_about_dialog.xml
파일 보기
| @@ -1,5 +1,7 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| <LinearLayout | |||
| xmlns:android="http://schemas.android.com/apk/res/android" | |||
| xmlns:app="http://schemas.android.com/apk/res/ch.spherIC.recurvebowsight" | |||
| android:id="@+id/layout_About" | |||
| android:layout_width="fill_parent" | |||
| android:layout_height="fill_parent" | |||
| @@ -7,55 +9,60 @@ | |||
| android:orientation="vertical" | |||
| android:padding="10dp" > | |||
| <LinearLayout | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="horizontal" | |||
| android:id="@+id/layout_aboutVersion"> | |||
| <ImageView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginRight="20dip" | |||
| android:id="@+id/about_imageAppIcon" /> | |||
| <LinearLayout | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/layout_aboutVersionText" | |||
| android:orientation="vertical"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:textColor="#FF000000" | |||
| android:text="iii" | |||
| android:id="@+id/about_TextDescription" /> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:textColor="#FF000000" | |||
| android:text="iii" | |||
| android:id="@+id/about_TextVersion" | |||
| android:textStyle="bold" /> | |||
| </LinearLayout> | |||
| </LinearLayout> | |||
| <TextView | |||
| android:text="@+id/TextView01" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/about_TextAutor" | |||
| android:textColor="@color/black" | |||
| android:paddingBottom="20dip" | |||
| android:paddingTop="20dip"></TextView> | |||
| <Button | |||
| android:id="@+id/btn_AboutClose" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_gravity="center_horizontal" | |||
| android:background="@drawable/btn_fs" | |||
| android:text="@string/caption_Close" | |||
| android:textColor="@color/white" > | |||
| </Button> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:id="@+id/layout_aboutVersion" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="horizontal" > | |||
| <ImageView | |||
| android:id="@+id/about_imageAppIcon" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginRight="20dip" /> | |||
| <LinearLayout | |||
| android:id="@+id/layout_aboutVersionText" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="vertical" > | |||
| <ch.spherIC.recurvebowsight.components.FontTextView | |||
| android:id="@+id/about_TextDescription" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="iii" | |||
| android:textColor="#FF000000" | |||
| app:font="@string/TitilliumWeb_Regular" /> | |||
| <ch.spherIC.recurvebowsight.components.FontTextView | |||
| android:id="@+id/about_TextVersion" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="iii" | |||
| android:textColor="#FF000000" | |||
| app:font="@string/TitilliumWeb_Bold" /> | |||
| </LinearLayout> | |||
| </LinearLayout> | |||
| <ch.spherIC.recurvebowsight.components.FontTextView | |||
| android:id="@+id/about_TextAutor" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:paddingBottom="20dip" | |||
| android:paddingTop="20dip" | |||
| android:text="@+id/TextView01" | |||
| android:textColor="@color/black" | |||
| app:font="@string/TitilliumWeb_Regular" /> | |||
| <Button | |||
| android:id="@+id/btn_AboutClose" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_gravity="center_horizontal" | |||
| android:background="@drawable/btn_fs" | |||
| android:text="@string/caption_Close" | |||
| android:textColor="@color/white" > | |||
| </Button> | |||
| </LinearLayout> | |||
+ 44
- 46
res/layout/rbs_userguide_dialog.xml
파일 보기
| @@ -1,11 +1,12 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <LinearLayout | |||
| xmlns:android="http://schemas.android.com/apk/res/android" | |||
| android:background="@drawable/bg_about" | |||
| android:padding="10dp" | |||
| android:layout_height="fill_parent" | |||
| android:layout_width="fill_parent" | |||
| android:orientation="vertical"> | |||
| <LinearLayout | |||
| xmlns:android="http://schemas.android.com/apk/res/android" | |||
| xmlns:app="http://schemas.android.com/apk/res/ch.spherIC.recurvebowsight" | |||
| android:layout_width="fill_parent" | |||
| android:layout_height="fill_parent" | |||
| android:background="@drawable/bg_about" | |||
| android:orientation="vertical" | |||
| android:padding="10dp" > | |||
| <ImageView | |||
| android:id="@+id/ug_image" | |||
| @@ -18,43 +19,40 @@ | |||
| android:padding="1dp" | |||
| android:scaleType="centerInside" /> | |||
| <ScrollView | |||
| android:id="@+id/ug_ScrollView" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:addStatesFromChildren="true" > | |||
| <LinearLayout | |||
| android:id="@+id/linearLayout1" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="vertical" > | |||
| <TextView | |||
| android:id="@+id/ug_txt_HowTo" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:lineSpacingExtra="1dp" | |||
| android:text="Text hier..." | |||
| android:textColor="@color/black" | |||
| android:textSize="12dp" > | |||
| </TextView> | |||
| </LinearLayout> | |||
| </ScrollView> | |||
| <Button | |||
| android:id="@+id/btn_ugClose" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_gravity="center_horizontal" | |||
| android:layout_marginTop="20dp" | |||
| android:background="@drawable/btn_fs" | |||
| android:text="@string/caption_Close" | |||
| android:textColor="@color/white" > | |||
| </Button> | |||
| <ScrollView | |||
| android:id="@+id/ug_ScrollView" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:addStatesFromChildren="true" > | |||
| <LinearLayout | |||
| android:id="@+id/linearLayout1" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="vertical" > | |||
| <ch.spherIC.recurvebowsight.components.FontTextView | |||
| android:id="@+id/ug_txt_HowTo" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:lineSpacingExtra="1dp" | |||
| android:text="Text hier..." | |||
| android:textColor="@color/black" | |||
| android:textSize="12dp" | |||
| app:font="@string/TitilliumWeb_Regular" /> | |||
| </LinearLayout> | |||
| </ScrollView> | |||
| <Button | |||
| android:id="@+id/btn_ugClose" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_gravity="center_horizontal" | |||
| android:layout_marginTop="20dp" | |||
| android:background="@drawable/btn_fs" | |||
| android:text="@string/caption_Close" | |||
| android:textColor="@color/white" > | |||
| </Button> | |||
| </LinearLayout> | |||
| </LinearLayout> | |||
+ 2
- 2
res/values-de/strings.xml
파일 보기
| @@ -110,10 +110,10 @@ | |||
| merlin868@hotmail.com\n\nÜbersetzt von spherIC (F. Smilari)</string> | |||
| <!-- --> | |||
| <string name="ug_UserguideParams_Add1"> | |||
| %1$s:\nDie einzelnen Punkte der Flugbahnkurve werden im eingestellten Intervall berechnet. Ein kleinerer Intervall führt zu einer genaueren Flugbahn, hat aber zur Folge, dass die Berechnung länger dauert. | |||
| Die einzelnen Punkte der Flugbahnkurve werden im eingestellten Intervall berechnet. Ein kleinerer Intervall führt zu einer genaueren Flugbahn, hat aber zur Folge, dass die Berechnung länger dauert. | |||
| </string> | |||
| <string name="ug_UserguideParams_Add2"> | |||
| %1$s:\nDieser Wert bestimmt wie genau der resultierende Höhenunterschied zwischen Bogen und Ziel berechnet wird. Ein kleinerer Wert führt zu einer genaueren Flugbahn, hat aber zur Folge, dass die Berechnung länger dauert. | |||
| Dieser Wert bestimmt wie genau der resultierende Höhenunterschied zwischen Bogen und Ziel berechnet wird. Ein kleinerer Wert führt zu einer genaueren Flugbahn, hat aber zur Folge, dass die Berechnung länger dauert. | |||
| </string> | |||
| <!-- --> | |||
| <string name="ug_UserguideRiserParams_Add1"> | |||
+ 2
- 2
res/values/strings.xml
파일 보기
| @@ -109,10 +109,10 @@ | |||
| merlin868@hotmail.com\n\nTranslated by spherIC (F. Smilari)</string> | |||
| <!-- --> | |||
| <string name="ug_UserguideParams_Add1"> | |||
| %1$s:\nThe single points of the ballistic trajectory are calculated with this time interval to eachn other. A lower value will result in a more accurate ballistic trajectory but also slows down the calculation time. | |||
| The single points of the ballistic trajectory are calculated with this time interval to eachn other. A lower value will result in a more accurate ballistic trajectory but also slows down the calculation time. | |||
| </string> | |||
| <string name="ug_UserguideParams_Add2"> | |||
| %1$s:\n.This value determines the calculation precision of the difference between bow and target. A lower value will result in a more accurate ballistic trajectory but also slows down the calculation time. | |||
| This value determines the calculation precision of the difference between bow and target. A lower value will result in a more accurate ballistic trajectory but also slows down the calculation time. | |||
| </string> | |||
| <!-- --> | |||
| <string name="ug_UserguideRiserParams_Add1"> | |||
+ 3
- 2
res/values/strings_notrans.xml
파일 보기
| @@ -19,8 +19,9 @@ | |||
| <item>0.1</item> | |||
| </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"><b>1. %1$s</b>\n\n<b>2. %2$s</b>\n%3$s\n\n<b>4. %4$s</b>\n\n<b>5. %5$s</b>\n\n%6$s</string> | |||
| <string name="caption_UserguideParams"><b>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</b>\n%9$s\n\n<b>%10$s</b>\n%11$s</string> | |||
| <string name="caption_UserguideParams2"><b>1. %1$s</b>\n\n<b>2. %2$s</b>\n%3$s\n\n<b>3. %4$s</b>\n%5$s\n\n<b>4. %6$s</b>\n\n<b>5. %7$s</b>\n\n<b>6. %8$s</b>\n\n<b>7. %9$s</b>\n\n<b>8. %10$s</b>\n\n<b>9. %11$s</b>\n%12$s</string> | |||
| <string name="caption_UserguideRiserParams"><b>1. %1$s</b>\n\n<b>2. %2$s</b>\n%3$s\n\n<b>4. %4$s</b>\n\n<b>5. %5$s</b>\n\n%6$s</string> | |||
| <string name="caption_UserguideSightParams"><b>1. %1$s</b>\n\n<b>2. %2$s</b>\n%3$s\n\n<b>3. %4$s</b>\n%5$s\n\n<b>4. %6$s</b>\n\n<b>5. %7$s</b>\n\n<b>6. %8$s</b>\n\n<b>7. %9$s</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> | |||
+ 67
- 12
src/ch/spherIC/recurvebowsight/DialogFactory.java
파일 보기
| @@ -64,7 +64,13 @@ public final class DialogFactory { | |||
| break; | |||
| case RBSMainActivity.DLG_USERGUIDE_PARAMS_SIGHT: | |||
| dlg = createUserguideParamsDialog(parent); | |||
| if (parent.getIntent().getExtras().containsKey("ActiveTabIndex") && parent.getIntent().getExtras().getInt("ActiveTabIndex") == 0) { | |||
| dlg = createUserguideParamsDialog(parent); | |||
| } else if (parent.getIntent().getExtras().containsKey("ActiveTabIndex") && parent.getIntent().getExtras().getInt("ActiveTabIndex") == 2) { | |||
| dlg = createUserguideParams2Dialog(parent); | |||
| } else { | |||
| dlg = null; | |||
| } | |||
| break; | |||
| case RBSMainActivity.DLG_USERGUIDE_RISER_CFG: | |||
| @@ -102,17 +108,65 @@ public final class DialogFactory { | |||
| image.setImageResource(R.drawable.userguide_params); | |||
| TextView text = (TextView) dialog.findViewById(R.id.ug_txt_HowTo); | |||
| text.setText(parent.getResources().getString(R.string.caption_UserguideParams, parent.getResources().getString(R.string.arrowNockHeightLbl), | |||
| parent.getResources().getString(R.string.targetCenterHeightLbl), | |||
| parent.getResources().getString(R.string.shootingDistanzLbl), | |||
| parent.getResources().getString(R.string.ashNA), | |||
| parent.getResources().getString(R.string.bowPulloutLbl), | |||
| parent.getResources().getString(R.string.asNockRaising), | |||
| parent.getResources().getString(R.string.asBraceHeight), | |||
| parent.getResources().getString(R.string.ug_UserguideParams_Add1, | |||
| parent.getResources().getString(R.string.deltaTimeLbl)), | |||
| parent.getResources().getString(R.string.ug_UserguideParams_Add2, | |||
| parent.getResources().getString(R.string.calcPrecisionLbl)))); | |||
| String html = String.format(parent.getResources().getText(R.string.caption_UserguideParams).toString(), | |||
| parent.getResources().getString(R.string.arrowNockHeightLbl), | |||
| parent.getResources().getString(R.string.targetCenterHeightLbl), | |||
| parent.getResources().getString(R.string.shootingDistanzLbl), | |||
| parent.getResources().getString(R.string.ashNA), | |||
| parent.getResources().getString(R.string.bowPulloutLbl), | |||
| parent.getResources().getString(R.string.asNockRaising), | |||
| parent.getResources().getString(R.string.asBraceHeight), | |||
| parent.getResources().getString(R.string.deltaTimeLbl), | |||
| parent.getResources().getString(R.string.ug_UserguideParams_Add1), | |||
| parent.getResources().getString(R.string.calcPrecisionLbl), | |||
| parent.getResources().getString(R.string.ug_UserguideParams_Add2)).replaceAll("\n", | |||
| "<br>"); | |||
| text.setText(Html.fromHtml(html)); | |||
| ((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() { | |||
| @Override | |||
| public void onClick(final View v) { | |||
| dialog.dismiss(); | |||
| } | |||
| }); | |||
| return dialog; | |||
| } | |||
| /** | |||
| * @param parent | |||
| * | |||
| * @return | |||
| */ | |||
| private static Dialog createUserguideParams2Dialog(final Activity parent) { | |||
| final Dialog dialog = new Dialog(parent); | |||
| 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_params_2); | |||
| TextView text = (TextView) dialog.findViewById(R.id.ug_txt_HowTo); | |||
| StringTokenizer st = new StringTokenizer(parent.getResources().getString(R.string.scaVLbl), "/"); | |||
| String aVStr = st.nextToken(); | |||
| String aHStr = st.nextToken(); | |||
| String html = String.format(parent.getResources().getText(R.string.caption_UserguideParams2).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), | |||
| parent.getResources().getString(R.string.rcVvisVLbl), // | |||
| parent.getResources().getString(R.string.rcVvisHLbl), // | |||
| parent.getResources().getString(R.string.ug_UserguideRiserParams_Add1)).replaceAll("\n", | |||
| "<br>"); | |||
| text.setText(Html.fromHtml(html)); | |||
| ((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() { | |||
| @@ -125,6 +179,7 @@ public final class DialogFactory { | |||
| return dialog; | |||
| } | |||
| /** | |||
| * @param parent | |||
| * | |||
+ 35
- 33
src/ch/spherIC/recurvebowsight/RBSMainActivity.java
파일 보기
| @@ -169,6 +169,7 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| addValueChangeListeners(); | |||
| xTextViewUp(this.txtViewParams); | |||
| getIntent().putExtra("ActiveTabIndex", 0); | |||
| this.calcTimeIntervalCboBox.setAdapter(new FontArrayAdapter<String>(this, R.layout.rbs_spinner, | |||
| getResources().getStringArray(R.array.CalculationTimeIntervals), | |||
| @@ -194,7 +195,8 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| IRiser selectedRiser = this.scRiserSpinner.getSelectedRiser(); | |||
| List<IRiser> risers = RiserDao.getInstance().loadAll(); | |||
| risers.add(0, new Riser(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, null)); | |||
| this.scRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers, this.scRiserSpinner)); | |||
| this.scRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers, | |||
| this.scRiserSpinner)); | |||
| if (selectedRiser != null) { | |||
| this.scRiserSpinner.setSelectedRiser(selectedRiser); | |||
| } | |||
| @@ -203,8 +205,10 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| private void loadSightSpinner() { | |||
| ISight selectedSight = this.scSightSpinner.getSelectedSight(); | |||
| List<ISight> sights = SightDao.getInstance().loadAll(); | |||
| sights.add(0, new Sight(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, "", null, null)); | |||
| this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights, this.scSightSpinner)); | |||
| sights.add(0, | |||
| new Sight(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, "", null, null)); | |||
| this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights, | |||
| this.scSightSpinner)); | |||
| if (selectedSight != null) { | |||
| this.scSightSpinner.setSelectedSight(selectedSight); | |||
| } | |||
| @@ -338,10 +342,9 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| } | |||
| RBSMainActivity.this.scHeVSTxtFld.setVisibility(View.INVISIBLE); | |||
| RBSMainActivity.this.scHeVSTxtFld.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSTxtFld | |||
| .getLayoutParams().width, | |||
| RBSMainActivity.this.scHeVSTxtFld | |||
| .getLayoutParams().height, 0f)); | |||
| RBSMainActivity.this.scHeVSTxtFld.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSTxtFld.getLayoutParams().width, | |||
| RBSMainActivity.this.scHeVSTxtFld.getLayoutParams().height, | |||
| 0f)); | |||
| RBSMainActivity.this.scHeVSSpinner.setVisibility(View.VISIBLE); | |||
| LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSSpinner.getLayoutParams().width, | |||
| @@ -349,13 +352,14 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| 1f); | |||
| params.gravity = Gravity.FILL_VERTICAL; | |||
| RBSMainActivity.this.scHeVSSpinner.setLayoutParams(params); | |||
| RBSMainActivity.this.scHeVSSpinner.setAdapter(new FontArrayAdapter<String>(RBSMainActivity.this, R.layout.rbs_spinner, | |||
| listHeVis, RBSMainActivity.this.scHeVSSpinner)); | |||
| RBSMainActivity.this.scHeVSSpinner.setAdapter(new FontArrayAdapter<String>(RBSMainActivity.this, | |||
| R.layout.rbs_spinner, | |||
| listHeVis, | |||
| RBSMainActivity.this.scHeVSSpinner)); | |||
| if (RBSMainActivity.this.selectedHeVS == null) { | |||
| if (RBSMainActivity.this.selectedArcherySetup != null | |||
| && RBSMainActivity.this.selectedArcherySetup.getSight().getId() == sight.getId()) { | |||
| RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(DF.format(RBSMainActivity.this.selectedArcherySetup | |||
| .getSightHorzSetting())); | |||
| RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(DF.format(RBSMainActivity.this.selectedArcherySetup.getSightHorzSetting())); | |||
| } | |||
| } else { | |||
| RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(RBSMainActivity.this.selectedHeVS); | |||
| @@ -366,16 +370,15 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| + DF.format(sight.getVertSkalaRangeMax())); | |||
| } else { | |||
| RBSMainActivity.this.scHeVSSpinner.setVisibility(View.INVISIBLE); | |||
| RBSMainActivity.this.scHeVSSpinner.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSSpinner | |||
| .getLayoutParams().width, | |||
| RBSMainActivity.this.scHeVSSpinner | |||
| .getLayoutParams().height, 0f)); | |||
| RBSMainActivity.this.scHeVSSpinner.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSSpinner.getLayoutParams().width, | |||
| RBSMainActivity.this.scHeVSSpinner.getLayoutParams().height, | |||
| 0f)); | |||
| RBSMainActivity.this.scHeVSTxtFld.setVisibility(View.VISIBLE); | |||
| RBSMainActivity.this.scHeVSTxtFld.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSTxtFld | |||
| .getLayoutParams().width, | |||
| RBSMainActivity.this.scHeVSTxtFld | |||
| .getLayoutParams().height, 1f)); | |||
| RBSMainActivity.this.scHeVSSpinner.setAdapter(new FontArrayAdapter<String>(RBSMainActivity.this, R.layout.rbs_spinner, | |||
| RBSMainActivity.this.scHeVSTxtFld.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSTxtFld.getLayoutParams().width, | |||
| RBSMainActivity.this.scHeVSTxtFld.getLayoutParams().height, | |||
| 1f)); | |||
| RBSMainActivity.this.scHeVSSpinner.setAdapter(new FontArrayAdapter<String>(RBSMainActivity.this, | |||
| R.layout.rbs_spinner, | |||
| new ArrayList<String>(), | |||
| RBSMainActivity.this.scHeVSSpinner)); | |||
| RBSMainActivity.this.scaVTxtFld.setText(""); | |||
| @@ -506,14 +509,17 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| if (v == RBSMainActivity.this.txtViewParams) { | |||
| if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 0) { | |||
| RBSMainActivity.this.viewFlipper.setDisplayedChild(0); | |||
| getIntent().putExtra("ActiveTabIndex", 0); | |||
| } | |||
| } else if (v == RBSMainActivity.this.txtViewResults) { | |||
| if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 1) { | |||
| RBSMainActivity.this.viewFlipper.setDisplayedChild(1); | |||
| getIntent().putExtra("ActiveTabIndex", 1); | |||
| } | |||
| } else { | |||
| if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 2) { | |||
| RBSMainActivity.this.viewFlipper.setDisplayedChild(2); | |||
| getIntent().putExtra("ActiveTabIndex", 2); | |||
| } | |||
| } | |||
| @@ -858,7 +864,8 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| } | |||
| @Override | |||
| public void updateTrajectoryTxtFld(final Integer step, final Double[] flightCurveRow, final Double startAngle, final Double[] maxHCurve) { | |||
| public void updateTrajectoryTxtFld(final Integer step, final Double[] flightCurveRow, final Double startAngle, | |||
| final Double[] maxHCurve) { | |||
| int width = this.flightCurveTxtFld.getMeasuredWidth(); | |||
| Double[] r1 = flightCurveRow; | |||
| @@ -931,7 +938,8 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| this.flightCurveChart.getDataSet().removeSeries(0); | |||
| this.flightCurveChart.getDataSet().addSeries(0, serie); | |||
| this.flightCurveChart.updateRendererAfterCalculation(flightCurve[flightCurve.length - 1][TrajectoryCalculator.IDX_X], flightCurve); | |||
| this.flightCurveChart.updateRendererAfterCalculation(flightCurve[flightCurve.length - 1][TrajectoryCalculator.IDX_X], | |||
| flightCurve); | |||
| } | |||
| @@ -954,21 +962,15 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi | |||
| Double vVh = Double.valueOf(this.scVvisHTxtFld.getText().toString()) + Double.valueOf(this.scaHTxtFld.getText().toString()); | |||
| Double vVv = Double.valueOf(this.scVvisVTxtFld.getText().toString()) + Double.valueOf(this.scaVTxtFld.getText().toString()); | |||
| Double a = Double.valueOf(this.bowPulloutTxtFld.getText().toString()) * 10; | |||
| Double heVs = this.scHeVSSpinner.getVisibility() == View.VISIBLE ? Double.valueOf(this.scHeVSSpinner.getSelectedItem().toString()) | |||
| : Double.valueOf(this.scHeVSTxtFld.getText().toString()); | |||
| Double heVs = this.scHeVSSpinner.getVisibility() == View.VISIBLE ? Double.valueOf(this.scHeVSSpinner.getSelectedItem().toString()) : Double.valueOf(this.scHeVSTxtFld.getText().toString()); | |||
| Double lhNA = this.selectedArcherySetup.getHNA(); | |||
| Double dltH = (Double.valueOf(this.targetCenterHeightTxtFld.getText().toString()) | |||
| - Double.valueOf(this.arrowNockHeightTxtFld.getText().toString())) * Math.pow(10, 3); | |||
| Double ldistH = Double.valueOf(this.shootingDistanzTxtFld.getText().toString()) * Math.pow(10, 3); | |||
| Double minSkala = this.scVertScaleRngTxtFld.getText().toString().contains("-") | |||
| ? Double.valueOf(this.scVertScaleRngTxtFld.getText().toString().substring(0, | |||
| this.scVertScaleRngTxtFld.getText().toString() | |||
| .indexOf('-'))) : 0d; | |||
| Double maxSkala = this.scVertScaleRngTxtFld.getText().toString().contains("-") | |||
| ? Double.valueOf(this.scVertScaleRngTxtFld.getText().toString().substring(this.scVertScaleRngTxtFld.getText().toString() | |||
| .indexOf('-') + 1, | |||
| this.scVertScaleRngTxtFld.getText().toString() | |||
| .length())) : 0d; | |||
| Double minSkala = this.scVertScaleRngTxtFld.getText().toString().contains("-") ? Double.valueOf(this.scVertScaleRngTxtFld.getText().toString().substring(0, | |||
| this.scVertScaleRngTxtFld.getText().toString().indexOf('-'))) : 0d; | |||
| Double maxSkala = this.scVertScaleRngTxtFld.getText().toString().contains("-") ? Double.valueOf(this.scVertScaleRngTxtFld.getText().toString().substring(this.scVertScaleRngTxtFld.getText().toString().indexOf('-') + 1, | |||
| this.scVertScaleRngTxtFld.getText().toString().length())) : 0d; | |||
| Double nockRaising = Double.valueOf(this.nockRaisingTxtFld.getText().toString()) | |||
| - Double.valueOf(this.arrowDiameterTxtFld.getText().toString()); | |||
| Double braceHeight = Double.valueOf(this.braceHeightTxtFld.getText().toString()); | |||
Loading…