diff options
author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-05-24 22:48:05 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-24 14:48:05 +0200 |
commit | a287668ee994e0c5920aa961d67db0611bb1dbb7 (patch) | |
tree | 700ec92305327e8a7a8bd9f89ab66e67e90e5f9c /src/main/java/at/hannibal2/skyhanni/data/jsonobjects | |
parent | 9d89e6ae92910da36607b3eeed7328fae58be0ae (diff) | |
download | skyhanni-a287668ee994e0c5920aa961d67db0611bb1dbb7.tar.gz skyhanni-a287668ee994e0c5920aa961d67db0611bb1dbb7.tar.bz2 skyhanni-a287668ee994e0c5920aa961d67db0611bb1dbb7.zip |
Backend: Make MayorJson be kotlin instead of java (#1772)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data/jsonobjects')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/MayorJson.java | 70 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt | 32 |
2 files changed, 32 insertions, 70 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/MayorJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/MayorJson.java deleted file mode 100644 index 6525e59d3..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/MayorJson.java +++ /dev/null @@ -1,70 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.local; - -import com.google.gson.annotations.Expose; - -import java.util.ArrayList; - -public class MayorJson { - @Expose - public boolean success; - @Expose - public long lastUpdated; - @Expose - public Mayor mayor; - @Expose - public Election current; - - public class Candidate { - @Expose - public String key; - @Expose - public String name; - @Expose - public ArrayList<Perk> perks; - @Expose - public int votes; - - @Override - public String toString() { - return "Candidate{" + - "key='" + key + '\'' + - ", name='" + name + '\'' + - ", perks=" + perks + - ", votes=" + votes + - '}'; - } - } - - public class Election { - @Expose - public int year; - @Expose - public ArrayList<Candidate> candidates; - } - - public class Mayor { - @Expose - public String key; - @Expose - public String name; - @Expose - public ArrayList<Perk> perks; - @Expose - public Election election; - } - - public static class Perk { - @Expose - public String name; - @Expose - public String description; - - @Override - public String toString() { - return "Perk{" + - "name='" + name + '\'' + - ", description='" + description + '\'' + - '}'; - } - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt new file mode 100644 index 000000000..d8f0df279 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt @@ -0,0 +1,32 @@ +package at.hannibal2.skyhanni.data.jsonobjects.other + +import com.google.gson.annotations.Expose + +data class MayorJson( + @Expose val mayor: MayorInfo, + @Expose val current: MayorElection?, +) + +data class MayorInfo( + @Expose val key: String, + @Expose val name: String, + @Expose val perks: List<MayorPerk>, + @Expose val election: MayorElection, +) + +data class MayorElection( + @Expose val year: Int, + @Expose val candidates: List<MayorCandidate>, +) + +data class MayorCandidate( + @Expose val key: String, + @Expose val name: String, + @Expose val perks: List<MayorPerk>, + @Expose val votes: Int, +) + +data class MayorPerk( + @Expose val name: String, + @Expose val description: String, +) |