Skip to content

Commit

Permalink
updated to 0.3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@Seil0
Seil0 committed Oct 10, 2016
1 parent 9de3e6a commit 84b7e2b
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 14 deletions.
Binary file modified bin/application/MainWindowController$1.class
View file
Binary file not shown.
Binary file modified bin/application/MainWindowController$2.class
View file
Binary file not shown.
Binary file modified bin/application/MainWindowController$3.class
View file
Binary file not shown.
Binary file modified bin/application/MainWindowController$4.class
View file
Binary file not shown.
Binary file modified bin/application/MainWindowController.class
View file
Binary file not shown.
Binary file modified bin/application/streamUiData.class
View file
Binary file not shown.
68 changes: 56 additions & 12 deletions src/application/MainWindowController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.controls.JFXToggleButton;

import javafx.animation.FadeTransition;
import javafx.animation.ParallelTransition;
import javafx.animation.TranslateTransition;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.beans.property.ReadOnlyStringWrapper;
import javafx.beans.value.ChangeListener;
Expand All @@ -82,6 +85,7 @@
import javafx.scene.paint.Color;
import javafx.scene.text.Font;
import javafx.stage.DirectoryChooser;
import javafx.util.Duration;

public class MainWindowController {
@FXML
Expand Down Expand Up @@ -152,7 +156,7 @@ public class MainWindowController {
private ImageView image1;

@FXML
TreeItem<streamUiData> root = new TreeItem<>(new streamUiData(1, 1, 5.0,"1", "filme","1"));
TreeItem<streamUiData> root = new TreeItem<>(new streamUiData(1, 1, 1, 5.0,"1", "filme","1"));
@FXML
TreeTableColumn<streamUiData, Double> columnRating = new TreeTableColumn<>("Bewertung");
@FXML
Expand All @@ -165,9 +169,11 @@ public class MainWindowController {
TreeTableColumn<streamUiData, Integer> columnYear = new TreeTableColumn<>("Jahr");
@FXML
TreeTableColumn<streamUiData, Integer> columnSeason = new TreeTableColumn<>("Staffel");
@FXML
TreeTableColumn<streamUiData, Integer> columnEpisode = new TreeTableColumn<>("Episode");

@FXML
private TreeItem<streamUiData> streamingRoot =new TreeItem<>(new streamUiData(1 ,1 ,1.0 ,"1" ,"filme" ,"1"));
private TreeItem<streamUiData> streamingRoot =new TreeItem<>(new streamUiData(1 ,1 ,1 ,1.0 ,"1" ,"filme" ,"1"));
@FXML
private TableColumn<streamUiData, String> dataNameColumn = new TableColumn<>("Datei Name");
@FXML
Expand All @@ -177,7 +183,8 @@ public class MainWindowController {
private boolean menutrue = false; //merker für menubtn (öffnen oder schließen)
private boolean settingstrue = false;
private boolean streamingSettingsTrue = false;
private String version = "0.3.7";
private String version = "0.3.8";
private String versionName = "half glowing bucket";
private String versionURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/version.txt";
private String downloadLink = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/downloadLink.txt";
private File dir = new File(System.getProperty("user.home") + "/Documents/HomeFlix");
Expand Down Expand Up @@ -222,15 +229,14 @@ public class MainWindowController {
//wenn menubtn clicked
/**
* TODO change value of Text-color change
* TODO animation of side menu
*/
@FXML
private void menubtnclicked(){
if(menutrue == false){
sideMenuVBox.setVisible(true);
sideMenuSlideIn();
menutrue = true;
}else{
sideMenuVBox.setVisible(false);
sideMenuSlideOut();
menutrue = false;
}
if(settingstrue == true){
Expand Down Expand Up @@ -400,7 +406,7 @@ private void switchBtnclicked(){
addDataUI();
settingsAnchor.setVisible(false);
streamingSettingsAnchor.setVisible(false);
sideMenuVBox.setVisible(false); //disables sidemenu
sideMenuSlideOut(); //disables sidemenu
menutrue = false;
settingstrue = false;
streamingSettingsTrue = false;
Expand Down Expand Up @@ -550,8 +556,11 @@ private void initTabel(){

columnSeason.setCellValueFactory((CellDataFeatures<streamUiData, Integer> p) ->
new ReadOnlyObjectWrapper(p.getValue().getValue().getSeason()));

columnEpisode.setCellValueFactory((CellDataFeatures<streamUiData, Integer> p) ->
new ReadOnlyObjectWrapper(p.getValue().getValue().getEpisode()));

treeTableViewfilm.getColumns().addAll(columnTitel, columnRating, columnStreamUrl, columnResolution, columnYear, columnSeason);
treeTableViewfilm.getColumns().addAll(columnTitel, columnRating, columnStreamUrl, columnResolution, columnYear, columnSeason, columnEpisode);
treeTableViewfilm.getColumns().get(2).setVisible(false); //blendet die Column mit den Dateinamen aus (wichtig um sie abzuspielen)

//Changelistener für TreeTable
Expand Down Expand Up @@ -685,7 +694,7 @@ public void loadData(){
for(int i = 0; i < entries.length; i++){
String titel = ohneEndung(entries[i]);
String data = entries[i];
newDaten.add(new streamUiData(1, 1, 5.0, "1", titel, data));
newDaten.add(new streamUiData(1, 1, 1, 5.0, "1", titel, data));
}
}

Expand All @@ -694,6 +703,7 @@ public void loadData(){
String resolution = null;
String streamUrl = null;
int season;
int episode;
int year;
double rating = 5.0;
if(getStreamingPath().equals("")||getStreamingPath().equals(null)){
Expand All @@ -708,10 +718,11 @@ public void loadData(){
for (JsonValue item : items) {
titel = item.asObject().getString("titel","");
season = item.asObject().getInt("season", 0);
episode = item.asObject().getInt("episode", 0);
year = item.asObject().getInt("year", 0);
resolution = item.asObject().getString("resolution", "");
streamUrl = item.asObject().getString("streamUrl", "");
streamData.add(new streamUiData(year, season, rating, resolution, titel, streamUrl));
streamData.add(new streamUiData(year, season, episode, rating, resolution, titel, streamUrl));
}

} catch (IOException e) {
Expand All @@ -732,6 +743,7 @@ public void addDataUI(){
treeTableViewfilm.getColumns().get(3).setVisible(false);
treeTableViewfilm.getColumns().get(4).setVisible(false);
treeTableViewfilm.getColumns().get(5).setVisible(false);
treeTableViewfilm.getColumns().get(6).setVisible(false);
}else if(mode.equals("streaming")){
for(int i = 0; i < streamData.size(); i++){
root.getChildren().add(new TreeItem<streamUiData>(streamData.get(i))); //fügt daten zur Rootnode hinzu
Expand All @@ -741,9 +753,11 @@ public void addDataUI(){
columnRating.setMaxWidth(52.5);
columnYear.setMaxWidth(40);
columnSeason.setMaxWidth(52.5);
columnEpisode.setMaxWidth(0); //disabled for ui size reasons
treeTableViewfilm.getColumns().get(3).setVisible(true);
treeTableViewfilm.getColumns().get(4).setVisible(true);
treeTableViewfilm.getColumns().get(5).setVisible(true);
treeTableViewfilm.getColumns().get(6).setVisible(true);
}
}

Expand All @@ -756,7 +770,7 @@ public void loadStreamingSettings(){
if(entries[i].endsWith(".json")){
String titel = ohneEndung(entries[i]);
String data = entries[i];
streamingData.add(new streamUiData(1,1,5.0,"1",titel ,data));
streamingData.add(new streamUiData(1,1,1,5.0,"1",titel ,data));
}
}
for(int i = 0; i < streamingData.size(); i++){
Expand Down Expand Up @@ -823,7 +837,37 @@ public void applyColor(){
}
}

private void sideMenuSlideIn(){
sideMenuVBox.setVisible(true);
//einblenden von 40% nach 100% deckkraft in 400ms
FadeTransition fadeTransition = new FadeTransition(Duration.millis(400), sideMenuVBox);
fadeTransition.setFromValue(0.4);
fadeTransition.setToValue(1.0);
//einfahren des side munes in 400ms
TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox);
translateTransition.setFromX(-150);
translateTransition.setToX(0);
//falls beides verwendet werden soll
ParallelTransition parallelTransition = new ParallelTransition();
parallelTransition.getChildren().addAll(translateTransition);//(fadeTransition, translateTransition);
parallelTransition.play();
}

private void sideMenuSlideOut(){
// sideMenuVBox.setVisible(false);
//ausblenden von 100% nach 40% deckkraft in 400ms
FadeTransition fadeTransition = new FadeTransition(Duration.millis(400), sideMenuVBox);
fadeTransition.setFromValue(1.0);
fadeTransition.setToValue(0.4);
//ausfahren des side munes in 400ms
TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox);
translateTransition.setFromX(0);
translateTransition.setToX(-150);
//falls beides verwendet werden soll
ParallelTransition parallelTransition = new ParallelTransition();
parallelTransition.getChildren().addAll(translateTransition);//(fadeTransition, translateTransition);
parallelTransition.play();
}

public void setLoaclUI(int local){
switch(local){
Expand Down Expand Up @@ -858,7 +902,7 @@ public void setLoaclUI(int local){
errorPlay = bundle.getString("errorPlay");
errorOpenStream = bundle.getString("errorOpenStream");
errorMode = bundle.getString("errorMode");
infoText = bundle.getString("version")+" "+version+" plasma bucket"+bundle.getString("infoText");
infoText = bundle.getString("version")+" "+version+" "+versionName+bundle.getString("infoText");
linuxBugText = bundle.getString("linuxBug");
vlcNotInstalled = bundle.getString("vlcNotInstalled");
}
Expand Down
16 changes: 15 additions & 1 deletion src/application/streamUiData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ public class streamUiData {

private IntegerProperty year = new SimpleIntegerProperty();
private IntegerProperty season = new SimpleIntegerProperty();
private IntegerProperty episode = new SimpleIntegerProperty();
private DoubleProperty rating = new SimpleDoubleProperty();
private StringProperty resolution = new SimpleStringProperty();
private StringProperty titel = new SimpleStringProperty();
private StringProperty streamUrl = new SimpleStringProperty();

//uiData ist der Typ der Daten in der TreeTabelView
public streamUiData (final int year, final int season, final double rating, final String resolution, final String titel, final String streamUrl) {
public streamUiData (final int year, final int season, final int episode, final double rating, final String resolution, final String titel, final String streamUrl) {
this.year.set(year);
this.season.set(season);
this.episode.set(episode);
this.rating.set(rating);
this.resolution.set(resolution);
this.titel.set(titel);
Expand All @@ -34,6 +36,10 @@ public int getSeason() {
return season.get();
}

public int getEpisode() {
return episode.get();
}

public double getRating() {
return rating.get();
}
Expand All @@ -59,6 +65,10 @@ public void setSeason(int season) {
this.season.set(season);
}

public void setEpisode(int season) {
this.episode.set(season);
}

public void setRating(int rating) {
this.rating.set(rating);
}
Expand All @@ -83,6 +93,10 @@ public IntegerProperty seasonProperty(){
return season;
}

public IntegerProperty episodeProperty(){
return episode;
}

public DoubleProperty ratingProperty(){
return rating;
}
Expand Down
Binary file modified updates/ProjectHomeFlix.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion updates/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.7
0.3.8

0 comments on commit 84b7e2b

Please sign in to comment.