diff --git a/.idea/misc.xml b/.idea/misc.xml index 860da66..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/java/com/example/dhapp/DbManager.java b/app/src/main/java/com/example/dhapp/DbManager.java index 39f8cb2..e1b253e 100644 --- a/app/src/main/java/com/example/dhapp/DbManager.java +++ b/app/src/main/java/com/example/dhapp/DbManager.java @@ -5,7 +5,6 @@ import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; public class DbManager extends SQLiteOpenHelper { @@ -18,9 +17,7 @@ public DbManager(Context context) { "stockDB.db", null, 1); - Log.d("hallo1234", this.toString()); db=getWritableDatabase(); - //db.close(); } @Override @@ -46,7 +43,7 @@ public void onCreate(SQLiteDatabase db) { 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){ @@ -54,11 +51,11 @@ public void addDepotElement(String elementName, String elementSymbol, String ele } - 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 String[] ausgabeAktie() throws SQLException { + public String[] outputStock() throws SQLException { SQLiteDatabase db = getReadableDatabase(); Cursor cursor = db.rawQuery("SELECT valueID, symb, value " + @@ -66,13 +63,12 @@ public String[] ausgabeAktie() throws SQLException { " 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()) { diff --git a/app/src/main/java/com/example/dhapp/DepotFragment.java b/app/src/main/java/com/example/dhapp/DepotFragment.java index e245156..25d2edc 100644 --- a/app/src/main/java/com/example/dhapp/DepotFragment.java +++ b/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();} } } diff --git a/app/src/main/java/com/example/dhapp/HistoryFragment.java b/app/src/main/java/com/example/dhapp/HistoryFragment.java index 75b8ca9..28c6b36 100644 --- a/app/src/main/java/com/example/dhapp/HistoryFragment.java +++ b/app/src/main/java/com/example/dhapp/HistoryFragment.java @@ -4,7 +4,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -14,7 +13,6 @@ public class HistoryFragment extends Fragment { - Button DeleteHistory; @Nullable @Override @@ -46,8 +44,6 @@ 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();} } } diff --git a/app/src/main/java/com/example/dhapp/MainActivity.java b/app/src/main/java/com/example/dhapp/MainActivity.java index ceadded..363d5e1 100644 --- a/app/src/main/java/com/example/dhapp/MainActivity.java +++ b/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"); - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/example/dhapp/MyAdapterDepot.java b/app/src/main/java/com/example/dhapp/MyAdapterDepot.java index cc6003b..08da9b0 100644 --- a/app/src/main/java/com/example/dhapp/MyAdapterDepot.java +++ b/app/src/main/java/com/example/dhapp/MyAdapterDepot.java @@ -14,11 +14,11 @@ public class MyAdapterDepot extends RecyclerView.Adapter= 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); } } } diff --git a/app/src/main/java/com/example/dhapp/MyAdapterHistory.java b/app/src/main/java/com/example/dhapp/MyAdapterHistory.java index 14d1125..798df65 100644 --- a/app/src/main/java/com/example/dhapp/MyAdapterHistory.java +++ b/app/src/main/java/com/example/dhapp/MyAdapterHistory.java @@ -14,9 +14,9 @@ public class MyAdapterHistory extends RecyclerView.Adapter { - Log.i("Information", "Start new Fragment"); - getParentFragmentManager().beginTransaction().remove(this).commit(); - }); } diff --git a/app/src/main/java/com/example/dhapp/SearchFragment.java b/app/src/main/java/com/example/dhapp/SearchFragment.java index f2c8418..4a745ed 100644 --- a/app/src/main/java/com/example/dhapp/SearchFragment.java +++ b/app/src/main/java/com/example/dhapp/SearchFragment.java @@ -1,53 +1,29 @@ package com.example.dhapp; import android.app.Activity; -import android.app.Dialog; import android.content.Context; import android.content.Intent; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.os.Bundle; -import android.os.StrictMode; -import android.text.Editable; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; -import android.widget.TextView; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; - import org.json.JSONArray; -import org.json.JSONException; import org.json.JSONObject; - -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.charset.Charset; - -import static android.content.Context.INPUT_METHOD_SERVICE; public class SearchFragment extends Fragment{ private String name; private String input; private Intent intent; - private Intent intent2; private JSONObject answer; private JSONObject stockName; private String open; @@ -56,11 +32,9 @@ public class SearchFragment extends Fragment{ private String highest; private String lowest; private String date; - private Button confirm; - EditText stockInput; + private EditText stockInput; - DbManager dbM; @Nullable @Override @@ -136,8 +110,6 @@ public void run(){ stockName = ((MainActivity)getActivity()).getStockNameInformation(input); name = stockName.getString("name"); - System.out.println(name); - answer = ((MainActivity)getActivity()).getStockInformation(input); JSONArray field = answer.getJSONArray("data"); JSONObject latestData = field.getJSONObject(0); @@ -173,13 +145,8 @@ public void run(){ intent.putExtra("lowest", lowest); intent.putExtra("date", date); - - startActivity(intent); - - - } catch (IOException e){ //catch no Internet connection - + } catch (IOException e){ e.printStackTrace(); NoConnectionFragment newFrag = new NoConnectionFragment(); @@ -189,7 +156,6 @@ public void run(){ fragmentTransaction.addToBackStack(null); fragmentTransaction.commit(); - } catch (Exception e){ spelling_mistake newFrag = new spelling_mistake(); FragmentManager fragmentManager = getActivity().getSupportFragmentManager(); @@ -197,7 +163,6 @@ public void run(){ fragmentTransaction.replace(R.id.fragment_search, newFrag,"tag"); fragmentTransaction.addToBackStack(null); fragmentTransaction.commit(); - System.out.println("ich habe grüne hoden pls help"); } } } diff --git a/app/src/main/java/com/example/dhapp/SingleStockOverview.java b/app/src/main/java/com/example/dhapp/SingleStockOverview.java index b18331b..16f3613 100644 --- a/app/src/main/java/com/example/dhapp/SingleStockOverview.java +++ b/app/src/main/java/com/example/dhapp/SingleStockOverview.java @@ -4,14 +4,12 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; -import android.widget.EditText; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; public class SingleStockOverview extends AppCompatActivity { - //merge-Test private TextView showStockName; static TextView StockName; @@ -35,7 +33,6 @@ public class SingleStockOverview extends AppCompatActivity { private Button addDepot; private DbManager _datenbankManager; - //private EditText searchText; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { diff --git a/app/src/main/java/com/example/dhapp/spelling_mistake.java b/app/src/main/java/com/example/dhapp/spelling_mistake.java index 5d46e4f..f5ff319 100644 --- a/app/src/main/java/com/example/dhapp/spelling_mistake.java +++ b/app/src/main/java/com/example/dhapp/spelling_mistake.java @@ -21,38 +21,16 @@ public class spelling_mistake extends Fragment { private Button back; - private Intent intent; - // TOD: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; private static final String ARG_PARAM2 = "param2"; - // TOD: Rename and change types of parameters private String mParam1; private String mParam2; public spelling_mistake() { - // Required empty public constructor } - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment spelling_mistake. - */ - // TOD: Rename and change types and number of parameters - public static spelling_mistake newInstance(String param1, String param2) { - spelling_mistake fragment = new spelling_mistake(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } @Override public void onCreate(Bundle savedInstanceState) { @@ -66,7 +44,6 @@ public void onCreate(Bundle savedInstanceState) { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Inflate the layout for this fragment return inflater.inflate(R.layout.fragment_spelling_mistake, container, false); } @@ -74,8 +51,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat super.onViewCreated(view, savedInstanceState); back = view.findViewById(R.id.tryAgain); back.setOnClickListener(v -> { - Log.i("Information", "Start new Fragment"); - getParentFragmentManager().beginTransaction().remove(this).commit(); }); diff --git a/app/src/main/res/layout/fragment_depot.xml b/app/src/main/res/layout/fragment_depot.xml index 27bd8fe..5bac7c2 100644 --- a/app/src/main/res/layout/fragment_depot.xml +++ b/app/src/main/res/layout/fragment_depot.xml @@ -4,11 +4,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + app:layout_constraintTop_toBottomOf="@+id/DepotHeadline" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index 862e625..24d88ad 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -5,11 +5,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + app:layout_constraintTop_toBottomOf="@+id/HistoryHeadline" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_no_connection.xml b/app/src/main/res/layout/fragment_no_connection.xml index f785b16..4f63bb3 100644 --- a/app/src/main/res/layout/fragment_no_connection.xml +++ b/app/src/main/res/layout/fragment_no_connection.xml @@ -1,7 +1,6 @@ + app:layout_constraintTop_toBottomOf="@+id/searchStock"> diff --git a/app/src/main/res/layout/single_stock_overview.xml b/app/src/main/res/layout/single_stock_overview.xml index 92ae510..0219844 100644 --- a/app/src/main/res/layout/single_stock_overview.xml +++ b/app/src/main/res/layout/single_stock_overview.xml @@ -16,7 +16,7 @@ android:text="Stock ISIN" android:textColor="#2196F3" android:textSize="24sp" - app:layout_constraintStart_toEndOf="@+id/Puffer" + app:layout_constraintStart_toEndOf="@+id/Buffer" app:layout_constraintTop_toTopOf="parent" /> @@ -209,7 +209,7 @@ app:layout_constraintEnd_toEndOf="parent" />