Просмотр исходного кода

Berücksichtigung Nockpunktüberhöhung

master
gitsvn 12 лет назад
Родитель
Сommit
a32fb6dd77

+ 626
- 573
res/layout/activity_archery_setup_configuration.xml
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 61
- 0
res/layout/rbs_about_dialog.xml Просмотреть файл

<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_About"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/bg_about"
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>

+ 38
- 37
res/layout/rbs_main.xml Просмотреть файл

android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="4dp" > android:layout_margin="4dp" >
<ch.spherIC.recurvebowsight.components.FontTextView
<ch.spherIC.recurvebowsight.components.XTextView
android:id="@+id/bowAndArrowParams" android:id="@+id/bowAndArrowParams"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/yellow"
android:background="@drawable/glassbg_black"
android:paddingBottom="3dip" android:paddingBottom="3dip"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingTop="3dip" android:paddingTop="3dip"
android:text="@string/titleBowAndArrowParams" android:text="@string/titleBowAndArrowParams"
android:textColor="@color/black"
android:textColor="@color/white"
android:textStyle="bold" android:textStyle="bold"
app:font="@string/TitilliumWeb_Bold" /> app:font="@string/TitilliumWeb_Bold" />
</TableRow> </TableRow>
<TableRow <TableRow
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="4dp" > android:layout_margin="4dp" >
<ch.spherIC.recurvebowsight.components.FontTextView
<ch.spherIC.recurvebowsight.components.XTextView
android:id="@+id/atmosphericalParams" android:id="@+id/atmosphericalParams"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/yellow"
android:background="@drawable/glassbg_black"
android:paddingBottom="3dip" android:paddingBottom="3dip"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingTop="3dip" android:paddingTop="3dip"
android:text="@string/titleAtmosphericalParams" android:text="@string/titleAtmosphericalParams"
android:textColor="@color/black"
android:textColor="@color/white"
android:textStyle="bold" android:textStyle="bold"
app:font="@string/TitilliumWeb_Bold" /> app:font="@string/TitilliumWeb_Bold" />
</TableRow> </TableRow>
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="4dp" > android:layout_margin="4dp" >
<ch.spherIC.recurvebowsight.components.FontTextView
<ch.spherIC.recurvebowsight.components.XTextView
android:id="@+id/shootingParams" android:id="@+id/shootingParams"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/yellow"
android:background="@drawable/glassbg_black"
android:paddingBottom="3dip" android:paddingBottom="3dip"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingTop="3dip" android:paddingTop="3dip"
android:text="@string/titleShootingParams" android:text="@string/titleShootingParams"
android:textColor="@color/black"
android:textColor="@color/white"
android:textStyle="bold" android:textStyle="bold"
app:font="@string/TitilliumWeb_Bold" /> app:font="@string/TitilliumWeb_Bold" />
</TableRow> </TableRow>
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:nextFocusDown="@+id/arrowDiameterTxtFld" android:nextFocusDown="@+id/arrowDiameterTxtFld"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="4dp" > android:layout_margin="4dp" >
<ch.spherIC.recurvebowsight.components.FontTextView
<ch.spherIC.recurvebowsight.components.XTextView
android:id="@+id/calculationParams" android:id="@+id/calculationParams"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/yellow"
android:background="@drawable/glassbg_black"
android:paddingBottom="3dip" android:paddingBottom="3dip"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingTop="3dip" android:paddingTop="3dip"
android:text="@string/titleCalculationParams" android:text="@string/titleCalculationParams"
android:textColor="@color/black"
android:textColor="@color/white"
android:textStyle="bold" android:textStyle="bold"
app:font="@string/TitilliumWeb_Bold" /> app:font="@string/TitilliumWeb_Bold" />
</TableRow> </TableRow>
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:textSize="18sp" /> android:textSize="18sp" />
android:ems="10" android:ems="10"
android:entries="@array/CalculationAccuracies" android:entries="@array/CalculationAccuracies"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:textSize="18sp" /> android:textSize="18sp" />
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal" > android:orientation="horizontal" >
<ch.spherIC.recurvebowsight.components.FontTextView
<ch.spherIC.recurvebowsight.components.XTextView
android:id="@+id/sightConfigTitle" android:id="@+id/sightConfigTitle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/yellow"
android:background="@drawable/glassbg_black"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingTop="3dp" android:paddingTop="3dp"
android:text="@string/titleSightConfig" android:text="@string/titleSightConfig"
android:textColor="@color/black"
android:textColor="@color/white"
android:textStyle="bold" android:textStyle="bold"
app:font="@string/TitilliumWeb_Bold" /> app:font="@string/TitilliumWeb_Bold" />
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="40dp" android:layout_height="40dp"
android:ems="10" android:ems="10"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:textSize="18sp" android:textSize="18sp"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:textSize="18sp" android:textSize="18sp"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:textSize="18sp" android:textSize="18sp"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:textSize="18sp" android:textSize="18sp"
android:background="@android:drawable/edit_text" android:background="@android:drawable/edit_text"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:textSize="18sp" android:textSize="18sp"

