Added unlock icon, fixed drawer items, switched to icons from resource in drawer

This commit is contained in:
Daniel Albert 2014-06-27 21:03:19 +02:00
parent 1b90b46b00
commit 567e5cc6a5
6 changed files with 20 additions and 14 deletions

View File

@ -37,8 +37,7 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
import com.beardedhen.androidbootstrap.FontAwesomeText;
import android.widget.ImageView;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
@ -79,10 +78,10 @@ public class DrawerActivity extends ActionBarActivity {
}
NavItem mItemIconTexts[] = new NavItem[]{
new NavItem("fa-user", getString(R.string.nav_keys)),
new NavItem("fa-lock", getString(R.string.nav_encrypt)),
new NavItem("fa-unlock", getString(R.string.nav_decrypt)),
new NavItem("fa-android", getString(R.string.nav_apps))};
new NavItem(R.drawable.ic_action_person, getString(R.string.nav_keys)),
new NavItem(R.drawable.ic_action_secure, getString(R.string.nav_encrypt)),
new NavItem(R.drawable.ic_action_not_secure, getString(R.string.nav_decrypt)),
new NavItem(R.drawable.ic_action_view_as_list, getString(R.string.nav_apps))};
mDrawerList.setAdapter(new NavigationDrawerAdapter(this, R.layout.drawer_list_item,
mItemIconTexts));
@ -239,10 +238,15 @@ public class DrawerActivity extends ActionBarActivity {
}
private class NavItem {
public String icon;
public int icon; // res-id
public String title;
public NavItem(String icon, String title) {
/**
* NavItem constructor
* @param icon The icons resource-id
* @param title The title of the menu entry
*/
public NavItem(int icon, String title) {
super();
this.icon = icon;
this.title = title;
@ -271,7 +275,7 @@ public class DrawerActivity extends ActionBarActivity {
row = inflater.inflate(mLayoutResourceId, parent, false);
holder = new NavItemHolder();
holder.mImg = (FontAwesomeText) row.findViewById(R.id.drawer_item_icon);
holder.mImg = (ImageView) row.findViewById(R.id.drawer_item_icon);
holder.mTxtTitle = (TextView) row.findViewById(R.id.drawer_item_text);
row.setTag(holder);
@ -281,7 +285,7 @@ public class DrawerActivity extends ActionBarActivity {
NavItem item = mData[position];
holder.mTxtTitle.setText(item.title);
holder.mImg.setIcon(item.icon);
holder.mImg.setImageResource(item.icon);
return row;
}
@ -289,7 +293,7 @@ public class DrawerActivity extends ActionBarActivity {
}
static class NavItemHolder {
FontAwesomeText mImg;
ImageView mImg;
TextView mTxtTitle;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 B

View File

@ -4,9 +4,10 @@
android:layout_height="wrap_content">
<ImageView
android:layout_width="30 dp"
android:layout_height="wrap_content"
android:id="@+id/drawer_item_icon"
android:gravity="center_vertical"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
@ -24,6 +25,7 @@
android:paddingTop="16dp"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textColor="#111"
android:layout_alignParentTop="true" />
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/drawer_item_icon"/>
</RelativeLayout>