Skip to content

Commit

Permalink
Merge pull request #2 from Fayte92/Arin
Browse files Browse the repository at this point in the history
Arin
  • Loading branch information
Fayte92 authored Nov 4, 2019
2 parents cb8ab1d + f61aee4 commit f536765
Show file tree
Hide file tree
Showing 31 changed files with 644 additions and 124 deletions.
2 changes: 1 addition & 1 deletion WinRate/.idea/misc.xml

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

149 changes: 86 additions & 63 deletions WinRate/app/src/main/java/com/ucsc/winrate/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import androidx.recyclerview.widget.RecyclerView;

import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.CompoundButton;
Expand All @@ -36,13 +37,13 @@
import java.util.Calendar;
import java.util.Date;

public class MainActivity extends AppCompatActivity {
public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {

//declare the necessary variables.
static int winC,loseC,curWinSum,curLoseSum;//winC,loseC are the counter of win or lose.
static int winC, loseC, curWinSum, curLoseSum;//winC,loseC are the counter of win or lose.
static int DataCounter = 0;
static boolean result;//result iss used for storing the value of switch.
EditText playerDeck,opponentName, opponentDeck;// EditText for user input.
EditText playerDeck, opponentName, opponentDeck;// EditText for user input.
//View parentView;//ID of parent view for reference
Switch WinLose;
Button submit,UserProfile;
Expand All @@ -65,10 +66,11 @@ protected void onCreate(Bundle savedInstanceState) {
setSupportActionBar(toolbar);
DrawerLayout drawer = findViewById(R.id.activityMain);
NavigationView navigationView = findViewById(R.id.nav_view);
navigationView.setNavigationItemSelectedListener(this);
// Passing each menu ID as a set of Ids because each
// menu should be considered as top level destinations.
mAppBarConfiguration = new AppBarConfiguration.Builder(
R.id.nav_inputForm, R.id.nav_stats)
R.id.navInputForm, R.id.navStatistics,R.id.navContactBook,R.id.navLifeCounter,R.id.navSettings)
.setDrawerLayout(drawer)
.build();
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
Expand All @@ -90,76 +92,74 @@ protected void onCreate(Bundle savedInstanceState) {
//submit = findViewById(R.id.submitButton);
//OnCheckChangeListener is a listener which can detect the switch is on or off
//WinLose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
//@Override
//public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
//result = isChecked;
//if(isChecked){
//winC = 1;
//}else{
//loseC = 1;
//}
//}
//@Override
//public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
//result = isChecked;
//if(isChecked){
//winC = 1;
//}else{
//loseC = 1;
//}
//}
//});

//myRef.addValueEventListener(new ValueEventListener() {
//@Override
//public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
//@Override
//public void onDataChange(@NonNull DataSnapshot dataSnapshot) {

//}
//}

//@Override
//public void onCancelled(@NonNull DatabaseError databaseError) {
//@Override
//public void onCancelled(@NonNull DatabaseError databaseError) {

//}
//}
//});

//submit.setOnClickListener(new View.OnClickListener() {
//@Override
//public void onClick(View v) {
//addData();
//}
//@Override
//public void onClick(View v) {
//addData();
//}
//});



//}
//addData() will add the data to the firebase
//private void addData(){
//String UserID = curUser.getDisplayName();
//String id = myRef.push().getKey();
//get date data by Calendar.
//And get text from elements in layout and convert them to string
//Date curD = Calendar.getInstance().getTime();
//String pD = playerDeck.getText().toString();
//String oN = opponentName.getText().toString();
//String oD = opponentDeck.getText().toString();
//String DataName = "data" + DataCounter;
//Toast.makeText(this,UserID,Toast.LENGTH_LONG).show();

//WinRateData winData = new WinRateData(pD,oN,oD,result,curD);
//DatabaseReference newRef = myRef.child(curUser.getUid());
//newRef.addValueEventListener(new ValueEventListener() {
//@Override
//public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
//curWinSum = Integer.parseInt(dataSnapshot.child("winSum").getValue().toString());
//curLoseSum = Integer.parseInt(dataSnapshot.child("loseSum").getValue().toString());
//curWinSum = curWinSum + winC;
//curLoseSum = curLoseSum + loseC;
//}
//String UserID = curUser.getDisplayName();
//String id = myRef.push().getKey();
//get date data by Calendar.
//And get text from elements in layout and convert them to string
//Date curD = Calendar.getInstance().getTime();
//String pD = playerDeck.getText().toString();
//String oN = opponentName.getText().toString();
//String oD = opponentDeck.getText().toString();
//String DataName = "data" + DataCounter;
//Toast.makeText(this,UserID,Toast.LENGTH_LONG).show();

//WinRateData winData = new WinRateData(pD,oN,oD,result,curD);
//DatabaseReference newRef = myRef.child(curUser.getUid());
//newRef.addValueEventListener(new ValueEventListener() {
//@Override
//public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
//curWinSum = Integer.parseInt(dataSnapshot.child("winSum").getValue().toString());
//curLoseSum = Integer.parseInt(dataSnapshot.child("loseSum").getValue().toString());
//curWinSum = curWinSum + winC;
//curLoseSum = curLoseSum + loseC;
//}

//@Override
//public void onCancelled(@NonNull DatabaseError databaseError) {
//}
//});
//@Override
//public void onCancelled(@NonNull DatabaseError databaseError) {
//}
//});

//myRef.child(curUser.getUid()).child("winSum").setValue(curWinSum);
//myRef.child(curUser.getUid()).child("loseSum").setValue(curLoseSum);
//myRef.child(curUser.getUid()).child("winSum").setValue(winC);
//myRef.child(curUser.getUid()).child("loseSum").setValue(loseC);
//myRef.child(curUser.getUid()).child(myRef.push().getKey()).setValue(winData);
//myRef.child(curUser.getUid()).child("winSum").setValue(curWinSum);
//myRef.child(curUser.getUid()).child("loseSum").setValue(curLoseSum);
//myRef.child(curUser.getUid()).child("winSum").setValue(winC);
//myRef.child(curUser.getUid()).child("loseSum").setValue(loseC);
//myRef.child(curUser.getUid()).child(myRef.push().getKey()).setValue(winData);

//LargeData newdata = new LargeData(winC, loseC, winData, DataName, curUser, myRef);
//DataCounter++;
//LargeData newdata = new LargeData(winC, loseC, winData, DataName, curUser, myRef);
//DataCounter++;

/*BEGIN INITIALIZATION OF ROOM DATABASE*/
RecyclerView recyclerView = findViewById(R.id.recyclerview);
Expand All @@ -171,17 +171,40 @@ protected void onCreate(Bundle savedInstanceState) {

}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.draw_menu, menu);
return true;
}
//@Override
//public boolean onCreateOptionsMenu(Menu menu) {
//Inflate the menu; this adds items to the action bar if it is present.
// getMenuInflater().inflate(R.menu.options_menu, menu);
// return true;
//}

@Override
public boolean onSupportNavigateUp() {
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
return NavigationUI.navigateUp(navController, mAppBarConfiguration)
|| super.onSupportNavigateUp();
}

@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
switch (item.getItemId()) {
case R.id.navInputForm:
navController.navigate(R.id.navInputForm);
break;
case R.id.navStatistics:
navController.navigate(R.id.navStatistics);
break;
case R.id.navContactBook:
navController.navigate(R.id.navContactBook);
break;
case R.id.navLifeCounter:
navController.navigate(R.id.navLifeCounter);
break;
case R.id.navSettings:
navController.navigate(R.id.navSettings);
break;
}
return true;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package com.ucsc.winrate.ui.contactBook;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;

import androidx.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
import androidx.navigation.NavController;
import androidx.navigation.Navigation;

import com.ucsc.winrate.R;

public class ContactBookFragment extends Fragment implements View.OnClickListener {

private ContactBookViewModel contactBookViewModel;
private Button contactsButton;
private Button decksButton;

public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
contactBookViewModel =
ViewModelProviders.of(this).get(ContactBookViewModel.class);
View root = inflater.inflate(R.layout.fragment_contact_book, container, false);

contactsButton = root.findViewById(R.id.contactsButton);
contactsButton.setOnClickListener(this);
decksButton = root.findViewById(R.id.decksButton);
decksButton.setOnClickListener(this);
//final TextView textView = root.findViewById(R.id.text_contactBook);
//contactBookViewModel.getText().observe(this, new Observer<String>() {
// @Override
// public void onChanged(@Nullable String s) {
// textView.setText(s);
// }
//});
return root;
}

@Override
public void onClick(View view) {
NavController navController = Navigation.findNavController(getActivity(), R.id.nav_host_contact_fragment);
switch (view.getId()) {
case R.id.contactsButton:
navController.navigate(R.id.navContacts);
break;
case R.id.decksButton:
navController.navigate(R.id.navDecks);
break;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.ucsc.winrate.ui.contactBook;

import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;

public class ContactBookViewModel extends ViewModel{

private MutableLiveData<String> mText;

public ContactBookViewModel() {
mText = new MutableLiveData<>();
mText.setValue("Contact Book");
}

public LiveData<String> getText() {
return mText;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.ucsc.winrate.ui.contactBook;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;

import com.ucsc.winrate.R;

public class ContactsFragment extends Fragment{

private ContactsViewModel contactsViewModel;

public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
contactsViewModel =
ViewModelProviders.of(this).get(ContactsViewModel.class);
View root = inflater.inflate(R.layout.fragment_contacts, container, false);
//final TextView textView = root.findViewById(R.id.text_contacts);
//contactsViewModel.getText().observe(this, new Observer<String>() {
// @Override
// public void onChanged(@Nullable String s) {
// textView.setText(s);
// }
//});
return root;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.ucsc.winrate.ui.contactBook;

import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;

public class ContactsViewModel extends ViewModel{

private MutableLiveData<String> mText;

public ContactsViewModel() {
mText = new MutableLiveData<>();
mText.setValue("Contacts");
}

public LiveData<String> getText() {
return mText;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.ucsc.winrate.ui.contactBook;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;

import com.ucsc.winrate.R;

public class DecksFragment extends Fragment{

private DecksViewModel decksViewModel;

public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
decksViewModel =
ViewModelProviders.of(this).get(DecksViewModel.class);
View root = inflater.inflate(R.layout.fragment_decks, container, false);
//final TextView textView = root.findViewById(R.id.text_decks);
//decksViewModel.getText().observe(this, new Observer<String>() {
// @Override
// public void onChanged(@Nullable String s) {
// textView.setText(s);
// }
//});
return root;
}
}
Loading

0 comments on commit f536765

Please sign in to comment.