Merge branch 'Verzweiflung'

app/src/main/java/com/example/dhapp/DbManager.java

@@ -18,9 +18,7 @@ public DbManager(Context context) {
                 "stockDB.db",
                 null,
                 1);
-        Log.d("hallo1234", this.toString());
         db=getWritableDatabase();
-        //db.close();
     }
 
     @Override
@@ -40,40 +38,42 @@ public void onCreate(SQLiteDatabase db) {
 
             db.execSQL("CREATE TABLE history (" +
                     "historyID INTEGER PRIMARY KEY AUTOINCREMENT," +
-                    "name TEXT NOT NULL)"
+                    "name TEXT)"
             );
 
             db.execSQL("CREATE INDEX history_index ON history(name)");
 
 
-        } catch (SQLException e) {
-        }
+        } catch (SQLException e) { e.printStackTrace();}
     }
 
     public void addDepotElement(String elementName, String elementSymbol, String elementOpen, String elementChange){
         db.execSQL("INSERT INTO depot (name, symbol, open, change) VALUES ('" + elementName + "', '" + elementSymbol + "', '" + elementOpen + "', '" + elementChange + "')");
 
     }
 
-    public void addHistoryElement(String historyname) {
-        db.execSQL("INSERT INTO history (name) VALUES ('" + historyname + "')");
+    public void addHistoryElement(String historyName) {
+        db.execSQL("INSERT INTO history (name) VALUES ('" + historyName + "')");
+    }
+
+    public void deleteHistoryElement(String historyverlauf) {
+        db.execSQL("DELETE FROM history WHERE name = '" + historyverlauf + "'");
     }
 
-    public String[] ausgabeAktie() throws SQLException {
+    public String[] outputStock() throws SQLException {
 
         SQLiteDatabase db = getReadableDatabase();
         Cursor cursor = db.rawQuery("SELECT valueID, symb, value " +
                         " FROM value " +
                         " ORDER BY valueID ASC",
                 null);
 
-// Ergebnis der Query auswerten
-        int anzahlErgebnisZeilen = cursor.getCount();
-        if (anzahlErgebnisZeilen == 0) {
+        int resultLines = cursor.getCount();
+        if (resultLines == 0) {
             return new String[]{};
         }
 
-        String[] resultStrings = new String[anzahlErgebnisZeilen];
+        String[] resultStrings = new String[resultLines];
         int counter = 0;
         for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
 
@@ -92,11 +92,11 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         //leer
     }
 
-    public String[] getElements(String ColumnName, String TableName)  {
+    public String[] getElements(String ColumnName, String TableName) {
         db = getReadableDatabase();
         Cursor cursor = db.rawQuery("SELECT "+ ColumnName + " FROM " + TableName, null);
         if (TableName.equals("depot")){
-           cursor  = db.rawQuery("SELECT DISTINCT "+ ColumnName + " FROM " + TableName, null);
+            cursor = db.rawQuery("SELECT DISTINCT "+ ColumnName + " FROM " + TableName, null);
         }
         int amountResultRows = cursor.getCount();
         if (amountResultRows == 0) {
@@ -113,8 +113,4 @@ public String[] getElements(String ColumnName, String TableName)  {
         cursor.close();
         return resultValues;
     }
-
-    public void deleteHistoryElement(int id) {
-        db.execSQL("DELETE FROM history WHERE historyID="+id);
-    }
 }

app/src/main/java/com/example/dhapp/DepotFragment.java

@@ -12,8 +12,6 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
 
 public class DepotFragment extends Fragment {
 
@@ -28,14 +26,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         super.onViewCreated(view, savedInstanceState);
 
 
-
-        //TODO: OnViewCreated, immer nur bei erster Erstellung oder bei jedem Aufruf? Crash wenn keine Aktie im Depot ist
-
         try {
 
             RecyclerView recyclerView;
 
-            //TODO: Richtige Spalten- und Tabellennamen für Name, Wert und 24-Change
 
             String[] ArrayName;
             String[] ArrayValue;
@@ -60,9 +54,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
 
 
-        } catch (Exception e) {
-            Log.i("Information", "Fail at starting DepotFragment");
-        }
+        } catch (Exception e) {e.printStackTrace();}
     }
 
 }

app/src/main/java/com/example/dhapp/HistoryFragment.java

@@ -5,6 +5,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -14,18 +16,23 @@
 
 public class HistoryFragment extends Fragment {
 
+    DbManager dbm;
+    TextView historyName;
+
     @Nullable
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_impressum, container, false);
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_history, container, false);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
         try {
+            dbm = new DbManager(getActivity());
+
+            historyName = view.findViewById(R.id.historyName);
 
             RecyclerView recyclerView;
 
@@ -44,8 +51,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             recyclerView.setAdapter(myAdapterHistory);
             recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
 
-        } catch (Exception e) {
-            //nüscht
-        }
+        } catch (Exception e) {e.printStackTrace();}
     }
+
 }

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