+ 6
- 6
res/layout/rbs_riser_config.xml Просмотреть файл

android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical" >
<ch.spherIC.recurvebowsight.components.FontTextView
<ch.spherIC.recurvebowsight.components.XTextView
android:id="@+id/riserConfigTitle" android:id="@+id/riserConfigTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="4dp" android:layout_margin="4dp"
android:background="@color/yellow"
android:background="@drawable/glassbg_black"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingTop="3dp" android:paddingTop="3dp"
android:text="@string/rcTitleRiserConfig" android:text="@string/rcTitleRiserConfig"
android:textColor="@color/black"
android:textColor="@color/white"
android:textStyle="bold" android:textStyle="bold"
app:font="@string/TitilliumWeb_Bold" /> app:font="@string/TitilliumWeb_Bold" />
android:background="@android:drawable/edit_text" android:background="@android:drawable/edit_text"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:nextFocusDown="@+id/rcManufacturerTxtFld" android:nextFocusDown="@+id/rcManufacturerTxtFld"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"

+ 7
- 7
res/layout/rbs_sight_config.xml Просмотреть файл

android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical" >
<ch.spherIC.recurvebowsight.components.FontTextView
<ch.spherIC.recurvebowsight.components.XTextView
android:id="@+id/_sightConfigTitle" android:id="@+id/_sightConfigTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="4dp" android:layout_margin="4dp"
android:background="@color/yellow"
android:background="@drawable/glassbg_black"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingTop="3dp" android:paddingTop="3dp"
android:text="@string/scTitleSightConfig" android:text="@string/scTitleSightConfig"
android:textColor="@color/black"
android:textColor="@color/white"
android:textStyle="bold" android:textStyle="bold"
app:font="@string/TitilliumWeb_Bold" /> app:font="@string/TitilliumWeb_Bold" />
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:nextFocusDown="@+id/sccaHTxtFld" android:nextFocusDown="@+id/sccaHTxtFld"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:nextFocusDown="@+id/scVertScaleRngMinTxtFld" android:nextFocusDown="@+id/scVertScaleRngMinTxtFld"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="numberDecimal"
android:inputType="numberSigned|numberDecimal"
android:nextFocusDown="@+id/scManufacturerTxtFld" android:nextFocusDown="@+id/scManufacturerTxtFld"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="9dp" android:paddingTop="9dp"

+ 16
- 8
res/values-de/strings.xml Просмотреть файл

