diff --git a/app/src/main/java/lt/andro/maistobankas/BaseFragment.java b/app/src/main/java/lt/andro/maistobankas/BaseFragment.java index b775c81..f85038b 100644 --- a/app/src/main/java/lt/andro/maistobankas/BaseFragment.java +++ b/app/src/main/java/lt/andro/maistobankas/BaseFragment.java @@ -13,6 +13,7 @@ * @since 2014-02-08 13:04 */ public class BaseFragment extends Fragment { + @Override public void onAttach(Activity activity) { super.onAttach(activity); @@ -22,6 +23,7 @@ public void onAttach(Activity activity) { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setHasOptionsMenu(true); Log.d("MBBaseFragment", "onCreate"); } diff --git a/app/src/main/java/lt/andro/maistobankas/MainActivity.java b/app/src/main/java/lt/andro/maistobankas/MainActivity.java index 6a78c12..c091b91 100644 --- a/app/src/main/java/lt/andro/maistobankas/MainActivity.java +++ b/app/src/main/java/lt/andro/maistobankas/MainActivity.java @@ -31,27 +31,6 @@ 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.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - if (id == R.id.action_settings) { - return true; - } - return super.onOptionsItemSelected(item); - } - public void onActivityResult(int requestCode, int resultCode, Intent intent) { IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent); if (scanResult != null && resultCode == RESULT_OK) { diff --git a/app/src/main/java/lt/andro/maistobankas/MainFragment.java b/app/src/main/java/lt/andro/maistobankas/MainFragment.java index 6fb548f..8443e2e 100644 --- a/app/src/main/java/lt/andro/maistobankas/MainFragment.java +++ b/app/src/main/java/lt/andro/maistobankas/MainFragment.java @@ -4,6 +4,9 @@ import android.support.v4.app.FragmentActivity; import android.util.Log; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ListView; @@ -29,15 +32,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_main, container, false); - rootView.findViewById(R.id.buttonSettings).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - getActivity().getSupportFragmentManager().beginTransaction() - .replace(R.id.container, new ShopInformationFragment()) - .commit(); - } - }); - rootView.findViewById(R.id.buttonScan).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -73,4 +67,25 @@ private void showScannedItems(List scannedItems) { final DatabaseHelper helper = ((MainActivity) activity).getHelper(); itemsList.setAdapter(new ScannedItemsAdapter(activity, scannedItems, helper)); } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + super.onCreateOptionsMenu(menu, inflater); + inflater.inflate(R.menu.main, menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + if (id == R.id.action_settings) { + getActivity().getSupportFragmentManager().beginTransaction() + .replace(R.id.container, new ShopInformationFragment()) + .commit(); + return true; + } + return super.onOptionsItemSelected(item); + } } diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 2039f5f..ebcecf8 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -11,13 +11,6 @@ android:text="@string/button_send" android:id="@+id/buttonScan" /> -