gitsvn 12 년 전
부모
커밋
2acc5d62e9

+ 34
- 10
src/ch/spherIC/recurvebowsight/RBSMainActivity.java 파일 보기

public static final int DLG_USERGUIDE_SIGHT = 2; public static final int DLG_USERGUIDE_SIGHT = 2;
public static final int DLG_ABOUT = 3; public static final int DLG_ABOUT = 3;
private static final long serialVersionUID = 9142533835653341769L;
private static final Double ANGLE_90 = 90d; private static final Double ANGLE_90 = 90d;
private static final int MIN_DISTANCE = 50; private static final int MIN_DISTANCE = 50;
private static final double CENTI = 0.01; private static final double CENTI = 0.01;
getResources().getStringArray(R.array.CalculationAccuracies), getResources().getStringArray(R.array.CalculationAccuracies),
this.calcAccuracyCboBox)); this.calcAccuracyCboBox));
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));
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));
loadRiserSpinner();
loadSightSpinner();
addRiserAndSightSpinnerListeners(); addRiserAndSightSpinnerListeners();
GraphicalView flightCurveChartView; GraphicalView flightCurveChartView;
} }
private void loadRiserSpinner() {
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));
if (selectedRiser != null) {
this.scRiserSpinner.setSelectedRiser(selectedRiser);
}
}
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));
if (selectedSight != null) {
this.scSightSpinner.setSelectedSight(selectedSight);
}
}
@Override @Override
protected void onSaveInstanceState(final Bundle outState) { protected void onSaveInstanceState(final Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
case R.id.addConfiguration: case R.id.addConfiguration:
Intent intent = new Intent(RBSMainActivity.this, MainConfigurationActivity.class);
startActivity(intent);
Intent intent = new Intent(this, MainConfigurationActivity.class);
startActivityForResult(intent, 1);
return true; return true;
case R.id.moreItems: case R.id.moreItems:
this.calcTimeIntervalCboBox.setSelectionByVal(calcAccuracyToSet); this.calcTimeIntervalCboBox.setSelectionByVal(calcAccuracyToSet);
} }
@Override
protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == 1) {
loadRiserSpinner();
loadSightSpinner();
}
}
} }

+ 12
- 6
src/ch/spherIC/recurvebowsight/configuration/MainConfigurationActivity.java 파일 보기

private ListView mainConfigListVIew; private ListView mainConfigListVIew;
@Override @Override
protected void onCreate(final Bundle savedInstanceState) { protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
this.mainConfigListVIew.setOnItemClickListener(new AdapterView.OnItemClickListener() { this.mainConfigListVIew.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(final AdapterView<?> parent, final View view, final int position,
final long id) {
public void onItemClick(final AdapterView<?> parent, final View view, final int position, final long id) {
final String[] item = (String[]) parent.getItemAtPosition(position); final String[] item = (String[]) parent.getItemAtPosition(position);
if (item[0].equals(getResources().getString(R.string.caption_MainCfg_Riser_MainText))) { if (item[0].equals(getResources().getString(R.string.caption_MainCfg_Riser_MainText))) {
Intent intent = new Intent(MainConfigurationActivity.this, RiserConfigurationActivity.class); Intent intent = new Intent(MainConfigurationActivity.this, RiserConfigurationActivity.class);
startActivity(intent);
} else if (item[0].equals(getResources().getString(R.string.caption_MainCfg_Sight_MainText))) { }
else if (item[0].equals(getResources().getString(R.string.caption_MainCfg_ArcerySetup_MainText))) { }
startActivityForResult(intent, 1);
} else if (item[0].equals(getResources().getString(R.string.caption_MainCfg_Sight_MainText))) {
//
} else if (item[0].equals(getResources().getString(R.string.caption_MainCfg_ArcerySetup_MainText))) {
//
}
} }
}); });
} }
return true; return true;
} }
@Override
protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
super.onActivityResult(requestCode, resultCode, data);
setResult(resultCode);
}
} }

+ 2
- 1
src/ch/spherIC/recurvebowsight/configuration/RiserConfigurationActivity.java 파일 보기

try { try {
RiserDao.getInstance().delete(this.selectedRiser); RiserDao.getInstance().delete(this.selectedRiser);
loadRiserSpinner(); loadRiserSpinner();
setResult(1);
} catch (SQLiteConstraintException e) { } catch (SQLiteConstraintException e) {
Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_DeleteNotPossible), Toast.LENGTH_LONG); Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_DeleteNotPossible), Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0); toast.setGravity(Gravity.CENTER, 0, 0);
/** /**
* Speichern. * Speichern.
*/ */
@SuppressWarnings("unchecked")
protected void onSaveRiser() { protected void onSaveRiser() {
if (this.selectedRiser != null) { if (this.selectedRiser != null) {
if (!this.rcManufacturerTxtFld.getText().toString().isEmpty() && !this.rcModelTxtFld.getText().toString().isEmpty() if (!this.rcManufacturerTxtFld.getText().toString().isEmpty() && !this.rcModelTxtFld.getText().toString().isEmpty()
loadRiserSpinner(); loadRiserSpinner();
this.rcRiserSpinner.setSelectedRiser(this.selectedRiser); this.rcRiserSpinner.setSelectedRiser(this.selectedRiser);
} }
setResult(1);
} else { } else {
Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_FillAllMandatoryFields), Toast.LENGTH_LONG); Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_FillAllMandatoryFields), Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0); toast.setGravity(Gravity.CENTER, 0, 0);

Loading…
취소
저장