<string name="title_activity_main_configuration">RBS Konfiguration Bogen/Visier/Ausrüstung</string> <string name="title_activity_main_configuration">RBS Konfiguration Bogen/Visier/Ausrüstung</string>
<string name="title_activity_riser_configuration">RBS Konfiguration Griffstück</string> <string name="title_activity_riser_configuration">RBS Konfiguration Griffstück</string>
<string name="title_activity_sight_configuration">RBS Konfiguration Visier</string> <string name="title_activity_sight_configuration">RBS Konfiguration Visier</string>
<string name="title_activity_archery_setup_configuration">RBS Konfiguration Ausrüstung</string>
<string name="title_activity_archery_setup_configuration">RBS Konfiguration Ausrüstung</string>
<!-- --> <!-- -->
<string name="viewParams">Parameter</string> <string name="viewParams">Parameter</string>
<string name="viewResults">Ball. Flugbahn</string> <string name="viewResults">Ball. Flugbahn</string>
<string name="bowPulloutLbl">Auszug Bogen [cm]</string> <string name="bowPulloutLbl">Auszug Bogen [cm]</string>
<string name="arrowWeightLbl">Gewicht Pfeil [g]</string> <string name="arrowWeightLbl">Gewicht Pfeil [g]</string>
<string name="bowParamsLbl">hNA / Überh. Nockpkt. /\nStandhöhe [mm]</string> <string name="bowParamsLbl">hNA / Überh. Nockpkt. /\nStandhöhe [mm]</string>
<!-- --> <!-- -->
<string name="titleAtmosphericalParams">Atmosphärische Parameter</string> <string name="titleAtmosphericalParams">Atmosphärische Parameter</string>
<string name="airTemperatureLbl">Lufttemperatur [°Celsius]</string> <string name="airTemperatureLbl">Lufttemperatur [°Celsius]</string>
<string name="menuMoreItems">Mehr&#8230;</string> <string name="menuMoreItems">Mehr&#8230;</string>
<!-- --> <!-- -->
<string name="caption_Ok">OK</string> <string name="caption_Ok">OK</string>
<string name="caption_Cancel">Abbrechen</string>
<string name="caption_Cancel">Abbrechen</string>
<string name="caption_NoSelection">Keine Auswahl&#8230;</string> <string name="caption_NoSelection">Keine Auswahl&#8230;</string>
<string name="caption_FillAllMandatoryFields">Um die Berechnung durchzuführen, müssen alle Parameterfelder abgefüllt sein.</string> <string name="caption_FillAllMandatoryFields">Um die Berechnung durchzuführen, müssen alle Parameterfelder abgefüllt sein.</string>
<string name="caption_Cfg_FillAllMandatoryFields">Bitte alle Parameterfelder abfüllen.</string> <string name="caption_Cfg_FillAllMandatoryFields">Bitte alle Parameterfelder abfüllen.</string>
<string name="caption_New">Neu</string> <string name="caption_New">Neu</string>
<string name="caption_Save">Speichern</string> <string name="caption_Save">Speichern</string>
<string name="caption_Delete">Löschen</string> <string name="caption_Delete">Löschen</string>
<string name="caption_Close">Schliessen</string>
<string name="caption_Cfg_DeleteNotPossible">Löschen nicht möglich. Die Entität wird vermutlich von einer anderen Entität referenziert.</string> <string name="caption_Cfg_DeleteNotPossible">Löschen nicht möglich. Die Entität wird vermutlich von einer anderen Entität referenziert.</string>
<string name="caption_Cfg_ArcherySetup_SaveNotPossible">Speichern nicht möglich. Diese Kombination Griffstück/Visier existiert bereits.</string>
<string name="caption_MainCfg_Riser_MainText">Griffstück</string>
<string name="caption_Cfg_ArcherySetup_SaveNotPossible">Speichern nicht möglich. Diese Kombination Griffstück/Visier existiert bereits.</string>
<string name="caption_MainCfg_Riser_MainText">Griffstück</string>
<string name="caption_MainCfg_Riser_SubText">Hier klicken um ein Griffstück zu Editiern, zu Löschen oder Einzufügen</string> <string name="caption_MainCfg_Riser_SubText">Hier klicken um ein Griffstück zu Editiern, zu Löschen oder Einzufügen</string>
<string name="caption_MainCfg_Sight_MainText">Visier</string> <string name="caption_MainCfg_Sight_MainText">Visier</string>
<string name="caption_MainCfg_Sight_SubText">Hier klicken um ein Visier zu Editiern, zu Löschen oder Einzufügen</string> <string name="caption_MainCfg_Sight_SubText">Hier klicken um ein Visier zu Editiern, zu Löschen oder Einzufügen</string>
<string name="fcChart_TitleXAxis">Distanz [m]</string> <string name="fcChart_TitleXAxis">Distanz [m]</string>
<string name="fcChart_TitleYAxis">Höhe [m]</string> <string name="fcChart_TitleYAxis">Höhe [m]</string>
<!-- --> <!-- -->
<!-- -->
<string name="rcTitleRiserConfig">Konfiguration Griffstück</string> <string name="rcTitleRiserConfig">Konfiguration Griffstück</string>
<string name="rcRiserLbl">Griffstück</string> <string name="rcRiserLbl">Griffstück</string>
<string name="rcManufacturerLbl">Hersteller</string> <string name="rcManufacturerLbl">Hersteller</string>
<string name="rcModel">Modell</string> <string name="rcModel">Modell</string>
<string name="rcSizeLbl">Größe</string> <string name="rcSizeLbl">Größe</string>
<string name="rcVvisHLbl">VvisH [mm]</string> <string name="rcVvisHLbl">VvisH [mm]</string>
<string name="rcVvisVLbl">VvisV [mm]</string>
<string name="rcVvisVLbl">VvisV [mm]</string>
<string name="scTitleSightConfig">Konfiguration Visier</string> <string name="scTitleSightConfig">Konfiguration Visier</string>
<string name="scManufacturerLbl">Hersteller</string> <string name="scManufacturerLbl">Hersteller</string>
<string name="scModel">Modell</string> <string name="scModel">Modell</string>
<string name="ashNA">hNA [cm]</string>
<string name="ashNA">hNA [mm]</string>
<string name="asNockRaising">Nockpunktüberhöhung [mm]</string>
<string name="asBraceHeight">Standhöhe [mm]</string>
<string name="asTitleArcherySetupConfig">Konfiguration Ausrüstung</string> <string name="asTitleArcherySetupConfig">Konfiguration Ausrüstung</string>
<string name="asArcherySetupLbl">Ausrüstung</string> <string name="asArcherySetupLbl">Ausrüstung</string>
<!-- -->
<string name="about_Description">RBS RecurveBowSight dient der Berechnung der vertikalen Einstellung des Visierpins eines Recurvebogen.</string>
<string name="AppVersionLabel">Version:</string>
<string name="about_DevelopedBy">Entwickelt von spherIC (F. Smilari)\nMail an:
merlin868@hotmail.com\n\nÜbersetzt von spherIC (F. Smilari)</string>

