Database

res/layout/rbs_main.xml

@@ -919,14 +919,14 @@
                 <Button
                     android:id="@+id/scBtnCalc"
                     style="@style/GlassButtonSmall"
-                    android:layout_width="42dp"
-                    android:layout_height="42dp"
+                    android:layout_width="44dp"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:layout_marginRight="4dp"
-                    android:drawableBottom="@drawable/btn_calc"
-                    android:paddingBottom="9dp" />
+                    android:drawableRight="@drawable/btn_calc" />
             </LinearLayout>
         </ScrollView>
+
     </ViewFlipper>
 
 </RelativeLayout>

src/ch/spherIC/recurvebowsight/database/RBSDatabaseHelper.java

@@ -8,9 +8,20 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
+import ch.spherIC.recurvebowsight.database.dao.RiserDao;
+import ch.spherIC.recurvebowsight.database.dao.SightDao;
 import ch.spherIC.recurvebowsight.database.scheme.data.TblRBSArcherySetup;
 import ch.spherIC.recurvebowsight.database.scheme.masterdata.TblRBSRiser;
 import ch.spherIC.recurvebowsight.database.scheme.masterdata.TblRBSSight;
+import ch.spherIC.recurvebowsight.model.ArcherySetup;
+import ch.spherIC.recurvebowsight.model.IArcherySetup;
+import ch.spherIC.recurvebowsight.model.IRiser;
+import ch.spherIC.recurvebowsight.model.ISight;
+import ch.spherIC.recurvebowsight.model.Riser;
+import ch.spherIC.recurvebowsight.model.Sight;
+
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -67,6 +78,21 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL(TblRBSRiser.getCreateStatement());
         db.execSQL(TblRBSSight.getCreateStatement());
         db.execSQL(TblRBSArcherySetup.getCreateStatement());
+
+        insertMasterData();
+    }
+
+    /**
+     * Masterdaten einfügen.
+     */
+    public void insertMasterData() {
+        for (IRiser riser : getRiserMasterData()) {
+            riser = RiserDao.getInstance().insert(riser);
+        }
+
+        for (ISight sight : getSightMasterData()) {
+            sight = SightDao.getInstance().insert(sight);
+        }
     }
 
 
@@ -75,4 +101,33 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
         // TODO Auto-generated method stub
     }
 
+
+    private List<IRiser> getRiserMasterData() {
+
+        List<IRiser> risers = new ArrayList<IRiser>();
+
+        risers.add(new Riser(0, "Hoyt", "HPX", 27d, 0d, 61d));
+
+        return risers;
+    }
+
+    private List<ISight> getSightMasterData() {
+
+        List<ISight> sights = new ArrayList<ISight>();
+
+        sights.add(new Sight(0, "Avalon", "Tec One", 17.5, 12d,
+                             "260,250,240,230,220,210,200,190,180,170,160", 0d, 110d));
+
+        return sights;
+    }
+
+    private List<IArcherySetup> getArcherySetupMasterData() {
+
+        List<IArcherySetup> sights = new ArrayList<IArcherySetup>();
+
+        sights.add(new ArcherySetup(0, null, null, 5.8, 3.10, 21d, 64.25, 1.30, 71d, 1.57, 14.8, 0.001, 0.1, 55d,
+                                    260d));
+
+        return sights;
+    }
 }