Skip to content

Commit

Permalink
refactored variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobinTheezy
RobinTheezy committed May 12, 2021
1 parent 8800c8d commit 02646ff
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 194 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 7 additions & 11 deletions app/src/main/java/com/example/dhapp/DbManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -18,9 +17,7 @@ public DbManager(Context context) {
"stockDB.db",
null,
1);
Log.d("hallo1234", this.toString());
db=getWritableDatabase();
//db.close();
}

@Override
Expand All @@ -46,33 +43,32 @@ 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){
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 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()) {

Expand Down
10 changes: 1 addition & 9 deletions app/src/main/java/com/example/dhapp/DepotFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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;
Expand All @@ -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();}
}

}
6 changes: 1 addition & 5 deletions app/src/main/java/com/example/dhapp/HistoryFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -14,7 +13,6 @@

public class HistoryFragment extends Fragment {

Button DeleteHistory;

@Nullable
@Override
Expand Down Expand Up @@ -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();}
}
}
34 changes: 3 additions & 31 deletions app/src/main/java/com/example/dhapp/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand All @@ -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");

Expand Down Expand Up @@ -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");
}
}
}
31 changes: 13 additions & 18 deletions app/src/main/java/com/example/dhapp/MyAdapterDepot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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);
}
}
}
10 changes: 5 additions & 5 deletions app/src/main/java/com/example/dhapp/MyAdapterHistory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ public class MyAdapterHistory extends RecyclerView.Adapter<MyAdapterHistory.MyVi
String data1[];
Context context;

public MyAdapterHistory(Context ct, String AktienName[]) {
public MyAdapterHistory(Context ct, String stockName[]) {
context = ct;
data1 = AktienName;
data1 = stockName;
}

@NonNull
Expand All @@ -29,7 +29,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
Expand All @@ -39,11 +39,11 @@ public int getItemCount() {

public class MyViewHolder extends RecyclerView.ViewHolder {

TextView AktienTitel;
TextView stockNameView;

public MyViewHolder(@NonNull View itemView) {
super(itemView);
AktienTitel = itemView.findViewById(R.id.HistoryName);
stockNameView = itemView.findViewById(R.id.HistoryName);
}
}
}
35 changes: 0 additions & 35 deletions app/src/main/java/com/example/dhapp/NoConnectionFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,54 +6,23 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;

import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;

/**
* A simple {@link Fragment} subclass.
* Use the {@link NoConnectionFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class NoConnectionFragment 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 NoConnectionFragment() {
// 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 NoConnectionFragment.
*/
// TOD: Rename and change types and number of parameters
public static NoConnectionFragment newInstance(String param1, String param2) {
NoConnectionFragment fragment = new NoConnectionFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}

@Override
Expand All @@ -68,18 +37,14 @@ 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_no_connection, container, false);
}

public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
back = view.findViewById(R.id.tryAgain);
back.setOnClickListener(v -> {
Log.i("Information", "Start new Fragment");

getParentFragmentManager().beginTransaction().remove(this).commit();

});

}
Expand Down
Loading

0 comments on commit 02646ff

Please sign in to comment.