Skip to content

Commit

Permalink
World's smallest commit
Browse files Browse the repository at this point in the history 
:'(
Tint selected nav icon and a little more
  • Loading branch information
Ellis committed Nov 24, 2014
1 parent a59cd6a commit db43ff5
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file

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

19 changes: 0 additions & 19 deletions Iolite.iml
View file

This file was deleted.

12 changes: 6 additions & 6 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Iolite" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="iolite" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand Down Expand Up @@ -81,11 +81,11 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="cardview-v7-21.0.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
</component>
</module>

9 changes: 6 additions & 3 deletions app/src/main/java/com/el1t/iolite/AbstractDrawerActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.RelativeLayout;

Expand All @@ -26,6 +25,7 @@ public abstract class AbstractDrawerActivity extends ActionBarActivity {
private ActionBarDrawerToggle mDrawerToggle;
private RelativeLayout mDrawerContainer;
private ListView mDrawerList;
private NavDrawerAdapter mDrawerAdapter;
private NavDrawerActivityConfig navConf;
private int lastItemChecked;

Expand All @@ -49,7 +49,9 @@ protected void onCreate(Bundle savedInstanceState) {
mDrawerContainer = (RelativeLayout) findViewById(navConf.getDrawerContainerId());
mDrawerList = (ListView) findViewById(navConf.getLeftDrawerId());

mDrawerList.setAdapter(navConf.getAdapter());
mDrawerAdapter = navConf.getAdapter();
mDrawerAdapter.check(lastItemChecked);
mDrawerList.setAdapter(mDrawerAdapter);
mDrawerList.setOnItemClickListener(new DrawerItemClickListener());

this.initDrawerShadow();
Expand Down Expand Up @@ -142,9 +144,10 @@ protected ActionBarDrawerToggle getDrawerToggle() {
private class DrawerItemClickListener implements ListView.OnItemClickListener {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
final NavDrawerItem selectedItem = navConf.getAdapter().getItem(position);
final NavDrawerItem selectedItem = mDrawerAdapter.getItem(position);
onNavItemSelected(selectedItem.getListId());
if (selectedItem.isCheckable()) {
mDrawerAdapter.check(position);
// Checking is automatically done
lastItemChecked = position;
} else if (lastItemChecked != -1) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/el1t/iolite/EighthActivityXmlParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static ArrayList<EighthActivityItem> parse(InputStream in) throws XmlPull
try {
XmlPullParser parser = Xml.newPullParser();
parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
parser.setInput(in, null);
parser.setInput(in, "UTF-8");
parser.nextTag();
return readEighth(parser);
} finally {
Expand Down
22 changes: 17 additions & 5 deletions app/src/main/java/com/el1t/iolite/NavDrawerAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
public class NavDrawerAdapter extends ArrayAdapter<NavDrawerItem>
{
private LayoutInflater mLayoutInflater;
private int mChecked;

private static class NavMenuItemHolder {
private TextView labelView;
Expand All @@ -26,20 +27,20 @@ private static class NavMenuItemHolder {

public NavDrawerAdapter(Context context, int textViewResourceId) {
super(context, textViewResourceId);
this.mLayoutInflater = LayoutInflater.from(context);
mLayoutInflater = LayoutInflater.from(context);
}

@Override
public View getView(int position, View convertView, ViewGroup parent) {
final NavDrawerItem menuItem = this.getItem(position);
final NavDrawerItem menuItem = getItem(position);
// if (menuItem.getType() == NavMenuItem.ITEM_TYPE) {
if (menuItem != null) {
return getItemView(convertView, parent, menuItem);
return getItemView(convertView, parent, menuItem, position == mChecked);
}
return getSeparatorView(convertView, parent);
}

public View getItemView(View convertView, ViewGroup parentView, NavDrawerItem navDrawerItem) {
public View getItemView(View convertView, ViewGroup parentView, NavDrawerItem navDrawerItem, boolean isChecked) {
final NavMenuItem menuItem = (NavMenuItem) navDrawerItem;
final NavMenuItemHolder navMenuItemHolder;

Expand All @@ -56,10 +57,15 @@ public View getItemView(View convertView, ViewGroup parentView, NavDrawerItem na
}

navMenuItemHolder.labelView.setText(menuItem.getLabel());
if (isChecked) {
navMenuItemHolder.iconView.setAlpha(1f);
} else {
navMenuItemHolder.iconView.setAlpha(.54f);
}
navMenuItemHolder.iconView.setImageResource(menuItem.getIcon());
navMenuItemHolder.iconView.setVisibility(View.VISIBLE);

return convertView ;
return convertView;
}

public View getSeparatorView(View convertView, ViewGroup parentView) {
Expand Down Expand Up @@ -97,9 +103,15 @@ public void setItems(NavDrawerItem[] data) {
if (data != null) {
clear();
addAll(data);
notifyDataSetChanged();
}
}

public void check(int position) {
mChecked = position;
notifyDataSetChanged();
}

@Override
public int getViewTypeCount() {
return 2;
Expand Down
20 changes: 15 additions & 5 deletions app/src/main/java/com/el1t/iolite/SignupActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Toast;

import org.apache.http.HttpResponse;
Expand Down Expand Up @@ -78,6 +83,7 @@ protected void onCreate(Bundle savedInstanceState) {
setSupportActionBar(toolbar);
}
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

}

@Override
Expand All @@ -104,11 +110,15 @@ public void onDestroy() {
super.onDestroy();
}

// @Override
// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
// inflater.inflate(R.menu.login, menu);
//// super.onCreateOptionsMenu(menu, inflater);
// }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
final MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.eighth_signup, menu);
final MenuItem searchItem = menu.findItem(R.id.action_search);
final SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
// searchView.setOnQueryTextFocusChangeListener(this);
return super.onCreateOptionsMenu(menu);
}

public void refresh() {
if (!fake) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/nav_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
android:id="@+id/nav_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="56dp"
android:paddingStart="56dp"
android:layout_marginLeft="56dp"
android:layout_marginStart="56dp"
android:ellipsize="end"
android:singleLine="true"
android:layout_gravity="center_vertical"
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/menu/eighth_signup.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_search"
android:title="@string/action_search"
android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
app:showAsAction="collapseActionView|ifRoom"
android:actionViewClass="android.support.v7.widget.SearchView" />
</menu>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<string name="action_refresh">Refresh</string>
<string name="action_settings">Settings</string>
<string name="action_logout">Logout</string>
<string name="action_search">Search</string>
<string name="action_drawer_open">Drawer Open</string>
<string name="action_drawer_close">Drawer Close</string>

Expand Down

0 comments on commit db43ff5

Please sign in to comment.