Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	app/src/main/java/edu/sc/snacktrack/MainActivity.java
	app/src/main/java/edu/sc/snacktrack/PreviousEntriesFragment.java
	app/src/main/res/menu/menu_main.xml
  • Loading branch information
@dowdwd
dowdwd committed Mar 5, 2016
2 parents 5cc9dad + f9072a8 commit cce980a
Show file tree
Hide file tree
Showing 10 changed files with 283 additions and 238 deletions.
11 changes: 0 additions & 11 deletions app/src/main/java/edu/sc/snacktrack/DisplayClientsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
Expand Down Expand Up @@ -44,21 +43,11 @@ public void onClientListUpdateStart() {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
adapter = new ClientListAdapter(getContext());
ClientList.getInstance().registerUpdateListener(adapter);
ClientList.getInstance().registerUpdateListener(this);
}

@Override
public void onPrepareOptionsMenu(Menu menu) {

menu.findItem(R.id.action_new).setEnabled(false);
menu.findItem(R.id.action_new).setVisible(false);

super.onPrepareOptionsMenu(menu);
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
Log.d(TAG, "onCreateView");
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/java/edu/sc/snacktrack/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public class MainActivity extends AppCompatActivity{
private ActionBarDrawerToggle mDrawerToggle;
private CharSequence mTitle = "";
private String[] drawerItems;
private Boolean disableEntryFlag = false;

private static final int BF_ALARM_REQUEST = 1;
private static final int LUN_ALARM_REQUEST = 2;
Expand Down Expand Up @@ -95,14 +94,12 @@ protected void onCreate(Bundle savedInstanceState) {
public void onDrawerClosed(View drawerView) {
getSupportActionBar().setTitle(mTitle);
invalidateOptionsMenu();
disableEntryFlag = false;
}

@Override
public void onDrawerOpened(View drawerView) {
getSupportActionBar().setTitle("Select an option");
invalidateOptionsMenu();
disableEntryFlag = true;
View view = getCurrentFocus();
if (view != null) {
InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
Expand Down Expand Up @@ -347,6 +344,7 @@ public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistent
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_main, menu);

return true;
}

Expand Down Expand Up @@ -503,10 +501,10 @@ private void logout(){

@Override
public void done(ParseException e) {
if (e == null) {
if(e == null){
displayView(0);
startLoginActivity();
} else {
} else{
updateToast(e.getMessage(), Toast.LENGTH_LONG);
}
}
Expand Down
47 changes: 47 additions & 0 deletions app/src/main/java/edu/sc/snacktrack/NewEntryActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.parse.ParseUser;
import com.parse.SaveCallback;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;

Expand All @@ -38,6 +39,12 @@
import android.view.View.OnClickListener;
import android.widget.Button;

import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;

import javax.net.ssl.HttpsURLConnection;

public class NewEntryActivity extends AppCompatActivity implements OnClickListener{

private static final String TAG = "NewEntryDebug";
Expand Down Expand Up @@ -239,6 +246,12 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
String scanFormat = scanningResult.getFormatName();
formatTxt.setText("FORMAT: " + scanFormat);
contentTxt.setText("CONTENT: " + scanContent);
try {
contentTxt.setText(httpGet(scanContent));
}catch(IOException ex) {
ex.printStackTrace();
}
barcodeContent = scanContent;
}
else{
Toast toast = Toast.makeText(getApplicationContext(),
Expand Down Expand Up @@ -481,6 +494,40 @@ protected void onCancelled(){
}
private Button scanBtn;
private TextView formatTxt, contentTxt;
private String barcodeContent;

//httpurlconnection to outpan
public static String httpGet(String urlStr) throws IOException {
try {
String yourProduct = urlStr;
urlStr = "https://api.outpan.com/v2/products/";
urlStr.concat(yourProduct);
urlStr.concat("?apikey=0486422639a1db6223dd81a97c9f996f");
URL url = new URL(urlStr);
HttpsURLConnection conn =
(HttpsURLConnection) url.openConnection();

if (conn.getResponseCode() != 200) {
throw new IOException(conn.getResponseMessage());
}

// Buffer the result into a string
BufferedReader rd = new BufferedReader(
new InputStreamReader(conn.getInputStream()));
StringBuilder sb = new StringBuilder();
String line;
while ((line = rd.readLine()) != null) {
sb.append(line);
}
rd.close();

conn.disconnect();
return sb.toString();
}catch(IOException ex) {
ex.printStackTrace();
return null;
}
}

public void onClick(View v){
if(v.getId()==R.id.scan_button){
Expand Down
26 changes: 4 additions & 22 deletions app/src/main/java/edu/sc/snacktrack/PreviousEntriesFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
Expand All @@ -23,8 +24,6 @@ public class PreviousEntriesFragment extends Fragment implements SnackList.Updat

private View progressOverlay;

private Boolean disableEntryFlag = false;

@Override
public void onSnackListUpdateComplete() {
adapter.notifyDataSetChanged();
Expand All @@ -42,32 +41,15 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);

if(SnackList.getInstance().getUser() != ParseUser.getCurrentUser())
disableEntryFlag = true;

else
disableEntryFlag = false;

adapter = new SnackListAdapter(getContext());
SnackList.getInstance().registerUpdateListener(adapter);
SnackList.getInstance().registerUpdateListener(this);
}

@Override
public void onPrepareOptionsMenu(Menu menu) {
if(disableEntryFlag)
{
menu.findItem(R.id.action_new).setEnabled(false);
menu.findItem(R.id.action_new).setVisible(false);
}

else
{
menu.findItem(R.id.action_new).setEnabled(true);
menu.findItem(R.id.action_new).setVisible(true);
}

super.onPrepareOptionsMenu(menu);
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.menu_previous_entries, menu);
}

@Override
Expand Down
11 changes: 0 additions & 11 deletions app/src/main/java/edu/sc/snacktrack/SettingsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
Expand All @@ -25,16 +24,6 @@ public void onAttach(Context context) {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
}

@Override
public void onPrepareOptionsMenu(Menu menu) {

menu.findItem(R.id.action_new).setEnabled(false);
menu.findItem(R.id.action_new).setVisible(false);

super.onPrepareOptionsMenu(menu);
}

@Override
Expand Down
Loading

0 comments on commit cce980a

Please sign in to comment.