</resources> </resources>

+ 9
- 1
res/values/strings.xml Просмотреть файл

<string name="caption_New">New</string> <string name="caption_New">New</string>
<string name="caption_Save">Save</string> <string name="caption_Save">Save</string>
<string name="caption_Delete">Delete</string> <string name="caption_Delete">Delete</string>
<string name="caption_Close">Close</string>
<string name="caption_Cfg_DeleteNotPossible">Unable to delete. Most probably the item is referenced by an other entity.</string> <string name="caption_Cfg_DeleteNotPossible">Unable to delete. Most probably the item is referenced by an other entity.</string>
<string name="caption_Cfg_ArcherySetup_SaveNotPossible">Unable to save. This combination of sight und riser is already stored.</string> <string name="caption_Cfg_ArcherySetup_SaveNotPossible">Unable to save. This combination of sight und riser is already stored.</string>
<string name="caption_MainCfg_Riser_MainText">Riser</string> <string name="caption_MainCfg_Riser_MainText">Riser</string>
<string name="scManufacturerLbl">Manufacturer</string> <string name="scManufacturerLbl">Manufacturer</string>
<string name="scModel">Model</string> <string name="scModel">Model</string>
<string name="asLabel">Label</string> <string name="asLabel">Label</string>
<string name="ashNA">hNA [cm]</string>
<string name="ashNA">hNA [mm]</string>
<string name="asNockRaising">Nock Raising [mm]</string>
<string name="asBraceHeight">Brace Height [mm]</string>
<string name="asTitleArcherySetupConfig">Archery Setup Configuration</string> <string name="asTitleArcherySetupConfig">Archery Setup Configuration</string>
<string name="asArcherySetupLbl">Archery Setup</string> <string name="asArcherySetupLbl">Archery Setup</string>
<!-- -->
<string name="about_Description">RBS RecurveBowSight allows you to calculate the sights vertical setting of a recurve bow according to several parameters</string>
<string name="AppVersionLabel">Version:</string>
<string name="about_DevelopedBy">Developed by spherIC (F. Smilari)\nMail to:
merlin868@hotmail.com\n\nTranslated by spherIC (F. Smilari)</string>
</resources> </resources>

