From 558b4b823907caae3af1a26f80c057ef2d336aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sat, 1 Jul 2017 03:22:49 +0200 Subject: [PATCH] Fix, clear and polishing 1fb4079 --- .idea/modules.xml | 2 +- .../activity/dashboard/DashboardActivity.java | 16 +- .../dashboard/NavigationDrawerFragment.java | 284 ------------------ .../activity/started/LoadingTask.java | 3 - .../activity/started/StartedActivity.java | 3 - app/src/main/res/layout/drawer_dashboard.xml | 9 - app/src/main/res/menu/dashboard.xml | 14 - app/src/main/res/menu/global.xml | 8 - app/src/main/res/menu/navigation.xml | 11 +- app/src/main/res/values-pl/strings.xml | 11 +- app/src/main/res/values/strings.xml | 6 +- 11 files changed, 25 insertions(+), 342 deletions(-) delete mode 100644 app/src/main/java/io/github/wulkanowy/activity/dashboard/NavigationDrawerFragment.java delete mode 100644 app/src/main/res/layout/drawer_dashboard.xml delete mode 100644 app/src/main/res/menu/dashboard.xml delete mode 100644 app/src/main/res/menu/global.xml diff --git a/.idea/modules.xml b/.idea/modules.xml index c3a3d587d..1f81c9b59 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - + \ No newline at end of file diff --git a/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java b/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java index 8767e0e04..782eb58e0 100644 --- a/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java +++ b/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java @@ -19,25 +19,24 @@ public class DashboardActivity extends AppCompatActivity { @Override public boolean onNavigationItemSelected(@NonNull MenuItem item) { switch (item.getItemId()) { - case R.id.navigation_home: - mTextMessage.setText("DUPA"); + case R.id.navigation_marks: + mTextMessage.setText(R.string.title_marks); + return true; + case R.id.navigation_attendance: + mTextMessage.setText(R.string.title_attendance); return true; case R.id.navigation_dashboard: mTextMessage.setText(R.string.title_dashboard); return true; - case R.id.navigation_notifications: - mTextMessage.setText(R.string.title_attendance); - return true; case R.id.navigation_lessonplan: mTextMessage.setText(R.string.title_lessonplan); return true; - case R.id.navigation_other: - mTextMessage.setText(R.string.title_other); + case R.id.navigation_settings: + mTextMessage.setText(R.string.title_settings); return true; } return false; } - }; @Override @@ -47,6 +46,7 @@ public class DashboardActivity extends AppCompatActivity { mTextMessage = (TextView) findViewById(R.id.message); BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navigation); + navigation.setSelectedItemId(R.id.navigation_dashboard); navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener); } diff --git a/app/src/main/java/io/github/wulkanowy/activity/dashboard/NavigationDrawerFragment.java b/app/src/main/java/io/github/wulkanowy/activity/dashboard/NavigationDrawerFragment.java deleted file mode 100644 index 0583f187e..000000000 --- a/app/src/main/java/io/github/wulkanowy/activity/dashboard/NavigationDrawerFragment.java +++ /dev/null @@ -1,284 +0,0 @@ -package io.github.wulkanowy.activity.dashboard; - - -import android.app.Activity; -import android.app.ActionBar; -import android.app.Fragment; -import android.support.v4.app.ActionBarDrawerToggle; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.content.SharedPreferences; -import android.content.res.Configuration; -import android.os.Bundle; -import android.preference.PreferenceManager; -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.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.ListView; -import android.widget.Toast; - -import io.github.wulkanowy.R; - -/** - * Fragment used for managing interactions for and presentation of a navigation drawer. - * See the - * design guidelines for a complete explanation of the behaviors implemented here. - */ -public class NavigationDrawerFragment extends Fragment { - - /** - * Remember the position of the selected item. - */ - private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position"; - - /** - * Per the design guidelines, you should show the drawer on launch until the user manually - * expands it. This shared preference tracks this. - */ - private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned"; - - /** - * A pointer to the current callbacks instance (the Activity). - */ - private NavigationDrawerCallbacks mCallbacks; - - /** - * Helper component that ties the action bar to the navigation drawer. - */ - private ActionBarDrawerToggle mDrawerToggle; - - private DrawerLayout mDrawerLayout; - private ListView mDrawerListView; - private View mFragmentContainerView; - - private int mCurrentSelectedPosition = 0; - private boolean mFromSavedInstanceState; - private boolean mUserLearnedDrawer; - - public NavigationDrawerFragment() { - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // Read in the flag indicating whether or not the user has demonstrated awareness of the - // drawer. See PREF_USER_LEARNED_DRAWER for details. - SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity()); - mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false); - - if (savedInstanceState != null) { - mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION); - mFromSavedInstanceState = true; - } - - // Select either the default item (0) or the last selected item. - selectItem(mCurrentSelectedPosition); - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - // Indicate that this fragment would like to influence the set of actions in the action bar. - setHasOptionsMenu(true); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - mDrawerListView = (ListView) inflater.inflate( - R.layout.drawer_dashboard, container, false); - mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - selectItem(position); - } - }); - mDrawerListView.setAdapter(new ArrayAdapter( - getActionBar().getThemedContext(), - android.R.layout.simple_list_item_activated_1, - android.R.id.text1, - new String[]{ - getString(R.string.title_section1), - getString(R.string.title_section2), - getString(R.string.title_section3), - })); - mDrawerListView.setItemChecked(mCurrentSelectedPosition, true); - return mDrawerListView; - } - - public boolean isDrawerOpen() { - return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView); - } - - /** - * Users of this fragment must call this method to set up the navigation drawer interactions. - * - * @param fragmentId The android:id of this fragment in its activity's layout. - * @param drawerLayout The DrawerLayout containing this fragment's UI. - */ - public void setUp(int fragmentId, DrawerLayout drawerLayout) { - mFragmentContainerView = getActivity().findViewById(fragmentId); - mDrawerLayout = drawerLayout; - - // set a custom shadow that overlays the main content when the drawer opens - mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START); - // set up the drawer's list view with items and click listener - - ActionBar actionBar = getActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setHomeButtonEnabled(true); - - // ActionBarDrawerToggle ties together the the proper interactions - // between the navigation drawer and the action bar app icon. - mDrawerToggle = new ActionBarDrawerToggle( - getActivity(), /* host Activity */ - mDrawerLayout, /* DrawerLayout object */ - R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */ - R.string.navigation_drawer_open, /* "open drawer" description for accessibility */ - R.string.navigation_drawer_close /* "close drawer" description for accessibility */ - ) { - @Override - public void onDrawerClosed(View drawerView) { - super.onDrawerClosed(drawerView); - if (!isAdded()) { - return; - } - - getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() - } - - @Override - public void onDrawerOpened(View drawerView) { - super.onDrawerOpened(drawerView); - if (!isAdded()) { - return; - } - - if (!mUserLearnedDrawer) { - // The user manually opened the drawer; store this flag to prevent auto-showing - // the navigation drawer automatically in the future. - mUserLearnedDrawer = true; - SharedPreferences sp = PreferenceManager - .getDefaultSharedPreferences(getActivity()); - sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply(); - } - - getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() - } - }; - - // If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer, - // per the navigation drawer design guidelines. - if (!mUserLearnedDrawer && !mFromSavedInstanceState) { - mDrawerLayout.openDrawer(mFragmentContainerView); - } - - // Defer code dependent on restoration of previous instance state. - mDrawerLayout.post(new Runnable() { - @Override - public void run() { - mDrawerToggle.syncState(); - } - }); - - mDrawerLayout.setDrawerListener(mDrawerToggle); - } - - private void selectItem(int position) { - mCurrentSelectedPosition = position; - if (mDrawerListView != null) { - mDrawerListView.setItemChecked(position, true); - } - if (mDrawerLayout != null) { - mDrawerLayout.closeDrawer(mFragmentContainerView); - } - if (mCallbacks != null) { - mCallbacks.onNavigationDrawerItemSelected(position); - } - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - try { - mCallbacks = (NavigationDrawerCallbacks) activity; - } catch (ClassCastException e) { - throw new ClassCastException("Activity must implement NavigationDrawerCallbacks."); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mCallbacks = null; - } - - @Override - public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition); - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - // Forward the new configuration the drawer toggle component. - mDrawerToggle.onConfigurationChanged(newConfig); - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - // If the drawer is open, show the global app actions in the action bar. See also - // showGlobalContextActionBar, which controls the top-left area of the action bar. - if (mDrawerLayout != null && isDrawerOpen()) { - inflater.inflate(R.menu.global, menu); - showGlobalContextActionBar(); - } - super.onCreateOptionsMenu(menu, inflater); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (mDrawerToggle.onOptionsItemSelected(item)) { - return true; - } - - if (item.getItemId() == R.id.action_example) { - Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show(); - return true; - } - - return super.onOptionsItemSelected(item); - } - - /** - * Per the navigation drawer design guidelines, updates the action bar to show the global app - * 'context', rather than just what's in the current screen. - */ - private void showGlobalContextActionBar() { - ActionBar actionBar = getActionBar(); - actionBar.setDisplayShowTitleEnabled(true); - actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); - actionBar.setTitle(R.string.app_name); - } - - private ActionBar getActionBar() { - return getActivity().getActionBar(); - } - - /** - * Callbacks interface that all activities using this fragment must implement. - */ - public static interface NavigationDrawerCallbacks { - /** - * Called when an item in the navigation drawer is selected. - */ - void onNavigationDrawerItemSelected(int position); - } -} diff --git a/app/src/main/java/io/github/wulkanowy/activity/started/LoadingTask.java b/app/src/main/java/io/github/wulkanowy/activity/started/LoadingTask.java index 635a0b49e..bc57ffc08 100644 --- a/app/src/main/java/io/github/wulkanowy/activity/started/LoadingTask.java +++ b/app/src/main/java/io/github/wulkanowy/activity/started/LoadingTask.java @@ -33,8 +33,5 @@ public class LoadingTask extends AsyncTask { Intent intent = new Intent(activity,DashboardActivity.class); activity.startActivity(intent); - - } } - diff --git a/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java b/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java index 2e25bc709..241d832ba 100644 --- a/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java +++ b/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java @@ -17,8 +17,5 @@ public class StartedActivity extends Activity { public void Task(){ new LoadingTask(this).execute(); - - - } } diff --git a/app/src/main/res/layout/drawer_dashboard.xml b/app/src/main/res/layout/drawer_dashboard.xml deleted file mode 100644 index bc61ada5c..000000000 --- a/app/src/main/res/layout/drawer_dashboard.xml +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/app/src/main/res/menu/dashboard.xml b/app/src/main/res/menu/dashboard.xml deleted file mode 100644 index 00a770101..000000000 --- a/app/src/main/res/menu/dashboard.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml deleted file mode 100644 index 32b6a8f1a..000000000 --- a/app/src/main/res/menu/global.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml index e2f8fdb5f..d813140ba 100644 --- a/app/src/main/res/menu/navigation.xml +++ b/app/src/main/res/menu/navigation.xml @@ -3,17 +3,17 @@ xmlns:android="http://schemas.android.com/apk/res/android"> @@ -23,9 +23,8 @@ android:title="@string/title_lessonplan" /> - + android:title="@string/title_settings" /> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 66e9ab019..5ff807d4c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,4 +1,3 @@ - Wulkanowy Surowa wersja @@ -13,5 +12,11 @@ Funkcja którą chciałeś uruchomić nie działa Pomyślnie zalogowano Logowanie nie powiodło się - Proszę czekać... - \ No newline at end of file + Proszę czekać… + Aktywność dashboard + Dashboard + Oceny + Frekwencja + Plan lekcji + Ustawienia + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4b581c736..f7a631f38 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,11 +12,11 @@ The function you wanted to run does not work Login is successful Login is failed - Please wait... - DashboardActivity + Please wait… + Dashboard Activity Dashboard Marks Attendance Lesson Plan - Other + Settings