iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implement publish with note

Browse Source
This commit is contained in:
Andrew Dolgov 2012-06-20 15:20:19 +04:00
parent b4b781209f
commit f532761611
5 changed files with 186 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
res/menu/headlines_menu.xml
View File

@ -1,39 +1,39 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item <item
android:id="@+id/selection_toggle_unread" android:id="@+id/selection_toggle_unread"
android:showAsAction="" android:showAsAction=""
android:title="@string/context_selection_toggle_unread"/> android:title="@string/context_selection_toggle_unread"/>
<item <item
android:id="@+id/selection_toggle_marked" android:id="@+id/selection_toggle_marked"
android:showAsAction="" android:showAsAction=""
android:title="@string/context_selection_toggle_marked"/> android:title="@string/context_selection_toggle_marked"/>
<item <item
android:id="@+id/selection_toggle_published" android:id="@+id/selection_toggle_published"
android:showAsAction="" android:showAsAction=""
android:title="@string/context_selection_toggle_published"/> android:title="@string/context_selection_toggle_published"/>
<group android:id="@+id/menu_group_single_article"> <group android:id="@+id/menu_group_single_article" >
<item
android:id="@+id/share_article"
android:showAsAction=""
android:title="@string/share_article"/>
<item <item
android:id="@+id/article_link_copy" android:id="@+id/share_article"
android:showAsAction="" android:showAsAction=""
android:title="@string/article_link_copy"/> android:title="@string/share_article"/>
<item
<item android:id="@+id/article_link_copy"
android:id="@+id/catchup_above" android:showAsAction=""
android:showAsAction="" android:title="@string/article_link_copy"/>
android:title="@string/article_mark_read_above"/> <item
android:id="@+id/catchup_above"
android:showAsAction=""
android:title="@string/article_mark_read_above"/>
<item
android:id="@+id/set_labels"
android:icon="@drawable/ic_menu_marked"
android:title="@string/article_set_labels"/>
<item
android:id="@+id/article_set_note"
android:showAsAction=""
android:title="@string/article_set_note"/>
</group> </group>
</menu> </menu>

5
res/menu/main_menu.xml
View File

@ -127,6 +127,11 @@
android:id="@+id/set_labels" android:id="@+id/set_labels"
android:icon="@drawable/ic_menu_marked" android:icon="@drawable/ic_menu_marked"
android:title="@string/article_set_labels"/> android:title="@string/article_set_labels"/>
<item
android:id="@+id/article_set_note"
android:showAsAction=""
android:title="@string/article_set_note"/>
</group> </group>
</group> </group>

1
res/values/strings.xml
View File

@ -118,4 +118,5 @@
<string name="dialog_offline_sync_in_progress">Offline sync in progress</string> <string name="dialog_offline_sync_in_progress">Offline sync in progress</string>
<string name="dialog_offline_sync_stop">Stop syncing</string> <string name="dialog_offline_sync_stop">Stop syncing</string>
<string name="dialog_offline_sync_continue">Continue</string> <string name="dialog_offline_sync_continue">Continue</string>
<string name="article_set_note">Publish with note</string>
</resources> </resources>

3
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -116,6 +116,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
menu.setGroupVisible(R.id.menu_group_single_article, true); menu.setGroupVisible(R.id.menu_group_single_article, true);
} }
menu.findItem(R.id.set_labels).setEnabled(m_onlineServices.getApiLevel() >= 1);
menu.findItem(R.id.article_set_note).setEnabled(m_onlineServices.getApiLevel() >= 1);
super.onCreateContextMenu(menu, v, menuInfo); super.onCreateContextMenu(menu, v, menuInfo);
} }

222
src/org/fox/ttrss/MainActivity.java
View File

