diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java index 6e1f4e4b..dc96a172 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java @@ -709,14 +709,24 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele } } + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return createView(position, convertView, parent, true); + } + @Override public View getView(final int position, View convertView, final ViewGroup parent) { + return createView(position, convertView, parent, false); + } + + private View createView(int position, View convertView, ViewGroup parent, boolean dropDown) { if (position == getCount() - 1) { - TextView textView = (TextView) LayoutInflater.from(context).inflate(R.layout.board_select_add, null); + TextView textView = (TextView) LayoutInflater.from(context).inflate(R.layout.board_select_add, parent, false); textView.setText(getItem(position)); return textView; } else { - TextView textView = (TextView) LayoutInflater.from(context).inflate(R.layout.board_select_spinner, null); + TextView textView = (TextView) LayoutInflater.from(context).inflate( + dropDown ? R.layout.board_select_spinner_dropdown : R.layout.board_select_spinner, parent, false); textView.setText(getItem(position)); return textView; } diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_chat.png deleted file mode 100644 index 4d9c0982..00000000 Binary files a/Clover/app/src/main/res/drawable-hdpi/ic_action_chat.png and /dev/null differ diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_refresh.png index 552a5d0c..cd16fdd5 100644 Binary files a/Clover/app/src/main/res/drawable-hdpi/ic_action_refresh.png and b/Clover/app/src/main/res/drawable-hdpi/ic_action_refresh.png differ diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_action_write.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_write.png new file mode 100644 index 00000000..3ee3e172 Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_action_write.png differ diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_chat.png deleted file mode 100644 index d3232818..00000000 Binary files a/Clover/app/src/main/res/drawable-mdpi/ic_action_chat.png and /dev/null differ diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_refresh.png index 30b172f7..235c84f1 100644 Binary files a/Clover/app/src/main/res/drawable-mdpi/ic_action_refresh.png and b/Clover/app/src/main/res/drawable-mdpi/ic_action_refresh.png differ diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_action_write.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_write.png new file mode 100644 index 00000000..85cff0b9 Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_action_write.png differ diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_chat.png deleted file mode 100644 index 09ef91dc..00000000 Binary files a/Clover/app/src/main/res/drawable-xhdpi/ic_action_chat.png and /dev/null differ diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_refresh.png index 6aa33d59..5f89fc25 100644 Binary files a/Clover/app/src/main/res/drawable-xhdpi/ic_action_refresh.png and b/Clover/app/src/main/res/drawable-xhdpi/ic_action_refresh.png differ diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_action_write.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_write.png new file mode 100644 index 00000000..7f0ea51b Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_action_write.png differ diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_chat.png deleted file mode 100644 index 7472f809..00000000 Binary files a/Clover/app/src/main/res/drawable-xxhdpi/ic_action_chat.png and /dev/null differ diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png index f5ed228f..72128fe6 100644 Binary files a/Clover/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png and b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png differ diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_action_write.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_write.png new file mode 100644 index 00000000..34ec7092 Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_write.png differ diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_action_refresh.png new file mode 100644 index 00000000..d271d8e0 Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_action_refresh.png differ diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_action_write.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_action_write.png new file mode 100644 index 00000000..9380370f Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_action_write.png differ diff --git a/Clover/app/src/main/res/layout/board_select_spinner.xml b/Clover/app/src/main/res/layout/board_select_spinner.xml index 303ad9ae..df8e04cd 100644 --- a/Clover/app/src/main/res/layout/board_select_spinner.xml +++ b/Clover/app/src/main/res/layout/board_select_spinner.xml @@ -22,7 +22,7 @@ along with this program. If not, see . android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="16sp" - android:textColor="#FFF3F3F3" + android:textColor="#ffffffff" android:gravity="center_vertical" android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" android:paddingRight="?android:attr/listPreferredItemPaddingRight" diff --git a/Clover/app/src/main/res/layout/board_select_spinner_dropdown.xml b/Clover/app/src/main/res/layout/board_select_spinner_dropdown.xml new file mode 100644 index 00000000..1ab963d9 --- /dev/null +++ b/Clover/app/src/main/res/layout/board_select_spinner_dropdown.xml @@ -0,0 +1,31 @@ + + + diff --git a/Clover/app/src/main/res/layout/toolbar.xml b/Clover/app/src/main/res/layout/toolbar.xml index 36580b19..b33b9d27 100644 --- a/Clover/app/src/main/res/layout/toolbar.xml +++ b/Clover/app/src/main/res/layout/toolbar.xml @@ -16,7 +16,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> + android:minHeight="?attr/actionBarSize" + android:background="?attr/colorPrimary" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> diff --git a/Clover/app/src/main/res/menu/base.xml b/Clover/app/src/main/res/menu/base.xml index f05d05dc..81cac650 100644 --- a/Clover/app/src/main/res/menu/base.xml +++ b/Clover/app/src/main/res/menu/base.xml @@ -15,12 +15,13 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . --> - + . android:id="@+id/action_reload_board" android:icon="@drawable/ic_action_refresh" android:orderInCategory="1" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/action_reload_board" /> . android:id="@+id/action_reload_thread" android:icon="@drawable/ic_action_refresh" android:orderInCategory="5" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_reload" /> . . android:id="@+id/action_share" android:actionProviderClass="android.widget.ShareActionProvider" android:orderInCategory="7" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_share" /> @@ -131,7 +132,7 @@ along with this program. If not, see .