diff --git a/README.md b/README.md
index d2e0777..0889336 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
-
+
diff --git a/Screenshot2.jpg b/Screenshot2.jpg
new file mode 100644
index 0000000..841a96b
Binary files /dev/null and b/Screenshot2.jpg differ
diff --git a/Screenshot2.png b/Screenshot2.png
deleted file mode 100644
index 180116c..0000000
Binary files a/Screenshot2.png and /dev/null differ
diff --git a/app/src/main/java/net/schueller/peertube/model/Category.java b/app/src/main/java/net/schueller/peertube/model/Category.java
new file mode 100644
index 0000000..6bde429
--- /dev/null
+++ b/app/src/main/java/net/schueller/peertube/model/Category.java
@@ -0,0 +1,23 @@
+package net.schueller.peertube.model;
+
+public class Category {
+
+ private Integer id;
+ private String label;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+}
diff --git a/app/src/main/java/net/schueller/peertube/model/File.java b/app/src/main/java/net/schueller/peertube/model/File.java
index 05f45c7..9537ffc 100644
--- a/app/src/main/java/net/schueller/peertube/model/File.java
+++ b/app/src/main/java/net/schueller/peertube/model/File.java
@@ -1,18 +1,18 @@
package net.schueller.peertube.model;
public class File {
- private Integer resolution;
+ private Resolution resolution;
private String resolutionLabel;
private String magnetUri;
private Integer size;
private String torrentUrl;
private String fileUrl;
- public Integer getResolution() {
+ public Resolution getResolution() {
return resolution;
}
- public void setResolution(Integer resolution) {
+ public void setResolution(Resolution resolution) {
this.resolution = resolution;
}
diff --git a/app/src/main/java/net/schueller/peertube/model/Language.java b/app/src/main/java/net/schueller/peertube/model/Language.java
new file mode 100644
index 0000000..3b7da5a
--- /dev/null
+++ b/app/src/main/java/net/schueller/peertube/model/Language.java
@@ -0,0 +1,23 @@
+package net.schueller.peertube.model;
+
+public class Language {
+
+ private Integer id;
+ private String label;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+}
diff --git a/app/src/main/java/net/schueller/peertube/model/Licence.java b/app/src/main/java/net/schueller/peertube/model/Licence.java
new file mode 100644
index 0000000..654f160
--- /dev/null
+++ b/app/src/main/java/net/schueller/peertube/model/Licence.java
@@ -0,0 +1,23 @@
+package net.schueller.peertube.model;
+
+public class Licence {
+
+ private Integer id;
+ private String label;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+}
diff --git a/app/src/main/java/net/schueller/peertube/model/Privacy.java b/app/src/main/java/net/schueller/peertube/model/Privacy.java
new file mode 100644
index 0000000..5d2c216
--- /dev/null
+++ b/app/src/main/java/net/schueller/peertube/model/Privacy.java
@@ -0,0 +1,23 @@
+package net.schueller.peertube.model;
+
+public class Privacy {
+
+ private Integer id;
+ private String label;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+}
diff --git a/app/src/main/java/net/schueller/peertube/model/Resolution.java b/app/src/main/java/net/schueller/peertube/model/Resolution.java
new file mode 100644
index 0000000..c969c89
--- /dev/null
+++ b/app/src/main/java/net/schueller/peertube/model/Resolution.java
@@ -0,0 +1,23 @@
+package net.schueller.peertube.model;
+
+public class Resolution {
+
+ private Integer id;
+ private String label;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+}
diff --git a/app/src/main/java/net/schueller/peertube/model/Video.java b/app/src/main/java/net/schueller/peertube/model/Video.java
index 2fe08e1..a640c73 100644
--- a/app/src/main/java/net/schueller/peertube/model/Video.java
+++ b/app/src/main/java/net/schueller/peertube/model/Video.java
@@ -8,12 +8,9 @@ public class Video {
private Integer id;
private String uuid;
private String name;
- private String category;
- private String categoryLabel;
- private String licence;
- private String licenceLabel;
- private String language;
- private String languageLabel;
+ private Category category;
+ private Licence licence;
+ private Language language;
private Boolean nsfw;
private String description;
private Boolean isLocal;
@@ -27,8 +24,8 @@ public class Video {
private Date createdAt;
private Date updatedAt;
- private String privacyLabel;
- private Integer privacy;
+ private Privacy privacy;
+
private String support;
private String descriptionPath;
@@ -67,54 +64,30 @@ public class Video {
this.name = name;
}
- public String getCategory() {
+ public Category getCategory() {
return category;
}
- public void setCategory(String category) {
+ public void setCategory(Category category) {
this.category = category;
}
- public String getCategoryLabel() {
- return categoryLabel;
- }
-
- public void setCategoryLabel(String categoryLabel) {
- this.categoryLabel = categoryLabel;
- }
-
- public String getLicence() {
+ public Licence getLicence() {
return licence;
}
- public void setLicence(String licence) {
+ public void setLicence(Licence licence) {
this.licence = licence;
}
- public String getLicenceLabel() {
- return licenceLabel;
- }
-
- public void setLicenceLabel(String licenceLabel) {
- this.licenceLabel = licenceLabel;
- }
-
- public String getLanguage() {
+ public Language getLanguage() {
return language;
}
- public void setLanguage(String language) {
+ public void setLanguage(Language language) {
this.language = language;
}
- public String getLanguageLabel() {
- return languageLabel;
- }
-
- public void setLanguageLabel(String languageLabel) {
- this.languageLabel = languageLabel;
- }
-
public Boolean getNsfw() {
return nsfw;
}
@@ -211,19 +184,11 @@ public class Video {
this.updatedAt = updatedAt;
}
- public String getPrivacyLabel() {
- return privacyLabel;
- }
-
- public void setPrivacyLabel(String privacyLabel) {
- this.privacyLabel = privacyLabel;
- }
-
- public Integer getPrivacy() {
+ public Privacy getPrivacy() {
return privacy;
}
- public void setPrivacy(Integer privacy) {
+ public void setPrivacy(Privacy privacy) {
this.privacy = privacy;
}