diff --git a/src/main/java/at/windesign/application/serie/serieDetailsForwardComposer.java b/src/main/java/at/windesign/application/serie/serieDetailsForwardComposer.java index d5538d5..163f229 100644 --- a/src/main/java/at/windesign/application/serie/serieDetailsForwardComposer.java +++ b/src/main/java/at/windesign/application/serie/serieDetailsForwardComposer.java @@ -17,7 +17,7 @@ public class serieDetailsForwardComposer extends GenericForwardComposer state) { int maxEpisode = 0; - String styleString = "display: grid; " + - "grid-template-columns: 4fr "; Groupbox groupbox = new Groupbox(); groupbox.setId("groupboxSeason" + season); + groupbox.setStyle("opacity: " + opacity + "%;"); + groupbox.setContentStyle(" overflow: auto;"); Caption caption = new Caption(); caption.setLabel("Season " + season); @@ -144,7 +144,7 @@ public class serieDetailsForwardComposer extends GenericForwardComposer> 8; + int _season = key >> 8; int _episode = key & 0xFF; if(_season == season) @@ -164,7 +164,6 @@ public class serieDetailsForwardComposer extends GenericForwardComposer> 8; + int _season = key >> 8; int _episode = key & 0xFF; if(_season == season) @@ -192,16 +191,12 @@ public class serieDetailsForwardComposer extends GenericForwardComposer> 8; + int _season = key >> 8; int _episode = key & 0xFF; + int _state = state.get(key); if(_season == season) - { - Radio radio = new Radio(); - radio.setId("init" + _season + "_" + _episode); - radio.setRadiogroup("radiogroupSeason" + _season + "_" + _episode); - div.insertBefore(radio, null); - } + addRadio("init" + _season + "_" + _episode, "radiogroupSeason" + _season + "_" + _episode, _state == 1, div); else if(_season > season) break; } @@ -213,16 +208,12 @@ public class serieDetailsForwardComposer extends GenericForwardComposer> 8; + int _season = key >> 8; int _episode = key & 0xFF; + int _state = state.get(key); if(_season == season) - { - Radio radio = new Radio(); - radio.setId("prog" + _season + "_" + _episode); - radio.setRadiogroup("radiogroupSeason" + _season + "_" + _episode); - div.insertBefore(radio, null); - } + addRadio("prog" + _season + "_" + _episode, "radiogroupSeason" + _season + "_" + _episode, _state == 2, div); else if(_season > season) break; } @@ -234,27 +225,33 @@ public class serieDetailsForwardComposer extends GenericForwardComposer> 8; + int _season = key >> 8; int _episode = key & 0xFF; + int _state = state.get(key); if(_season == season) - { - Radio radio = new Radio(); - radio.setId("done" + _season + "_" + _episode); - radio.setRadiogroup("radiogroupSeason" + _season + "_" + _episode); - div.insertBefore(radio, null); - } + addRadio("done" + _season + "_" + _episode, "radiogroupSeason" + _season + "_" + _episode, _state == 3, div); else if(_season > season) break; } - for(int i = 0;i < maxEpisode;i++) - { - styleString = styleString + "2fr "; - } - styleString = styleString + "; grid-gap: 10px; justify-items: center;"; + String styleString = "display: grid; " + + "grid-template-areas: \"a "; + + for(int i = 0; i < maxEpisode; i++) + styleString += "a "; + styleString = styleString + "\"; grid-auto-columns: max-content; grid-gap: 10px; justify-items: center;"; div.setStyle(styleString); detailsSerie.insertBefore(groupbox, buttons); } + + protected void addRadio(String id, String group, boolean checked, Div div) + { + Radio radio = new Radio(); + radio.setId(id); + radio.setRadiogroup(group); + div.insertBefore(radio, null); + radio.setChecked(checked); + } } diff --git a/target/classes/at/windesign/application/serie/serieDetailsForwardComposer.class b/target/classes/at/windesign/application/serie/serieDetailsForwardComposer.class index 1fb7ca4..d4f2e2c 100644 Binary files a/target/classes/at/windesign/application/serie/serieDetailsForwardComposer.class and b/target/classes/at/windesign/application/serie/serieDetailsForwardComposer.class differ diff --git a/target/classes/at/windesign/application/testing/testForwardComposer.class b/target/classes/at/windesign/application/testing/testForwardComposer.class new file mode 100644 index 0000000..148924d Binary files /dev/null and b/target/classes/at/windesign/application/testing/testForwardComposer.class differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index e1d5020..58da2da 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,4 +1,5 @@ C:\Users\birkeh\ownCloud\dev\IntelliJ\zk\multimedia\src\main\java\at\windesign\application\serie\serieDataSource.java +C:\Users\birkeh\ownCloud\dev\IntelliJ\zk\multimedia\src\main\java\at\windesign\application\testing\testForwardComposer.java C:\Users\birkeh\ownCloud\dev\IntelliJ\zk\multimedia\src\main\java\at\windesign\application\serie\serieDetailsSelectorComposer.java C:\Users\birkeh\ownCloud\dev\IntelliJ\zk\multimedia\src\main\java\at\windesign\application\serie\serie.java C:\Users\birkeh\ownCloud\dev\IntelliJ\zk\multimedia\src\main\java\at\windesign\application\serie\serieListSelectorComposer.java