+ 56
- 0
src/ch/spherIC/recurvebowsight/DialogFactory.java Просмотреть файл

import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import ch.spherIC.recurvebowsight.dialog.ChooseArcherySetupDlg; import ch.spherIC.recurvebowsight.dialog.ChooseArcherySetupDlg;
dlg = createChooseArcherySetupDialog(parent); dlg = createChooseArcherySetupDialog(parent);
break; break;
case RBSMainActivity.DLG_ABOUT:
dlg = createAboutDialog(parent);
break;
default: default:
dlg = null; dlg = null;
break; break;
return dialog; return dialog;
} }
/**
* Creates the About Dialog
*/
private static Dialog createAboutDialog(final Activity parent) {
String versionName = "";
final Dialog dialog = new Dialog(parent);
dialog.setContentView(R.layout.rbs_about_dialog);
parent.getResources().getText(R.string.menuAbout);
dialog.setTitle(parent.getResources().getText(R.string.menuAbout).toString());
try {
versionName = parent.getPackageManager().getPackageInfo("ch.spherIC", PackageManager.GET_CONFIGURATIONS).versionName;
} catch (NameNotFoundException e) {
versionName = "-";
}
ImageView image = (ImageView) dialog.findViewById(R.id.about_imageAppIcon);
image.setImageResource(R.drawable.ic_launcher);
TextView text = (TextView) dialog.findViewById(R.id.about_TextDescription);
text.setText(parent.getResources().getText(R.string.about_Description));
text = (TextView) dialog.findViewById(R.id.about_TextVersion);
text.setText(parent.getResources().getText(R.string.AppVersionLabel).toString() + " " + versionName);
text = (TextView) dialog.findViewById(R.id.about_TextAutor);
text.setText(parent.getResources().getText(R.string.about_DevelopedBy).toString());
((Button) dialog.findViewById(R.id.btn_AboutClose)).setOnClickListener(new OnClickListener() {
@Override
public void onClick(final View v) {
dialog.dismiss();
}
});
return dialog;
}
} }

+ 3
- 0
src/ch/spherIC/recurvebowsight/RBSMainActivity.java Просмотреть файл

}); });
return true;
case R.id.itemAbout:
showDialog(DLG_ABOUT);
return true; return true;
default: default:

+ 37
- 1
src/ch/spherIC/recurvebowsight/configuration/ArcherySetupConfigurationActivity.java Просмотреть файл

