SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove [] formatting (#353)

This commit is contained in:
primaeval 2017-02-20 20:05:49 +01:00 committed by Synced Synapse
parent 58e205272f
commit 668feb1355
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/xbmc/kore/jsonrpc/method/Files.java
View File

@ -157,6 +157,12 @@ public class Files {
ArrayNode items = (ArrayNode) fileNode; ArrayNode items = (ArrayNode) fileNode;
ArrayList<ListType.ItemFile> result = new ArrayList<ListType.ItemFile>(items.size()); ArrayList<ListType.ItemFile> result = new ArrayList<ListType.ItemFile>(items.size());
for (JsonNode item : items) { for (JsonNode item : items) {
String regex = "\\[.*?\\]";
JsonNode label = item.get("label");
if (!label.isNull()) {
String new_label = label.textValue().replaceAll(regex, "");
((ObjectNode) item).put("label", new_label);
}
result.add(new ListType.ItemFile(item)); result.add(new ListType.ItemFile(item));
} }
return result; return result;

8
app/src/main/java/org/xbmc/kore/jsonrpc/type/AddonType.java
View File

@ -103,16 +103,16 @@ public class AddonType {
public static final String VERSION = "version"; public static final String VERSION = "version";
public final String addonid; public final String addonid;
public final String author; public String author;
public final boolean broken; public final boolean broken;
public final String description; public String description;
public final String disclaimer; public final String disclaimer;
public final Boolean enabled; public final Boolean enabled;
public final String fanart; public final String fanart;
public final String name; public String name;
public final String path; public final String path;
public final int rating; public final int rating;
public final String summary; public String summary;
public final String thumbnail; public final String thumbnail;
public final String type; public final String type;
public final String version; public final String version;

18
app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java
View File

@ -42,6 +42,8 @@ import org.xbmc.kore.utils.LogUtils;
import org.xbmc.kore.utils.UIUtils; import org.xbmc.kore.utils.UIUtils;
import org.xbmc.kore.utils.Utils; import org.xbmc.kore.utils.Utils;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -167,7 +169,12 @@ public class AddonListFragment extends Fragment
.show(); .show();
} }
} }
public class AddonNameComparator implements Comparator<AddonType.Details>
{
public int compare(AddonType.Details left, AddonType.Details right) {
return left.name.toLowerCase().compareTo(right.name.toLowerCase());
}
}
/** /**
* Get the addons list and setup the gridview * Get the addons list and setup the gridview
*/ */
@ -186,7 +193,14 @@ public class AddonListFragment extends Fragment
@Override @Override
public void onSuccess(List<AddonType.Details> result) { public void onSuccess(List<AddonType.Details> result) {
if (!isAdded()) return; if (!isAdded()) return;
for (AddonType.Details addon : result) {
String regex = "\\[.*?\\]";
addon.name = addon.name.replaceAll(regex, "");
addon.description = addon.description.replaceAll(regex, "");
addon.summary = addon.summary.replaceAll(regex, "");
addon.author = addon.author.replaceAll(regex, "");
}
Collections.sort(result, new AddonNameComparator());
adapter.clear(); adapter.clear();
for (AddonType.Details addon : result) { for (AddonType.Details addon : result) {
if (addon.type.equals(AddonType.Types.UNKNOWN) || if (addon.type.equals(AddonType.Types.UNKNOWN) ||