@@ -22,7 +22,6 @@ public class MainActivity extends AppCompatActivity  {
 
 
     public TextView showStockName;
-    private String ISIN;
     private static String url="http://api.marketstack.com/v1/eod?access_key=86a7719f8f68bb10f9cbef8614745331&symbols=";
     private static String apiURLName;
     private DbManager _datenbankManager;
@@ -46,12 +45,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
-  /*  public void changeActivityToSSO() {
-        //StockName = editText.getText().toString();
-        Intent intent = new Intent(this, SingleStockOverview.class);
-        startActivity(intent);
-    }*/
-
     private BottomNavigationView.OnNavigationItemSelectedListener navListener = new BottomNavigationView.OnNavigationItemSelectedListener() {
         @Override
         public boolean onNavigationItemSelected(@NonNull MenuItem item) {
@@ -75,14 +68,14 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
     };
 
 
-    protected JSONObject getStockInformation(String ISIN) throws Exception {
+    protected JSONObject getStockInformation(String symbol) throws Exception {
         URL link = null;
         HttpURLConnection conn = null;
         String object="";
         JSONObject answer = null;
-        ISIN.toUpperCase();
+        symbol.toUpperCase();
 
-        link = new URL(url+ISIN);
+        link = new URL(url+symbol);
         conn = (HttpURLConnection) link.openConnection();
         conn.setRequestMethod("GET");
 
@@ -138,25 +131,4 @@ protected JSONObject parseJSON (String json) throws Exception{
         return jsonObject;
     }
 
-    protected void suchverlaufAnzeigen() {
-
-        String[] aktien;
-        String errorMsg;
-
-        try {
-            aktien = _datenbankManager.ausgabeAktie();
-        }
-        catch (Exception ex) {
-            errorMsg = "Exception bei ausgabeAktie() aufgetreten: " + ex;
-            return;
-        }
-        if (aktien == null || aktien.length == 0) {
-            return;
-        }
-        StringBuffer sb = new StringBuffer();
-        for(String bedeutung: aktien) {
-
-            sb.append(bedeutung).append("\n");
-        }
-    }
 }

app/src/main/java/com/example/dhapp/MyAdapterDepot.java

@@ -14,11 +14,11 @@ public class MyAdapterDepot extends RecyclerView.Adapter<MyAdapterDepot.MyViewHo
     String data1[], data2[], data3[];
     Context context;
 
-    public MyAdapterDepot(Context ct, String AktienName[], String AktienValue[], String AktienChange[]) {
+    public MyAdapterDepot(Context ct, String stockName[], String stockValue[], String stockChange[]) {
         context = ct;
-        data1 = AktienName;
-        data2 = AktienValue;
-        data3 = AktienChange;
+        data1 = stockName;
+        data2 = stockValue;
+        data3 = stockChange;
     }
 
     @NonNull
@@ -31,14 +31,9 @@ public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
 
     @Override
     public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
-        holder.AktienTitel.setText(data1[position]);
-        holder.AktienWert.setText(data2[position] );
-        holder.AktienChange24.setText(data3[position]+ "%");
-     /*   if (Integer.parseInt(data3[position]) >= 0) {
-            TextView percentage =
-
-
-        }*/
+        holder.stockNameView.setText(data1[position]);
+        holder.stockValueView.setText(data2[position] );
+        holder.stockChangeView.setText(data3[position]+ "%");
     }
 
     @Override
@@ -48,16 +43,16 @@ public int getItemCount() {
 
     public class MyViewHolder extends RecyclerView.ViewHolder {
 
-        TextView AktienTitel;
-        TextView AktienWert;
-        TextView AktienChange24;
+        TextView stockNameView;
+        TextView stockValueView;
+        TextView stockChangeView;
 
 
         public MyViewHolder(@NonNull View itemView) {
             super(itemView);
-            AktienTitel = itemView.findViewById(R.id.Headline);
-            AktienWert = itemView.findViewById(R.id.Value);
-            AktienChange24 = itemView.findViewById(R.id.Percentage);
+            stockNameView = itemView.findViewById(R.id.Headline);
+            stockValueView = itemView.findViewById(R.id.Value);
+            stockChangeView = itemView.findViewById(R.id.Percentage);
         }
     }
 }

app/src/main/java/com/example/dhapp/MyAdapterHistory.java

@@ -7,16 +7,18 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class MyAdapterHistory extends RecyclerView.Adapter<MyAdapterHistory.MyViewHolder> {
 
     String data1[];
     Context context;
 
-    public MyAdapterHistory(Context ct, String AktienName[]) {
+    public MyAdapterHistory(Context ct, String stockName[]) {
         context = ct;
-        data1 = AktienName;
+        data1 = stockName;
     }
 
     @NonNull
@@ -29,7 +31,7 @@ public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
 
     @Override
     public void onBindViewHolder(@NonNull MyAdapterHistory.MyViewHolder holder, int position) {
-        holder.AktienTitel.setText(data1[position]);
+        holder.stockNameView.setText(data1[position]);
     }
 
     @Override
@@ -39,11 +41,53 @@ public int getItemCount() {
 
     public class MyViewHolder extends RecyclerView.ViewHolder {
 
-        TextView AktienTitel;
+        TextView stockNameView;
+        DbManager dbm;
 
         public MyViewHolder(@NonNull View itemView) {
             super(itemView);
-            AktienTitel = itemView.findViewById(R.id.HistoryName);
+            stockNameView = itemView.findViewById(R.id.historyName);
+            dbm = new DbManager(context.getApplicationContext());
+            stockNameView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    dbm.deleteHistoryElement(stockNameView.getText().toString());
+                    AppCompatActivity activity = (AppCompatActivity) v.getContext();
+                    Fragment newFragment = new HistoryFragment();
+                    activity.getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, newFragment).addToBackStack(null).commit();
+                }
+            });
         }
     }
-}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+