import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.view.Gravity; import android.view.Gravity;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R; import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter; import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.RiserSpinner; import ch.spherIC.recurvebowsight.components.RiserSpinner;
import ch.spherIC.recurvebowsight.components.SightSpinner; import ch.spherIC.recurvebowsight.components.SightSpinner;
private TextView asBowPulloutTxtFld; private TextView asBowPulloutTxtFld;
private TextView asArrowNockHeightTxtFld; private TextView asArrowNockHeightTxtFld;
private TextView ashNATxtFld; private TextView ashNATxtFld;
private TextView asNockRaisingTxtFld;
private TextView asBraceHeightTxtFld;
private TextView asDeltaTimeTxtFld; private TextView asDeltaTimeTxtFld;
private TextView asCalcPrecisionTxtFld; private TextView asCalcPrecisionTxtFld;
private TextView asSightVertScaleMiddleTxtFld; private TextView asSightVertScaleMiddleTxtFld;
this.asBowPulloutTxtFld = (TextView) findViewById(R.id.asBowPulloutTxtFld); this.asBowPulloutTxtFld = (TextView) findViewById(R.id.asBowPulloutTxtFld);
this.asArrowNockHeightTxtFld = (TextView) findViewById(R.id.asNockHeightTxtFld); this.asArrowNockHeightTxtFld = (TextView) findViewById(R.id.asNockHeightTxtFld);
this.ashNATxtFld = (TextView) findViewById(R.id.ashNATxtFld); this.ashNATxtFld = (TextView) findViewById(R.id.ashNATxtFld);
this.asNockRaisingTxtFld = (TextView) findViewById(R.id.asNockRaisingTxtFld);
this.asBraceHeightTxtFld = (TextView) findViewById(R.id.asBraceHeightTxtFld);
this.asDeltaTimeTxtFld = (TextView) findViewById(R.id.asDeltaTimeTxtFld); this.asDeltaTimeTxtFld = (TextView) findViewById(R.id.asDeltaTimeTxtFld);
this.asCalcPrecisionTxtFld = (TextView) findViewById(R.id.asCalcPrecisionTxtFld); this.asCalcPrecisionTxtFld = (TextView) findViewById(R.id.asCalcPrecisionTxtFld);
this.asSightVertScaleMiddleTxtFld = (TextView) findViewById(R.id.asSightVertScaleMiddleTxtFld); this.asSightVertScaleMiddleTxtFld = (TextView) findViewById(R.id.asSightVertScaleMiddleTxtFld);
ArcherySetupConfigurationActivity.this.asBowPulloutTxtFld.setText(DF.format(as.getBowPullout())); ArcherySetupConfigurationActivity.this.asBowPulloutTxtFld.setText(DF.format(as.getBowPullout()));
ArcherySetupConfigurationActivity.this.asArrowNockHeightTxtFld.setText(DF.format(as.getArrowNockHeight())); ArcherySetupConfigurationActivity.this.asArrowNockHeightTxtFld.setText(DF.format(as.getArrowNockHeight()));
ArcherySetupConfigurationActivity.this.ashNATxtFld.setText(DF.format(as.getHNA())); ArcherySetupConfigurationActivity.this.ashNATxtFld.setText(DF.format(as.getHNA()));
ArcherySetupConfigurationActivity.this.asNockRaisingTxtFld.setText(DF.format(as.getNockRaising()));
ArcherySetupConfigurationActivity.this.asBraceHeightTxtFld.setText(DF.format(as.getBraceHeight()));
ArcherySetupConfigurationActivity.this.asDeltaTimeTxtFld.setText(DF.format(as.getDeltaTime())); ArcherySetupConfigurationActivity.this.asDeltaTimeTxtFld.setText(DF.format(as.getDeltaTime()));
ArcherySetupConfigurationActivity.this.asCalcPrecisionTxtFld.setText(DF.format(as.getCalcPrecision())); ArcherySetupConfigurationActivity.this.asCalcPrecisionTxtFld.setText(DF.format(as.getCalcPrecision()));
ArcherySetupConfigurationActivity.this.asSightVertScaleMiddleTxtFld.setText(DF.format(as.getSightVertSkalaMiddle())); ArcherySetupConfigurationActivity.this.asSightVertScaleMiddleTxtFld.setText(DF.format(as.getSightVertSkalaMiddle()));
&& !this.asArrowCwTxtFld.getText().toString().isEmpty() && !this.asArrowWeightTxtFld.getText().toString().isEmpty() && !this.asArrowCwTxtFld.getText().toString().isEmpty() && !this.asArrowWeightTxtFld.getText().toString().isEmpty()
&& !this.asArrowV0TxtFld.getText().toString().isEmpty() && !this.asArrowCenterHeightTxtFld.getText().toString().isEmpty() && !this.asArrowV0TxtFld.getText().toString().isEmpty() && !this.asArrowCenterHeightTxtFld.getText().toString().isEmpty()
&& !this.asArrowNockHeightTxtFld.getText().toString().isEmpty() && !this.asBowPulloutTxtFld.getText().toString().isEmpty() && !this.asArrowNockHeightTxtFld.getText().toString().isEmpty() && !this.asBowPulloutTxtFld.getText().toString().isEmpty()
&& !this.ashNATxtFld.getText().toString().isEmpty() && !this.asDeltaTimeTxtFld.getText().toString().isEmpty()
&& !this.ashNATxtFld.getText().toString().isEmpty() && !this.asNockRaisingTxtFld.getText().toString().isEmpty()
&& !this.asBraceHeightTxtFld.getText().toString().isEmpty() && !this.asDeltaTimeTxtFld.getText().toString().isEmpty()
&& !this.asCalcPrecisionTxtFld.getText().toString().isEmpty() && !this.asSightVertScaleMiddleTxtFld.getText().toString().isEmpty() && !this.asCalcPrecisionTxtFld.getText().toString().isEmpty() && !this.asSightVertScaleMiddleTxtFld.getText().toString().isEmpty()
&& !this.asSightHorzSettingTxtFld.getText().toString().isEmpty()) { && !this.asSightHorzSettingTxtFld.getText().toString().isEmpty()) {
this.selectedArcherySetup.setArrowNockHeight(Double.valueOf(this.asArrowNockHeightTxtFld.getText().toString())); this.selectedArcherySetup.setArrowNockHeight(Double.valueOf(this.asArrowNockHeightTxtFld.getText().toString()));
this.selectedArcherySetup.setBowPullout(Double.valueOf(this.asBowPulloutTxtFld.getText().toString())); this.selectedArcherySetup.setBowPullout(Double.valueOf(this.asBowPulloutTxtFld.getText().toString()));
this.selectedArcherySetup.setHNA(Double.valueOf(this.ashNATxtFld.getText().toString())); this.selectedArcherySetup.setHNA(Double.valueOf(this.ashNATxtFld.getText().toString()));
this.selectedArcherySetup.setNockRaising(Double.valueOf(this.asNockRaisingTxtFld.getText().toString()));
this.selectedArcherySetup.setBraceHeight(Double.valueOf(this.asBraceHeightTxtFld.getText().toString()));
this.selectedArcherySetup.setDeltaTime(Double.valueOf(this.asDeltaTimeTxtFld.getText().toString())); this.selectedArcherySetup.setDeltaTime(Double.valueOf(this.asDeltaTimeTxtFld.getText().toString()));
this.selectedArcherySetup.setCalcPrecision(Double.valueOf(this.asCalcPrecisionTxtFld.getText().toString())); this.selectedArcherySetup.setCalcPrecision(Double.valueOf(this.asCalcPrecisionTxtFld.getText().toString()));
this.selectedArcherySetup.setSightVertSkalaMiddle(Double.valueOf(this.asSightVertScaleMiddleTxtFld.getText().toString())); this.selectedArcherySetup.setSightVertSkalaMiddle(Double.valueOf(this.asSightVertScaleMiddleTxtFld.getText().toString()));
this.asBowPulloutTxtFld.setText(""); this.asBowPulloutTxtFld.setText("");
this.asArrowNockHeightTxtFld.setText(""); this.asArrowNockHeightTxtFld.setText("");
this.ashNATxtFld.setText(""); this.ashNATxtFld.setText("");
this.asNockRaisingTxtFld.setText("");
this.asBraceHeightTxtFld.setText("");
this.asDeltaTimeTxtFld.setText(""); this.asDeltaTimeTxtFld.setText("");
this.asCalcPrecisionTxtFld.setText(""); this.asCalcPrecisionTxtFld.setText("");
this.asSightVertScaleMiddleTxtFld.setText(""); this.asSightVertScaleMiddleTxtFld.setText("");
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
// Handle item selection
switch (item.getItemId()) {
case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
protected Dialog onCreateDialog(final int id) {
return DialogFactory.createDialog(id, this);
}
} }

