wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #364

Browse source
This commit is contained in:
David Development 2015-07-18 13:31:23 +02:00
parent 9611ccb6d1
commit e9017910e2
1 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java
View file

@ -305,10 +305,9 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
//viewHolder.txt_UnreadCount.setText(group.unreadCount); int rotation = 0;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
viewHolder.imgView.setRotation(0);
//viewHolder.txt_UnreadCount.setText(group.unreadCount);
if(group.idFolder != null) if(group.idFolder != null)
{ {
@ -320,7 +319,7 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
} else { } else {
if(group.id_database == ALL_STARRED_ITEMS.getValue()) { if(group.id_database == ALL_STARRED_ITEMS.getValue()) {
viewHolder.imgView.setVisibility(View.VISIBLE); viewHolder.imgView.setVisibility(View.VISIBLE);
viewHolder.imgView.setRotation(0); rotation= 0;
viewHolder.imgView.setImageDrawable(getBtn_rating_star_off_normal_holo_light(mContext)); viewHolder.imgView.setImageDrawable(getBtn_rating_star_off_normal_holo_light(mContext));
} else if (getChildrenCount( groupPosition ) == 0 ) { } else if (getChildrenCount( groupPosition ) == 0 ) {
viewHolder.imgView.setVisibility(View.INVISIBLE); viewHolder.imgView.setVisibility(View.INVISIBLE);
@ -329,13 +328,31 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
viewHolder.imgView.setImageDrawable(getFolderIndicatorIcon(mContext)); viewHolder.imgView.setImageDrawable(getFolderIndicatorIcon(mContext));
if(isExpanded) { if(isExpanded) {
viewHolder.imgView.setRotation(90); rotation = 90;
} else { } else {
viewHolder.imgView.setRotation(180); rotation = 180;
} }
} }
//On API LEVEL < 11 we can't use the rotate method.. so we have to set different bitmaps.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
if(group.id_database != ALL_STARRED_ITEMS.getValue()) {
if (rotation == 90) {
viewHolder.imgView.setImageDrawable(getFolderIndicatorIcon(mContext));
} else {
viewHolder.imgView.setImageDrawable(getFolderIndicatorIconDown(mContext));
}
}
}
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
viewHolder.imgView.setRotation(rotation);
}
return convertView; return convertView;
} }
@ -344,6 +361,7 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
Drawable folder_indicator_icon; Drawable folder_indicator_icon;
Drawable folder_indicator_icon_old_android; //Only used on Android API LEVEL < 11
Drawable btn_rating_star_off_normal_holo_light; Drawable btn_rating_star_off_normal_holo_light;
private Drawable getBtn_rating_star_off_normal_holo_light(Context context) { private Drawable getBtn_rating_star_off_normal_holo_light(Context context) {
@ -367,6 +385,16 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
return folder_indicator_icon; return folder_indicator_icon;
} }
private Drawable getFolderIndicatorIconDown(Context context) {
if(folder_indicator_icon_old_android == null) {
if(ThemeChooser.isDarkTheme(mContext))
folder_indicator_icon_old_android = context.getResources().getDrawable(R.drawable.ic_action_expand_more_dark);
else
folder_indicator_icon_old_android = context.getResources().getDrawable(R.drawable.ic_action_expand_more_light);
}
return folder_indicator_icon_old_android;
}
static class GroupHolder static class GroupHolder
{ {