diff --git a/.gitmodules b/.gitmodules index 09f4a8b18..a0075d06b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "SharedUtils"] - path = SharedUtils - url = https://github.com/yuliskov/SharedUtils +[submodule "SharedModules"] + path = SharedModules + url = https://github.com/yuliskov/SharedModules [submodule "MediaServiceCore"] path = MediaServiceCore url = https://github.com/yuliskov/MediaServiceCore diff --git a/MediaServiceCore b/MediaServiceCore index 2a0157241..a20c7c7ed 160000 --- a/MediaServiceCore +++ b/MediaServiceCore @@ -1 +1 @@ -Subproject commit 2a01572410979075538af75a63933fd3517a456b +Subproject commit a20c7c7edc29b8d6bb6bb0097a7c68cd7af09fc6 diff --git a/SharedModules b/SharedModules index 29b44e7cd..02f9856f0 160000 --- a/SharedModules +++ b/SharedModules @@ -1 +1 @@ -Subproject commit 29b44e7cd765e3cf9e601144f48988f71e8ae6fd +Subproject commit 02f9856f08fa3a38a783282ab5eb3134fab62fe9 diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/Header.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/Header.java new file mode 100644 index 000000000..b00aac3f5 --- /dev/null +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/Header.java @@ -0,0 +1,27 @@ +package com.liskovsoft.smartyoutubetv2.common.mvp.models; + +public class Header { + private int mId; + private String mTitle; + + public Header(int id, String title) { + mId = id; + mTitle = title; + } + + public String getTitle() { + return mTitle; + } + + public void setTitle(String title) { + mTitle = title; + } + + public int getId() { + return mId; + } + + public void setId(int id) { + mId = id; + } +} diff --git a/tvapp/src/main/java/com/liskovsoft/smartyoutubetv2/tv/model/Video.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/Video.java similarity index 98% rename from tvapp/src/main/java/com/liskovsoft/smartyoutubetv2/tv/model/Video.java rename to common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/Video.java index fcff28a9c..d0c9e0753 100644 --- a/tvapp/src/main/java/com/liskovsoft/smartyoutubetv2/tv/model/Video.java +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/Video.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.smartyoutubetv2.tv.model; +package com.liskovsoft.smartyoutubetv2.common.mvp.models; import android.media.MediaDescription; import android.os.Parcel; diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/VideoGroup.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/VideoGroup.java new file mode 100644 index 000000000..e01be3027 --- /dev/null +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/mvp/models/VideoGroup.java @@ -0,0 +1,71 @@ +package com.liskovsoft.smartyoutubetv2.common.mvp.models; + +import com.liskovsoft.mediaserviceinterfaces.data.MediaGroup; +import com.liskovsoft.mediaserviceinterfaces.data.MediaItem; + +import java.util.ArrayList; +import java.util.List; + +public class VideoGroup { + private int mId; + private String mTitle; + private List