Compare commits

..

No commits in common. "fff0bde9d8304d3e3d59191283be9e74aa51e992" and "d1263b46b62cb8d373da8f40d9554f2652f6548c" have entirely different histories.

2 changed files with 10 additions and 8 deletions

View File

@ -9,6 +9,7 @@ import com.jens.automation2.R.layout;
public class ActivityHelp extends Activity public class ActivityHelp extends Activity
{ {
@Override @Override
protected void onCreate(Bundle savedInstanceState) protected void onCreate(Bundle savedInstanceState)
{ {
@ -18,4 +19,5 @@ public class ActivityHelp extends Activity
TextView tvHelpTextEnergySaving = (TextView) findViewById(R.id.tvHelpTextEnergySaving); TextView tvHelpTextEnergySaving = (TextView) findViewById(R.id.tvHelpTextEnergySaving);
tvHelpTextEnergySaving.setMovementMethod(LinkMovementMethod.getInstance()); tvHelpTextEnergySaving.setMovementMethod(LinkMovementMethod.getInstance());
} }
} }

View File

@ -23,7 +23,7 @@ import java.util.Map;
public class News public class News
{ {
Calendar publishDate; Calendar publishDate;
String applicablePlatform; String applicablePlattform;
Map<String,NewsTranslation> translations = new HashMap<>(); Map<String,NewsTranslation> translations = new HashMap<>();
public static class NewsTranslation public static class NewsTranslation
@ -151,9 +151,9 @@ public class News
String publishDateString = neEl.getElementsByTagName("publishDate").item(0).getTextContent(); String publishDateString = neEl.getElementsByTagName("publishDate").item(0).getTextContent();
newsEntry.setPublishDate(Miscellaneous.calendarFromLong(Long.parseLong(publishDateString) * 1000)); newsEntry.setPublishDate(Miscellaneous.calendarFromLong(Long.parseLong(publishDateString) * 1000));
newsEntry.setApplicablePlatform(neEl.getElementsByTagName("applicablePlattforms").item(0).getTextContent()); newsEntry.setApplicablePlattform(neEl.getElementsByTagName("applicablePlattforms").item(0).getTextContent());
if(newsEntry.getApplicablePlatform().equalsIgnoreCase("all") || newsEntry.getApplicablePlatform().equalsIgnoreCase(BuildConfig.FLAVOR)) if(newsEntry.getApplicablePlattform().equalsIgnoreCase("all") || newsEntry.getApplicablePlattform().equalsIgnoreCase(BuildConfig.FLAVOR))
returnList.add(newsEntry); returnList.add(newsEntry);
} }
} }
@ -199,14 +199,14 @@ public class News
this.publishDate = publishDate; this.publishDate = publishDate;
} }
public String getApplicablePlatform() public String getApplicablePlattform()
{ {
return applicablePlatform; return applicablePlattform;
} }
public void setApplicablePlatform(String applicablePlatform) public void setApplicablePlattform(String applicablePlattform)
{ {
this.applicablePlatform = applicablePlatform; this.applicablePlattform = applicablePlattform;
} }
@NonNull @NonNull