+ 25
- 0
src/ch/spherIC/recurvebowsight/configuration/MainConfigurationActivity.java Просмотреть файл

package ch.spherIC.recurvebowsight.configuration; package ch.spherIC.recurvebowsight.configuration;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ListView; import android.widget.ListView;
import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R; import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.MainConfigurationArrayAdapter; import ch.spherIC.recurvebowsight.components.MainConfigurationArrayAdapter;
import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil; import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil;
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
setResult(resultCode); setResult(resultCode);
} }
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
// Handle item selection
switch (item.getItemId()) {
case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
protected Dialog onCreateDialog(final int id) {
return DialogFactory.createDialog(id, this);
}
} }

+ 47
- 11
src/ch/spherIC/recurvebowsight/configuration/RiserConfigurationActivity.java Просмотреть файл

package ch.spherIC.recurvebowsight.configuration; package ch.spherIC.recurvebowsight.configuration;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.pm.ActivityInfo;
import android.content.DialogInterface;
import android.database.sqlite.SQLiteConstraintException;
import android.content.pm.ActivityInfo;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity; import android.view.Gravity;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R; import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter; import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.RiserSpinner; import ch.spherIC.recurvebowsight.components.RiserSpinner;
import ch.spherIC.recurvebowsight.database.dao.RiserDao; import ch.spherIC.recurvebowsight.database.dao.RiserDao;
import ch.spherIC.recurvebowsight.model.IRiser; import ch.spherIC.recurvebowsight.model.IRiser;
import ch.spherIC.recurvebowsight.model.Riser; import ch.spherIC.recurvebowsight.model.Riser;
import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil; import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil;
import ch.spherIC.recurvebowsight.utilities.PlatformUtils;
import java.text.DecimalFormat; import java.text.DecimalFormat;
* Löschen. * Löschen.
*/ */
protected void onDeleteRiser() { protected void onDeleteRiser() {
if (this.selectedRiser != null) { if (this.selectedRiser != null) {
try {
RiserDao.getInstance().delete(this.selectedRiser);
loadRiserSpinner();
setResult(1);
} catch (SQLiteConstraintException e) {
Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_DeleteNotPossible), Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
}
android.content.DialogInterface.OnClickListener deleteBtnListener = new android.content.DialogInterface.OnClickListener() {
@Override
public void onClick(final DialogInterface dialog, final int which) {
try {
RiserDao.getInstance().delete(RiserConfigurationActivity.this.selectedRiser);
loadRiserSpinner();
} catch (Exception e) {
Toast toast = Toast.makeText(RiserConfigurationActivity.this,
getResources().getString(R.string.caption_Cfg_DeleteNotPossible), Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
}
}
};
AlertDialog dlg = PlatformUtils.getDeleteConfirmDialog(this, this.selectedRiser.toString(), deleteBtnListener);
dlg.show();
} }
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
// Handle item selection
switch (item.getItemId()) {
case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
protected Dialog onCreateDialog(final int id) {
return DialogFactory.createDialog(id, this);
}
} }

+ 47
- 9
src/ch/spherIC/recurvebowsight/configuration/SightConfigurationActivity.java Просмотреть файл

package ch.spherIC.recurvebowsight.configuration; package ch.spherIC.recurvebowsight.configuration;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.view.Gravity; import android.view.Gravity;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R; import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter; import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.SightSpinner; import ch.spherIC.recurvebowsight.components.SightSpinner;
import ch.spherIC.recurvebowsight.database.dao.SightDao; import ch.spherIC.recurvebowsight.database.dao.SightDao;
import ch.spherIC.recurvebowsight.model.ISight; import ch.spherIC.recurvebowsight.model.ISight;
import ch.spherIC.recurvebowsight.model.Sight; import ch.spherIC.recurvebowsight.model.Sight;
import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil; import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil;
import ch.spherIC.recurvebowsight.utilities.PlatformUtils;
import java.text.DecimalFormat; import java.text.DecimalFormat;
* Löschen. * Löschen.
*/ */
protected void onDeleteSight() { protected void onDeleteSight() {
if (this.selectedSight != null) { if (this.selectedSight != null) {
try {
SightDao.getInstance().delete(this.selectedSight);
loadSightSpinner();
setResult(1);
} catch (SQLiteConstraintException e) {
Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_DeleteNotPossible), Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
}
android.content.DialogInterface.OnClickListener deleteBtnListener = new android.content.DialogInterface.OnClickListener() {
@Override
public void onClick(final DialogInterface dialog, final int which) {
try {
SightDao.getInstance().delete(SightConfigurationActivity.this.selectedSight);
loadSightSpinner();
} catch (SQLiteConstraintException e) {
Toast toast = Toast.makeText(SightConfigurationActivity.this,
getResources().getString(R.string.caption_Cfg_DeleteNotPossible), Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
}
}
};
AlertDialog dlg = PlatformUtils.getDeleteConfirmDialog(this, this.selectedSight.toString(), deleteBtnListener);
dlg.show();
} }
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
// Handle item selection
switch (item.getItemId()) {
case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
protected Dialog onCreateDialog(final int id) {
return DialogFactory.createDialog(id, this);
}
} }

Загрузка…
Отмена
Сохранить