vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-25 15:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android: use GET /tag/list instead of /tag/stats

Browse Source
This commit is contained in:
jendib 2016-05-11 00:55:27 +02:00
parent e181b7d24b
commit a13174ac4d
No known key found for this signature in database
GPG Key ID: 06EE7F699579166F
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs-android/app/src/main/java/com/sismics/docs/activity/MainActivity.java
View File

@ -87,13 +87,13 @@ public class MainActivity extends AppCompatActivity {
tagListView.setEmptyView(tagProgressView); tagListView.setEmptyView(tagProgressView);
JSONObject cacheTags = PreferenceUtil.getCachedJson(this, PreferenceUtil.PREF_CACHED_TAGS_JSON); JSONObject cacheTags = PreferenceUtil.getCachedJson(this, PreferenceUtil.PREF_CACHED_TAGS_JSON);
if (cacheTags != null) { if (cacheTags != null) {
tagListView.setAdapter(new TagListAdapter(cacheTags.optJSONArray("stats"))); tagListView.setAdapter(new TagListAdapter(cacheTags.optJSONArray("tags")));
} }
TagResource.stats(this, new HttpCallback() { TagResource.list(this, new HttpCallback() {
@Override @Override
public void onSuccess(JSONObject response) { public void onSuccess(JSONObject response) {
PreferenceUtil.setCachedJson(MainActivity.this, PreferenceUtil.PREF_CACHED_TAGS_JSON, response); PreferenceUtil.setCachedJson(MainActivity.this, PreferenceUtil.PREF_CACHED_TAGS_JSON, response);
tagListView.setAdapter(new TagListAdapter(response.optJSONArray("stats"))); tagListView.setAdapter(new TagListAdapter(response.optJSONArray("tags")));
tagProgressView.setVisibility(View.GONE); tagProgressView.setVisibility(View.GONE);
tagListView.setEmptyView(tagEmptyView); tagListView.setEmptyView(tagEmptyView);
} }

8
docs-android/app/src/main/java/com/sismics/docs/adapter/TagListAdapter.java
View File

@ -46,7 +46,7 @@ public class TagListAdapter extends BaseAdapter {
// Reorder tags by parent/child relation and compute depth // Reorder tags by parent/child relation and compute depth
int depth = 0; int depth = 0;
initTags(tags, JSONObject.NULL.toString(), depth); initTags(tags, "", depth);
} }
/** /**
@ -60,11 +60,10 @@ public class TagListAdapter extends BaseAdapter {
// Get all tags with this parent // Get all tags with this parent
for (JSONObject tag : tags) { for (JSONObject tag : tags) {
String tagParentId = tag.optString("parent"); String tagParentId = tag.optString("parent");
if (tagParentId.equals(parentId)) { if (parentId.equals(tagParentId)) {
TagItem tagItem = new TagItem(); TagItem tagItem = new TagItem();
tagItem.id = tag.optString("id"); tagItem.id = tag.optString("id");
tagItem.name = tag.optString("name"); tagItem.name = tag.optString("name");
tagItem.count = tag.optInt("count");
tagItem.color = tag.optString("color"); tagItem.color = tag.optString("color");
tagItem.depth = depth; tagItem.depth = depth;
tagItemList.add(tagItem); tagItemList.add(tagItem);
@ -99,8 +98,6 @@ public class TagListAdapter extends BaseAdapter {
TagItem tagItem = getItem(position); TagItem tagItem = getItem(position);
TextView tagTextView = (TextView) view.findViewById(R.id.tagTextView); TextView tagTextView = (TextView) view.findViewById(R.id.tagTextView);
tagTextView.setText(tagItem.name); tagTextView.setText(tagItem.name);
TextView tagCountTextView = (TextView) view.findViewById(R.id.tagCountTextView);
tagCountTextView.setText(String.format(Locale.ENGLISH, "%d", tagItem.count));
// Label color filtering // Label color filtering
ImageView labelImageView = (ImageView) view.findViewById(R.id.labelImageView); ImageView labelImageView = (ImageView) view.findViewById(R.id.labelImageView);
@ -125,7 +122,6 @@ public class TagListAdapter extends BaseAdapter {
public static class TagItem { public static class TagItem {
private String id; private String id;
private String name; private String name;
private int count;
private String color; private String color;
private int depth; private int depth;

6
docs-android/app/src/main/java/com/sismics/docs/resource/TagResource.java
View File

@ -16,14 +16,14 @@ import okhttp3.Request;
*/ */
public class TagResource extends BaseResource { public class TagResource extends BaseResource {
/** /**
* GET /tag/stats. * GET /tag/list.
* *
* @param context Context * @param context Context
* @param callback Callback * @param callback Callback
*/ */
public static void stats(Context context, HttpCallback callback) { public static void list(Context context, HttpCallback callback) {
Request request = new Request.Builder() Request request = new Request.Builder()
.url(HttpUrl.parse(getApiUrl(context) + "/tag/stats")) .url(HttpUrl.parse(getApiUrl(context) + "/tag/list"))
.get() .get()
.build(); .build();
OkHttpUtil.buildClient(context) OkHttpUtil.buildClient(context)

12
docs-android/app/src/main/res/layout/tag_list_item.xml
View File

@ -29,16 +29,4 @@
android:text="Appartement" android:text="Appartement"
android:textSize="14sp"/> android:textSize="14sp"/>
<TextView
android:id="@+id/tagCountTextView"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:textColor="#888"
android:text="5"
android:textSize="14sp"/>
</RelativeLayout> </RelativeLayout>