Android
/
RecurveBowSight
Volgen 1
Ster 0
Vork 0
Code Kwesties 0 Pull-aanvragen 0 Publicaties 0 Wiki Activiteit
Bladeren bron

Userguides

master
gitsvn 12 jaren geleden
bovenliggende
2142b751b1
commit
f59b12db15
6 gewijzigde bestanden met toevoegingen van 88 en 104 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 40
    44
      src/ch/spherIC/recurvebowsight/DialogFactory.java
  2. 39
    45
      src/ch/spherIC/recurvebowsight/RBSMainActivity.java
  3. 2
    3
      src/ch/spherIC/recurvebowsight/configuration/ArcherySetupConfigurationActivity.java
  4. 1
    2
      src/ch/spherIC/recurvebowsight/configuration/MainConfigurationActivity.java
  5. 3
    5
      src/ch/spherIC/recurvebowsight/configuration/RiserConfigurationActivity.java
  6. 3
    5
      src/ch/spherIC/recurvebowsight/configuration/SightConfigurationActivity.java

+ 40
- 44
src/ch/spherIC/recurvebowsight/DialogFactory.java Bestand weergeven

@@ -41,6 +41,14 @@ import java.util.StringTokenizer;
*/
public final class DialogFactory {
public static final int DLG_CHOOSE_ARCHERYSETUP = 0;
public static final int DLG_USERGUIDE_PARAMS = 1;
public static final int DLG_USERGUIDE_PARAMS_2 = 2;
public static final int DLG_USERGUIDE_RISER_CFG = 3;
public static final int DLG_USERGUIDE_SIGHT_CFG = 4;
public static final int DLG_USERGUIDE_AS_CFG = 5;
public static final int DLG_ABOUT = 6;
/**
* Static main method to initialize classes
*
@@ -55,33 +63,31 @@ public final class DialogFactory {
switch (dlgCode) {
case RBSMainActivity.DLG_CHOOSE_ARCHERYSETUP:
case DLG_CHOOSE_ARCHERYSETUP:
dlg = createChooseArcherySetupDialog(parent);
break;
case RBSMainActivity.DLG_ABOUT:
case DLG_ABOUT:
dlg = createAboutDialog(parent);
break;
case RBSMainActivity.DLG_USERGUIDE_PARAMS_SIGHT:
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;
}
case DLG_USERGUIDE_PARAMS:
dlg = createUserguideParamsDialog(parent);
break;
case DLG_USERGUIDE_PARAMS_2:
dlg = createUserguideParams2Dialog(parent);
break;
case RBSMainActivity.DLG_USERGUIDE_RISER_CFG:
case DLG_USERGUIDE_RISER_CFG:
dlg = createUserguideRiserDialog(parent);
break;
case RBSMainActivity.DLG_USERGUIDE_SIGHT_CFG:
case DLG_USERGUIDE_SIGHT_CFG:
dlg = createUserguideSightDialog(parent);
break;
case RBSMainActivity.DLG_USERGUIDE_AS_CFG:
case DLG_USERGUIDE_AS_CFG:
dlg = createUserguideArcherySetupDialog(parent);
break;
@@ -111,16 +117,12 @@ public final class DialogFactory {
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.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>");
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() {
@@ -152,20 +154,16 @@ public final class DialogFactory {
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), //
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>");
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() {
@@ -200,8 +198,8 @@ public final class DialogFactory {
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>");
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() {
@@ -235,17 +233,15 @@ public final class DialogFactory {
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_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), //
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>");
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() {
@@ -290,8 +286,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));

+ 39
- 45
src/ch/spherIC/recurvebowsight/RBSMainActivity.java Bestand weergeven

@@ -86,14 +86,6 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
public static final DecimalFormat DF_1 = new DecimalFormat("0.00");
public static final DecimalFormat DF_EVS = new DecimalFormat("0.#");
public static final int DLG_CHOOSE_ARCHERYSETUP = 0;
public static final int DLG_USERGUIDE_PARAMS_SIGHT = 1;
public static final int DLG_USERGUIDE_RISER_CFG = 2;
public static final int DLG_USERGUIDE_SIGHT_CFG = 3;
public static final int DLG_USERGUIDE_AS_CFG = 4;
public static final int DLG_ABOUT = 5;
private static final Double ANGLE_90 = 90d;
private static final int MIN_DISTANCE = 50;
private static final double CENTI = 0.01;
private static final double MILLI = 0.001;
@@ -169,7 +161,6 @@ 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),
@@ -195,8 +186,7 @@ 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);
}
@@ -205,10 +195,8 @@ 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);
}
@@ -342,9 +330,10 @@ 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,
@@ -352,14 +341,13 @@ 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);
@@ -370,15 +358,16 @@ 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("");
@@ -509,17 +498,14 @@ 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);
}
}
@@ -610,7 +596,7 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
switch (item.getItemId()) {
case R.id.chooseConfiguration:
showDialog(DLG_CHOOSE_ARCHERYSETUP);
showDialog(DialogFactory.DLG_CHOOSE_ARCHERYSETUP);
return true;
case R.id.doCalculation:
@@ -635,15 +621,18 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
});
return true;
case R.id.itemAbout:
showDialog(DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true;
case R.id.itemUserGuide:
showDialog(DLG_USERGUIDE_PARAMS_SIGHT);
if (RBSMainActivity.this.viewFlipper.getDisplayedChild() == 0) {
showDialog(DialogFactory.DLG_USERGUIDE_PARAMS);
} else if (RBSMainActivity.this.viewFlipper.getDisplayedChild() == 2) {
showDialog(DialogFactory.DLG_USERGUIDE_PARAMS_2);
}
return true;
default:
@@ -938,8 +927,7 @@ 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);
}
@@ -962,15 +950,21 @@ 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());

+ 2
- 3
src/ch/spherIC/recurvebowsight/configuration/ArcherySetupConfigurationActivity.java Bestand weergeven

@@ -27,7 +27,6 @@ import android.widget.Toast;
import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.RiserSpinner;
import ch.spherIC.recurvebowsight.components.SightSpinner;
@@ -327,11 +326,11 @@ public class ArcherySetupConfigurationActivity extends Activity {
switch (item.getItemId()) {
case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true;
case R.id.itemUserGuide:
showDialog(RBSMainActivity.DLG_USERGUIDE_AS_CFG);
showDialog(DialogFactory.DLG_USERGUIDE_AS_CFG);
return true;
default:

+ 1
- 2
src/ch/spherIC/recurvebowsight/configuration/MainConfigurationActivity.java Bestand weergeven

@@ -18,7 +18,6 @@ import android.widget.ListView;
import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.MainConfigurationArrayAdapter;
import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil;
@@ -99,7 +98,7 @@ public class MainConfigurationActivity extends Activity {
switch (item.getItemId()) {
case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true;
default:

+ 3
- 5
src/ch/spherIC/recurvebowsight/configuration/RiserConfigurationActivity.java Bestand weergeven

@@ -30,7 +30,6 @@ import android.widget.Toast;
import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.RiserSpinner;
import ch.spherIC.recurvebowsight.database.dao.RiserDao;
@@ -82,8 +81,7 @@ public class RiserConfigurationActivity extends Activity {
private void loadRiserSpinner() {
List<IRiser> risers = RiserDao.getInstance().loadAll();
this.rcRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers,
this.rcRiserSpinner));
this.rcRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers, this.rcRiserSpinner));
}
private void initializeComponents() {
@@ -231,11 +229,11 @@ public class RiserConfigurationActivity extends Activity {
switch (item.getItemId()) {
case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true;
case R.id.itemUserGuide:
showDialog(RBSMainActivity.DLG_USERGUIDE_RISER_CFG);
showDialog(DialogFactory.DLG_USERGUIDE_RISER_CFG);
return true;
default:

+ 3
- 5
src/ch/spherIC/recurvebowsight/configuration/SightConfigurationActivity.java Bestand weergeven

@@ -32,7 +32,6 @@ import android.widget.Toast;
import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.SightSpinner;
import ch.spherIC.recurvebowsight.database.dao.SightDao;
@@ -86,8 +85,7 @@ public class SightConfigurationActivity extends Activity {
private void loadSightSpinner() {
List<ISight> sights = SightDao.getInstance().loadAll();
this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights,
this.scSightSpinner));
this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights, this.scSightSpinner));
}
private void initializeComponents() {
@@ -245,11 +243,11 @@ public class SightConfigurationActivity extends Activity {
switch (item.getItemId()) {
case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true;
case R.id.itemUserGuide:
showDialog(RBSMainActivity.DLG_USERGUIDE_SIGHT_CFG);
showDialog(DialogFactory.DLG_USERGUIDE_SIGHT_CFG);
return true;
default:

Schrijf Voorbeeld
Laden…
Annuleren
Opslaan