@ -247,6 +247,24 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
req.execute(map); req.execute(map);
} }
@SuppressWarnings({ "unchecked", "serial" })
public void saveArticleNote(final Article article, final String note) {
ApiRequest req = new ApiRequest(getApplicationContext());
HashMap<String, String> map = new HashMap<String, String>() {
{
put("sid", m_sessionId);
put("op", "updateArticle");
put("article_ids", String.valueOf(article.id));
put("mode", "1");
put("data", note);
put("field", "3");
}
};
req.execute(map);
}
public static String articlesToIdString(ArticleList articles) { public static String articlesToIdString(ArticleList articles) {
String tmp = ""; String tmp = "";
@ -936,6 +954,11 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
case R.id.go_offline: case R.id.go_offline:
switchOffline(); switchOffline();
return true; return true;
case R.id.article_set_note:
if (m_selectedArticle != null) {
editArticleNote(m_selectedArticle);
}
return true;
case R.id.headlines_select: case R.id.headlines_select:
if (hf != null) { if (hf != null) {
Dialog dialog = new Dialog(this); Dialog dialog = new Dialog(this);
@ -1095,74 +1118,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
return true; return true;
case R.id.set_labels: case R.id.set_labels:
if (m_selectedArticle != null) { if (m_selectedArticle != null) {
editArticleLabels(m_selectedArticle);
ApiRequest req = new ApiRequest(getApplicationContext()) {
@Override
protected void onPostExecute(JsonElement result) {
if (result != null) {
Type listType = new TypeToken<List<Label>>() {}.getType();
final List<Label> labels = new Gson().fromJson(result, listType);
CharSequence[] items = new CharSequence[labels.size()];
final int[] itemIds = new int[labels.size()];
boolean[] checkedItems = new boolean[labels.size()];
for (int i = 0; i < labels.size(); i++) {
items[i] = labels.get(i).caption;
itemIds[i] = labels.get(i).id;
checkedItems[i] = labels.get(i).checked;
}
Dialog dialog = new Dialog(MainActivity.this);
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.article_set_labels)
.setMultiChoiceItems(items, checkedItems, new OnMultiChoiceClickListener() {
@Override
public void onClick(DialogInterface dialog, int which, final boolean isChecked) {
final int labelId = itemIds[which];
@SuppressWarnings("serial")
HashMap<String, String> map = new HashMap<String, String>() {
{
put("sid", m_sessionId);
put("op", "setArticleLabel");
put("label_id", String.valueOf(labelId));
put("article_ids", String.valueOf(m_selectedArticle.id));
if (isChecked) put("assign", "true");
}
};
ApiRequest req = new ApiRequest(m_context);
req.execute(map);
}
}).setPositiveButton(R.string.dialog_close, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.cancel();
}
});
dialog = builder.create();
dialog.show();
}
}
};
@SuppressWarnings("serial")
HashMap<String, String> map = new HashMap<String, String>() {
{
put("sid", m_sessionId);
put("op", "getLabels");
put("article_id", String.valueOf(m_selectedArticle.id));
}
};
req.execute(map);
} }
return true; return true;
default: default:
@ -1172,6 +1128,105 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
} }
} }
private void editArticleNote(final Article article) {
String note = "";
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(article.title);
final EditText topicEdit = new EditText(this);
topicEdit.setText(note);
builder.setView(topicEdit);
builder.setPositiveButton(R.string.article_set_note, new Dialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
saveArticleNote(article, topicEdit.getText().toString().trim());
article.published = true;
saveArticlePublished(article);
updateHeadlines();
}
});
builder.setNegativeButton(R.string.dialog_cancel, new Dialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
//
}
});
AlertDialog dialog = builder.create();
dialog.show();
}
private void editArticleLabels(Article article) {
final int articleId = article.id;
ApiRequest req = new ApiRequest(getApplicationContext()) {
@Override
protected void onPostExecute(JsonElement result) {
if (result != null) {
Type listType = new TypeToken<List<Label>>() {}.getType();
final List<Label> labels = new Gson().fromJson(result, listType);
CharSequence[] items = new CharSequence[labels.size()];
final int[] itemIds = new int[labels.size()];
boolean[] checkedItems = new boolean[labels.size()];
for (int i = 0; i < labels.size(); i++) {
items[i] = labels.get(i).caption;
itemIds[i] = labels.get(i).id;
checkedItems[i] = labels.get(i).checked;
}
Dialog dialog = new Dialog(MainActivity.this);
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.article_set_labels)
.setMultiChoiceItems(items, checkedItems, new OnMultiChoiceClickListener() {
@Override
public void onClick(DialogInterface dialog, int which, final boolean isChecked) {
final int labelId = itemIds[which];
@SuppressWarnings("serial")
HashMap<String, String> map = new HashMap<String, String>() {
{
put("sid", m_sessionId);
put("op", "setArticleLabel");
put("label_id", String.valueOf(labelId));
put("article_ids", String.valueOf(articleId));
if (isChecked) put("assign", "true");
}
};
ApiRequest req = new ApiRequest(m_context);
req.execute(map);
}
}).setPositiveButton(R.string.dialog_close, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.cancel();
}
});
dialog = builder.create();
dialog.show();
}
}
};
@SuppressWarnings("serial")
HashMap<String, String> map = new HashMap<String, String>() {
{
put("sid", m_sessionId);
put("op", "getLabels");
put("article_id", String.valueOf(articleId));
}
};
req.execute(map);
}
private Intent getShareIntent(Article article) { private Intent getShareIntent(Article article) {
Intent intent = new Intent(Intent.ACTION_SEND); Intent intent = new Intent(Intent.ACTION_SEND);
@ -1317,6 +1372,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
} }
m_menu.findItem(R.id.set_labels).setEnabled(m_apiLevel >= 1); m_menu.findItem(R.id.set_labels).setEnabled(m_apiLevel >= 1);
m_menu.findItem(R.id.article_set_note).setEnabled(m_apiLevel >= 1);
m_menu.findItem(R.id.donate).setVisible(BillingHelper.isBillingSupported()); m_menu.findItem(R.id.donate).setVisible(BillingHelper.isBillingSupported());
@ -1745,6 +1801,36 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
shareArticle(m_selectedArticle); shareArticle(m_selectedArticle);
} }
return true; return true;
case R.id.set_labels:
if (true) {
Article article = null;
if (m_selectedArticle != null) {
article = m_selectedArticle;
} else if (info != null) {
article = hf.getArticleAtPosition(info.position);
}
if (article != null) {
editArticleLabels(article);
}
}
return true;
case R.id.article_set_note:
if (true) {
Article article = null;
if (m_selectedArticle != null) {
article = m_selectedArticle;
} else if (info != null) {
article = hf.getArticleAtPosition(info.position);
}
if (article != null) {
editArticleNote(article);
}
}
return true;
case R.id.browse_articles: case R.id.browse_articles:
if (cf != null) { if (cf != null) {
FeedCategory cat = cf.getCategoryAtPosition(info.position); FeedCategory cat = cf.getCategoryAtPosition(info.position);