diff --git a/app/src/main/java/org/yaaic/activity/MainActivity.java b/app/src/main/java/org/yaaic/activity/MainActivity.java index b754c21..c65bf73 100644 --- a/app/src/main/java/org/yaaic/activity/MainActivity.java +++ b/app/src/main/java/org/yaaic/activity/MainActivity.java @@ -30,6 +30,7 @@ import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.widget.Toolbar; import android.view.MenuItem; +import android.view.View; import org.yaaic.R; import org.yaaic.fragment.OverviewFragment; @@ -44,6 +45,7 @@ import org.yaaic.model.Status; */ public class MainActivity extends ActionBarActivity implements OverviewFragment.Callback, ServiceConnection { private ActionBarDrawerToggle toggle; + private DrawerLayout drawer; private IRCBinder binder; @Override @@ -55,7 +57,7 @@ public class MainActivity extends ActionBarActivity implements OverviewFragment. Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer); + drawer = (DrawerLayout) findViewById(R.id.drawer); toggle = new ActionBarDrawerToggle(this, drawer, toolbar, 0, 0); drawer.setDrawerListener(toggle); @@ -113,6 +115,18 @@ public class MainActivity extends ActionBarActivity implements OverviewFragment. } + public void onSettings(View view) { + drawer.closeDrawers(); + + startActivity(new Intent(this, SettingsActivity.class)); + } + + public void onAbout(View view) { + drawer.closeDrawers(); + + startActivity(new Intent(this, AboutActivity.class)); + } + @Override public IRCBinder getBinder() { return binder; diff --git a/app/src/main/res/drawable/navigation_item_background.xml b/app/src/main/res/drawable/navigation_item_background.xml new file mode 100644 index 0000000..95a2503 --- /dev/null +++ b/app/src/main/res/drawable/navigation_item_background.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_drawer.xml b/app/src/main/res/layout/item_drawer.xml index c7d3058..1717863 100644 --- a/app/src/main/res/layout/item_drawer.xml +++ b/app/src/main/res/layout/item_drawer.xml @@ -1,5 +1,4 @@ - -