LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.0: adjusted display feed logic for news articles

Browse Source
This commit is contained in:
Evan Debenham 2020-10-03 00:16:19 -04:00
parent e2a7bea5e6
commit 77bcde9ed6
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java
View File

@ -83,7 +83,7 @@ public class NewsScene extends PixelScene {
align(title); align(title);
add(title); add(title);
float top = 20; float top = 18;
displayingNoArticles = !News.articlesAvailable(); displayingNoArticles = !News.articlesAvailable();
if (displayingNoArticles || Messages.lang() != Languages.ENGLISH) { if (displayingNoArticles || Messages.lang() != Languages.ENGLISH) {
@ -106,7 +106,7 @@ public class NewsScene extends PixelScene {
} }
rows++; rows++;
while ((articleSpace) / (BTN_HEIGHT+1) < rows) { while ((articleSpace) / (BTN_HEIGHT+0.5f) < rows) {
articles.remove(articles.size() - 1); articles.remove(articles.size() - 1);
if (PixelScene.landscape()) { if (PixelScene.landscape()) {
articles.remove(articles.size() - 1); articles.remove(articles.size() - 1);

22
services/news/shatteredNews/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/ShatteredNews.java
View File

@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.services.news;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Net; import com.badlogic.gdx.Net;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.XmlReader; import com.badlogic.gdx.utils.XmlReader;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
@ -30,6 +31,8 @@ import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ShatteredNews extends NewsService { public class ShatteredNews extends NewsService {
@ -43,9 +46,9 @@ public class ShatteredNews extends NewsService {
Net.HttpRequest httpGet = new Net.HttpRequest(Net.HttpMethods.GET); Net.HttpRequest httpGet = new Net.HttpRequest(Net.HttpMethods.GET);
if (preferHTTPS) { if (preferHTTPS) {
httpGet.setUrl("https://shatteredpixel.com/feed"); httpGet.setUrl("https://shatteredpixel.com/feed_by_tag/SHPD_INGAME.xml");
} else { } else {
httpGet.setUrl("http://shatteredpixel.com/feed"); httpGet.setUrl("http://shatteredpixel.com/feed_by_tag/SHPD_INGAME.xml");
} }
Gdx.net.sendHttpRequest(httpGet, new Net.HttpResponseListener() { Gdx.net.sendHttpRequest(httpGet, new Net.HttpResponseListener() {
@ -71,8 +74,21 @@ public class ShatteredNews extends NewsService {
article.URL = article.URL.replace("https://", "http://"); article.URL = article.URL.replace("https://", "http://");
} }
Pattern versionCodeMatcher = Pattern.compile("v[0-9]+");
try { try {
article.icon = xmlArticle.getChildByName("category").getAttribute("term"); Array<XmlReader.Element> properties = xmlArticle.getChildrenByName("category");
for (XmlReader.Element prop : properties){
String propVal = prop.getAttribute("term");
if (propVal.startsWith("SHPD_ICON")){
Matcher m = versionCodeMatcher.matcher(propVal);
if (m.find()) {
int iconGameVer = Integer.parseInt(m.group().substring(1));
if (iconGameVer <= Game.versionCode) {
article.icon = propVal.substring(propVal.indexOf(": ") + 2);
}
}
}
}
} catch (Exception e){ } catch (Exception e){
article.icon = null; article.icon = null;
} }