[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SelectCategory and AddCategory activities refreshed #21

Merged
merged 13 commits into from
Jul 31, 2013
Merged

SelectCategory and AddCategory activities refreshed #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
37b2240
Replace category list in EditPost by category buttons
maxme Jul 25, 2013
0bc465c
New database version (v18) atlering categories table to add parent_id
maxme Jul 25, 2013
7ab5eb5
add new icon: level_indicator used in select category view
maxme Jul 25, 2013
2f36150
Refresh select category view.
maxme Jul 25, 2013
59aedee
Display category hierarchy in "parent" spinner of "AddCategory" view
maxme Jul 25, 2013
e89070e
New icons on delete and select category buttons
maxme Jul 25, 2013
d62b134
Remove "Selected Categories:" label
maxme Jul 25, 2013
5a3bb35
Remove useless import
maxme Jul 25, 2013
72af0f8
Reset _Uncategorized_ button padding
maxme Jul 26, 2013
470adde
make ic_level_indicator.png icon thinner
maxme Jul 26, 2013
d4bf822
fix #213: Adding a new category remove the selection on the categorie…
maxme Jul 26, 2013
5c7d537
Remove auto addition of special "Uncategorized" category
maxme Jul 26, 2013
d107cd7
Add a category label and change the "Category +" button behavior
maxme Jul 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add a category label and change the "Category +" button behavior
  • Loading branch information
@maxme
maxme committed Jul 29, 2013
commit d107cd74b138f31fecc0d9c0c56ac3d0e3ce6d46
8 changes: 8 additions & 0 deletions res/layout/edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,20 @@
android:hint="@string/tags_separate_with_commas"
android:inputType="textAutoCorrect" />

<TextView
android:id="@+id/categoryLabel"
style="@style/WordPressSubHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/category" />

</LinearLayout>

<org.wordpress.android.util.FlowLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" android:id="@+id/sectionCategories" android:paddingLeft="8dp">
</org.wordpress.android.util.FlowLayout>

<RelativeLayout
android:id="@+id/sectionLocation"
android:layout_width="fill_parent"
Expand Down
5 changes: 0 additions & 5 deletions src/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1362,11 +1362,6 @@ private void populateSelectedCategories() {

// Add select category button
Button selectCategory = (Button) layoutInflater.inflate(R.layout.category_select_button, null);
if (mCategories.size() == 0) {
selectCategory.setText(getResources().getText(R.string.category));
} else {
selectCategory.setText("");
}
selectCategory.setOnClickListener(this);
sectionCategories.addView(selectCategory);
}
Expand Down