Merge pull request #55 from sebuech02/dev

weiteren Helfer eingebaut und außerdem die Helfer sachen alle speiche…

Author: sebuech02

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.example.inet_test"
         minSdk 26
         targetSdk 32
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,6 +31,7 @@ android {
 
 dependencies {
     //implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

app/src/main/AndroidManifest.xml

@@ -54,6 +54,7 @@
         <activity android:name=".helfer_karte"/>
         <activity android:name=".helfer_schnapps"/>
         <activity android:name=".helfer_wheel"/>
+        <activity android:name=".helfer_zahler"/>
         <activity android:name=".kegeln"
             android:theme="@style/Theme.Inet_test2"
             android:screenOrientation="portrait"/>

app/src/main/java/com/example/inet_test/MainActivity.java

@@ -199,7 +199,7 @@ public void run() {
                 ranglisten_daten.set_misc(misc);
                 Collections.sort(score, new strintstrComparator());
                 bereinige(score);
-                ranglisten_daten.set_scores(score_temp);
+                ranglisten_daten.set_scores(score);
             } catch(Exception e){
                 //startActivity(new Intent(MainActivity.this, main_game.class));
                 //Toast.makeText(getApplicationContext(),"ERROR, keine Spiele", Toast.LENGTH_LONG).show();

app/src/main/java/com/example/inet_test/helfer_karte.java

@@ -22,6 +22,7 @@ public class helfer_karte extends sp_helfer implements View.OnClickListener {
     private ImageView farbe;
     private TextView zahl;
     private LinearLayout zeile;
+    private tinydb db;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -35,11 +36,34 @@ protected void onCreate(Bundle savedInstanceState) {
         mischen=findViewById(R.id.do_shuffle);
         stapel=findViewById(R.id.rest_haufen);
 
-        rb1.setChecked(true);
-        max=32;
+
         mischen.setOnClickListener(this);
         stapel.setOnClickListener(this);
-        reset_cards();
+
+        db=new tinydb(this);
+        try {
+            gezogenes=db.getListInt("karte_helfer");
+        } catch (Exception e){
+            System.out.println(e.toString());
+            gezogenes=new ArrayList<Integer>();
+            db.putListInt("karte_helfer", gezogenes);
+        }
+        try {
+            max=db.getInt("karte_helfer_max");
+            if(max==32){
+                rb1.setChecked(true);
+            } else if (max==52) {
+                rb2.setChecked(true);
+            } else if (max==56) {
+                rb3.setChecked(true);
+            }
+        } catch (Exception e){
+            System.out.println(e.toString());
+            max=32;
+            rb1.setChecked(true);
+            db.putInt("karte_helfer_max", max);
+        }
+
         update_views();
     }
     @Override
@@ -104,6 +128,8 @@ public void ziehe_karten(){
     }
 
     public void update_views(){
+        db.putListInt("karte_helfer", gezogenes);
+        db.putInt("karte_helfer_max", max);
         card.removeAllViews();
         int i = 0;
         if (max==32){

app/src/main/java/com/example/inet_test/helfer_schnapps.java

@@ -17,6 +17,7 @@ public class helfer_schnapps extends sp_helfer implements View.OnClickListener {
     private String[] karten;
     private ArrayList<Integer> gezogens;
     private TextView zahl;
+    private tinydb db;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -30,7 +31,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ziehen.setOnClickListener(this);
         shuffle.setOnClickListener(this);
-        reset_schnapps();
+
+        try {
+            gezogens=db.getListInt("schnapps_helfer");
+        } catch (Exception e){
+            System.out.println(e.toString());
+            gezogens=new ArrayList<Integer>();
+            db.putListInt("schnapps_helfer", gezogens);
+        }
+        show_schnapps();
     }
 
     @Override
@@ -56,24 +65,20 @@ private void reset_schnapps(){
     }
 
     private void show_schnapps(){
+        db.putListInt("schnapps_helfer", gezogens);
         parent.removeAllViews();
         parent.setOrientation(LinearLayout.VERTICAL);
         ziehen.setText(String.valueOf(karten.length-gezogens.size()));
         if(karten.length-gezogens.size()<10){
             ziehen.setText("0"+String.valueOf(karten.length-gezogens.size()));
         }
         ziehen.setBackground(getDrawable(R.drawable.shape_cad));
-        //ziehen.setBackgroundColor(Color.parseColor("#757575"));
         int i = 0;
         while (i<gezogens.size()){
             zahl=new TextView(this);
             zahl.setTextColor(Color.parseColor("#ffffff"));
             zahl.setTextSize(22);
-            //System.out.println(gezogens.size()-1-i);
-            //System.out.println(gezogens.get(gezogens.size()-1-i));
-            //System.out.println(karten[gezogens.get(gezogens.size()-1-i)]);
-            //zahl.setText("TREST");
-            zahl.setText(karten[gezogens.get(gezogens.size()-1-i)]);
+            zahl.setText(karten[(int) (gezogens.get((int) (gezogens.size()-1-i)))]);
             if (i==0){
                 zahl.setTextColor(Color.parseColor("#ff0000"));
             }
@@ -94,7 +99,7 @@ private void karte_ziehen(){
         } else if (gezogens.size()==karten.length) {
             Toast.makeText(this, "Keine Karten übrig", Toast.LENGTH_SHORT).show();
         } else{
-            gezogens.add(rn);
+            gezogens.add((int) rn);
             show_schnapps();
         }
     }

app/src/main/java/com/example/inet_test/helfer_wheel.java

@@ -21,6 +21,7 @@ public class helfer_wheel extends sp_helfer implements View.OnClickListener {
     private TextView tv;
     private ArrayList<String> objects = new ArrayList<>();
     private int current_pick;
+    private tinydb db;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -36,7 +37,23 @@ protected void onCreate(Bundle savedInstanceState) {
         add.setOnClickListener(this);
         pick.setOnClickListener(this);
         team.setOnClickListener(this);
-        current_pick=-1;
+
+        db=new tinydb(this);
+        try {
+            current_pick=db.getObject("wheel_helfer_pick", int.class);
+        } catch (Exception e){
+            System.out.println(e.toString());
+            current_pick=-1;
+            db.putObject("wheel_helfer_pick", current_pick);
+        }
+        try {
+            objects=db.getObject("wheel_helfer_obj", ArrayList.class);
+        } catch (Exception e){
+            System.out.println(e.toString());
+            objects=new ArrayList<>();
+            db.putObject("wheel_helfer_obj", objects);
+        }
+        update_views();
     }
 
     @Override
@@ -73,6 +90,8 @@ private void pick_random(){
         }
     }
     private void update_views(){
+        db.putObject("wheel_helfer_pick", current_pick);
+        db.putObject("wheel_helfer_obj", objects);
         int i = 0;
         parent.removeAllViews();
         while (i<objects.size()){
@@ -95,9 +114,8 @@ private void update_views(){
             lp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
             lp.setMargins(1,11,1,11);
             del=new Button(this);
-            del.setTextColor(Color.parseColor("#ffffff"));
+            del.setTextColor(Color.parseColor("#ffff00"));
             del.setBackgroundColor(Color.parseColor("#000000"));
-            //del.setBackground(getDrawable(R.drawable.shape_cad));
             del.setLayoutParams(lp);
             del.setTextSize(22);
             del.setText("Löschen");

app/src/main/java/com/example/inet_test/helfer_wuerfel.java

@@ -18,6 +18,8 @@ public class helfer_wuerfel extends sp_helfer implements View.OnClickListener {
     private TextView tv;
     private ImageView iv;
     private LinearLayout zeile;
+    private tinydb db;
+    private int anzahl;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -32,6 +34,16 @@ protected void onCreate(Bundle savedInstanceState) {
         parent=findViewById(R.id.erg_parent);
 
         wuerfel.setOnClickListener(this);
+
+        db=new tinydb(this);
+        try {
+            anzahl=db.getInt("wurfel_helfer");
+        } catch (Exception e){
+            System.out.println(e.toString());
+            anzahl=11;
+            db.putInt("wurfel_helfer", anzahl);
+        }
+        et.setText(String.valueOf(anzahl));
     }
     @Override
     public void onClick(View v){
@@ -58,7 +70,7 @@ private void do_wuerfel(){
             input=1;
             et.setText("1");
         }
-
+        db.putInt("wurfel_helfer", input);
         int i = 0;
         while (i<input){
             if (i%5==4){