2 Achegas 020a1fb9ab ... b726e8bfba

Autor SHA1 Mensaxe Data
  Infinite b726e8bfba Fix individual post loading %!s(int64=2) %!d(string=hai) anos
  Infinite 49c9c6f82b Fix posts loading %!s(int64=2) %!d(string=hai) anos

+ 1 - 1
.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>

+ 1 - 1
.idea/misc.xml

@@ -57,7 +57,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 102 - 10
app/src/main/java/club/thepenguins/android/data/IndividualPost.java

@@ -70,16 +70,28 @@ public class IndividualPost {
     private String format;
     @SerializedName("meta")
     @Expose
-    private List<Object> meta = null;
+    private Meta meta;
     @SerializedName("categories")
     @Expose
     private List<Integer> categories = null;
     @SerializedName("tags")
     @Expose
     private List<Integer> tags = null;
-    @SerializedName("yoast_head")
+    @SerializedName("acf")
     @Expose
-    private String yoastHead;
+    private List<Object> acf = null;
+    @SerializedName("jetpack_featured_media_url")
+    @Expose
+    private String jetpackFeaturedMediaUrl;
+    @SerializedName("jetpack_publicize_connections")
+    @Expose
+    private List<Object> jetpackPublicizeConnections = null;
+    @SerializedName("jetpack_sharing_enabled")
+    @Expose
+    private Boolean jetpackSharingEnabled;
+    @SerializedName("jetpack_likes_enabled")
+    @Expose
+    private Boolean jetpackLikesEnabled;
     @SerializedName("_links")
     @Expose
     private Links links;
@@ -244,11 +256,11 @@ public class IndividualPost {
         this.format = format;
     }
 
-    public List<Object> getMeta() {
+    public Meta getMeta() {
         return meta;
     }
 
-    public void setMeta(List<Object> meta) {
+    public void setMeta(Meta meta) {
         this.meta = meta;
     }
 
@@ -268,12 +280,44 @@ public class IndividualPost {
         this.tags = tags;
     }
 
-    public String getYoastHead() {
-        return yoastHead;
+    public List<Object> getAcf() {
+        return acf;
+    }
+
+    public void setAcf(List<Object> acf) {
+        this.acf = acf;
+    }
+
+    public String getJetpackFeaturedMediaUrl() {
+        return jetpackFeaturedMediaUrl;
+    }
+
+    public void setJetpackFeaturedMediaUrl(String jetpackFeaturedMediaUrl) {
+        this.jetpackFeaturedMediaUrl = jetpackFeaturedMediaUrl;
+    }
+
+    public List<Object> getJetpackPublicizeConnections() {
+        return jetpackPublicizeConnections;
     }
 
-    public void setYoastHead(String yoastHead) {
-        this.yoastHead = yoastHead;
+    public void setJetpackPublicizeConnections(List<Object> jetpackPublicizeConnections) {
+        this.jetpackPublicizeConnections = jetpackPublicizeConnections;
+    }
+
+    public Boolean getJetpackSharingEnabled() {
+        return jetpackSharingEnabled;
+    }
+
+    public void setJetpackSharingEnabled(Boolean jetpackSharingEnabled) {
+        this.jetpackSharingEnabled = jetpackSharingEnabled;
+    }
+
+    public Boolean getJetpackLikesEnabled() {
+        return jetpackLikesEnabled;
+    }
+
+    public void setJetpackLikesEnabled(Boolean jetpackLikesEnabled) {
+        this.jetpackLikesEnabled = jetpackLikesEnabled;
     }
 
     public Links getLinks() {
@@ -284,7 +328,6 @@ public class IndividualPost {
         this.links = links;
     }
 
-
     public class About {
 
         @SerializedName("href")
@@ -579,6 +622,55 @@ public class IndividualPost {
 
     }
 
+    public class Meta {
+
+        @SerializedName("spay_email")
+        @Expose
+        private String spayEmail;
+        @SerializedName("jetpack_publicize_message")
+        @Expose
+        private String jetpackPublicizeMessage;
+        @SerializedName("jetpack_is_tweetstorm")
+        @Expose
+        private Boolean jetpackIsTweetstorm;
+        @SerializedName("jetpack_publicize_feature_enabled")
+        @Expose
+        private Boolean jetpackPublicizeFeatureEnabled;
+
+        public String getSpayEmail() {
+            return spayEmail;
+        }
+
+        public void setSpayEmail(String spayEmail) {
+            this.spayEmail = spayEmail;
+        }
+
+        public String getJetpackPublicizeMessage() {
+            return jetpackPublicizeMessage;
+        }
+
+        public void setJetpackPublicizeMessage(String jetpackPublicizeMessage) {
+            this.jetpackPublicizeMessage = jetpackPublicizeMessage;
+        }
+
+        public Boolean getJetpackIsTweetstorm() {
+            return jetpackIsTweetstorm;
+        }
+
+        public void setJetpackIsTweetstorm(Boolean jetpackIsTweetstorm) {
+            this.jetpackIsTweetstorm = jetpackIsTweetstorm;
+        }
+
+        public Boolean getJetpackPublicizeFeatureEnabled() {
+            return jetpackPublicizeFeatureEnabled;
+        }
+
+        public void setJetpackPublicizeFeatureEnabled(Boolean jetpackPublicizeFeatureEnabled) {
+            this.jetpackPublicizeFeatureEnabled = jetpackPublicizeFeatureEnabled;
+        }
+
+    }
+
     public class PredecessorVersion {
 
         @SerializedName("id")

+ 204 - 45
app/src/main/java/club/thepenguins/android/data/Posts.java

@@ -74,13 +74,28 @@ public class Posts {
     private String format;
     @SerializedName("meta")
     @Expose
-    private List<Object> meta = null;
+    private Meta meta;
     @SerializedName("categories")
     @Expose
     private List<Integer> categories = null;
     @SerializedName("tags")
     @Expose
-    private List<Object> tags = null;
+    private List<Integer> tags = null;
+    @SerializedName("acf")
+    @Expose
+    private List<Object> acf = null;
+    @SerializedName("jetpack_featured_media_url")
+    @Expose
+    private String jetpackFeaturedMediaUrl;
+    @SerializedName("jetpack_publicize_connections")
+    @Expose
+    private List<Object> jetpackPublicizeConnections = null;
+    @SerializedName("jetpack_sharing_enabled")
+    @Expose
+    private Boolean jetpackSharingEnabled;
+    @SerializedName("jetpack_likes_enabled")
+    @Expose
+    private Boolean jetpackLikesEnabled;
     @SerializedName("_links")
     @Expose
     private Links links;
@@ -248,11 +263,11 @@ public class Posts {
         this.format = format;
     }
 
-    public List<Object> getMeta() {
+    public Meta getMeta() {
         return meta;
     }
 
-    public void setMeta(List<Object> meta) {
+    public void setMeta(Meta meta) {
         this.meta = meta;
     }
 
@@ -264,14 +279,54 @@ public class Posts {
         this.categories = categories;
     }
 
-    public List<Object> getTags() {
+    public List<Integer> getTags() {
         return tags;
     }
 
-    public void setTags(List<Object> tags) {
+    public void setTags(List<Integer> tags) {
         this.tags = tags;
     }
 
+    public List<Object> getAcf() {
+        return acf;
+    }
+
+    public void setAcf(List<Object> acf) {
+        this.acf = acf;
+    }
+
+    public String getJetpackFeaturedMediaUrl() {
+        return jetpackFeaturedMediaUrl;
+    }
+
+    public void setJetpackFeaturedMediaUrl(String jetpackFeaturedMediaUrl) {
+        this.jetpackFeaturedMediaUrl = jetpackFeaturedMediaUrl;
+    }
+
+    public List<Object> getJetpackPublicizeConnections() {
+        return jetpackPublicizeConnections;
+    }
+
+    public void setJetpackPublicizeConnections(List<Object> jetpackPublicizeConnections) {
+        this.jetpackPublicizeConnections = jetpackPublicizeConnections;
+    }
+
+    public Boolean getJetpackSharingEnabled() {
+        return jetpackSharingEnabled;
+    }
+
+    public void setJetpackSharingEnabled(Boolean jetpackSharingEnabled) {
+        this.jetpackSharingEnabled = jetpackSharingEnabled;
+    }
+
+    public Boolean getJetpackLikesEnabled() {
+        return jetpackLikesEnabled;
+    }
+
+    public void setJetpackLikesEnabled(Boolean jetpackLikesEnabled) {
+        this.jetpackLikesEnabled = jetpackLikesEnabled;
+    }
+
     public Links getLinks() {
         return links;
     }
@@ -387,6 +442,9 @@ public class Posts {
         @SerializedName("avatar_urls")
         @Expose
         private AvatarUrls avatarUrls;
+        @SerializedName("acf")
+        @Expose
+        private List<Object> acf = null;
         @SerializedName("_links")
         @Expose
         private Links__1 links;
@@ -447,6 +505,14 @@ public class Posts {
             this.avatarUrls = avatarUrls;
         }
 
+        public List<Object> getAcf() {
+            return acf;
+        }
+
+        public void setAcf(List<Object> acf) {
+            this.acf = acf;
+        }
+
         public Links__1 getLinks() {
             return links;
         }
@@ -743,7 +809,6 @@ public class Posts {
 
     }
 
-
     public class Excerpt {
 
         @SerializedName("rendered")
@@ -1004,6 +1069,9 @@ public class Posts {
         @SerializedName("version-history")
         @Expose
         private List<VersionHistory> versionHistory = null;
+        @SerializedName("predecessor-version")
+        @Expose
+        private List<PredecessorVersion> predecessorVersion = null;
         @SerializedName("wp:featuredmedia")
         @Expose
         private List<WpFeaturedmedium> wpFeaturedmedia = null;
@@ -1065,6 +1133,14 @@ public class Posts {
             this.versionHistory = versionHistory;
         }
 
+        public List<PredecessorVersion> getPredecessorVersion() {
+            return predecessorVersion;
+        }
+
+        public void setPredecessorVersion(List<PredecessorVersion> predecessorVersion) {
+            this.predecessorVersion = predecessorVersion;
+        }
+
         public List<WpFeaturedmedium> getWpFeaturedmedia() {
             return wpFeaturedmedia;
         }
@@ -1203,9 +1279,6 @@ public class Posts {
         @SerializedName("curies")
         @Expose
         private List<Cury__1> curies = null;
-        @SerializedName("up")
-        @Expose
-        private List<Up> up = null;
 
         public List<Self__3> getSelf() {
             return self;
@@ -1247,14 +1320,6 @@ public class Posts {
             this.curies = curies;
         }
 
-        public List<Up> getUp() {
-            return up;
-        }
-
-        public void setUp(List<Up> up) {
-            this.up = up;
-        }
-
     }
 
     public class MediaDetails {
@@ -1377,6 +1442,83 @@ public class Posts {
 
     }
 
+    public class Meta {
+
+        @SerializedName("spay_email")
+        @Expose
+        private String spayEmail;
+        @SerializedName("jetpack_publicize_message")
+        @Expose
+        private String jetpackPublicizeMessage;
+        @SerializedName("jetpack_is_tweetstorm")
+        @Expose
+        private Boolean jetpackIsTweetstorm;
+        @SerializedName("jetpack_publicize_feature_enabled")
+        @Expose
+        private Boolean jetpackPublicizeFeatureEnabled;
+
+        public String getSpayEmail() {
+            return spayEmail;
+        }
+
+        public void setSpayEmail(String spayEmail) {
+            this.spayEmail = spayEmail;
+        }
+
+        public String getJetpackPublicizeMessage() {
+            return jetpackPublicizeMessage;
+        }
+
+        public void setJetpackPublicizeMessage(String jetpackPublicizeMessage) {
+            this.jetpackPublicizeMessage = jetpackPublicizeMessage;
+        }
+
+        public Boolean getJetpackIsTweetstorm() {
+            return jetpackIsTweetstorm;
+        }
+
+        public void setJetpackIsTweetstorm(Boolean jetpackIsTweetstorm) {
+            this.jetpackIsTweetstorm = jetpackIsTweetstorm;
+        }
+
+        public Boolean getJetpackPublicizeFeatureEnabled() {
+            return jetpackPublicizeFeatureEnabled;
+        }
+
+        public void setJetpackPublicizeFeatureEnabled(Boolean jetpackPublicizeFeatureEnabled) {
+            this.jetpackPublicizeFeatureEnabled = jetpackPublicizeFeatureEnabled;
+        }
+
+    }
+
+
+    public class PredecessorVersion {
+
+        @SerializedName("id")
+        @Expose
+        private Integer id;
+        @SerializedName("href")
+        @Expose
+        private String href;
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+        public String getHref() {
+            return href;
+        }
+
+        public void setHref(String href) {
+            this.href = href;
+        }
+
+    }
+
     public class Reply {
 
         @SerializedName("embeddable")
@@ -1625,33 +1767,6 @@ public class Posts {
 
     }
 
-    public class Up {
-
-        @SerializedName("embeddable")
-        @Expose
-        private Boolean embeddable;
-        @SerializedName("href")
-        @Expose
-        private String href;
-
-        public Boolean getEmbeddable() {
-            return embeddable;
-        }
-
-        public void setEmbeddable(Boolean embeddable) {
-            this.embeddable = embeddable;
-        }
-
-        public String getHref() {
-            return href;
-        }
-
-        public void setHref(String href) {
-            this.href = href;
-        }
-
-    }
-
     public class VersionHistory {
 
         @SerializedName("count")
@@ -1745,6 +1860,15 @@ public class Posts {
         @SerializedName("author")
         @Expose
         private Integer author;
+        @SerializedName("jetpack_sharing_enabled")
+        @Expose
+        private Boolean jetpackSharingEnabled;
+        @SerializedName("jetpack_likes_enabled")
+        @Expose
+        private Boolean jetpackLikesEnabled;
+        @SerializedName("acf")
+        @Expose
+        private List<Object> acf = null;
         @SerializedName("caption")
         @Expose
         private Caption caption;
@@ -1823,6 +1947,30 @@ public class Posts {
             this.author = author;
         }
 
+        public Boolean getJetpackSharingEnabled() {
+            return jetpackSharingEnabled;
+        }
+
+        public void setJetpackSharingEnabled(Boolean jetpackSharingEnabled) {
+            this.jetpackSharingEnabled = jetpackSharingEnabled;
+        }
+
+        public Boolean getJetpackLikesEnabled() {
+            return jetpackLikesEnabled;
+        }
+
+        public void setJetpackLikesEnabled(Boolean jetpackLikesEnabled) {
+            this.jetpackLikesEnabled = jetpackLikesEnabled;
+        }
+
+        public List<Object> getAcf() {
+            return acf;
+        }
+
+        public void setAcf(List<Object> acf) {
+            this.acf = acf;
+        }
+
         public Caption getCaption() {
             return caption;
         }
@@ -1952,6 +2100,9 @@ public class Posts {
         @SerializedName("taxonomy")
         @Expose
         private String taxonomy;
+        @SerializedName("acf")
+        @Expose
+        private List<Object> acf = null;
         @SerializedName("_links")
         @Expose
         private Links__3 links;
@@ -1996,6 +2147,14 @@ public class Posts {
             this.taxonomy = taxonomy;
         }
 
+        public List<Object> getAcf() {
+            return acf;
+        }
+
+        public void setAcf(List<Object> acf) {
+            this.acf = acf;
+        }
+
         public Links__3 getLinks() {
             return links;
         }