5 Commits

Author SHA1 Message Date
6499a4f698 Merge pull request 'Update Default Chat Pictures on Theme Change' (#115) from b/ui-fixes into develop
All checks were successful
zdm/envoy/pipeline/head This commit looks good
Reviewed-on: https://git.kske.dev/zdm/envoy/pulls/115
Reviewed-by: delvh <leon@kske.dev>
2021-12-04 09:22:53 +01:00
05ed5da41b Merge branch 'develop' into b/ui-fixes
All checks were successful
zdm/envoy/pipeline/head This commit looks good
2021-12-03 21:37:07 +01:00
c5f4969666 Merge pull request 'Add Jenkinsfile' (#114) from feature/jenkinsfile into develop
All checks were successful
zdm/envoy/pipeline/head This commit looks good
Reviewed-on: https://git.kske.dev/zdm/envoy/pulls/114
Reviewed-by: DieGurke <maxi@kske.dev>
Reviewed-by: delvh <leon@kske.dev>
2021-12-03 21:29:22 +01:00
1a9f9a85ab Add Jenkinsfile
All checks were successful
zdm/envoy/pipeline/head This commit looks good
2021-12-03 16:35:43 +01:00
b653652f6d Fix chat default pictures not being updated on theme change 2020-11-22 12:26:08 +01:00
5 changed files with 58 additions and 3 deletions

37
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,37 @@
pipeline {
agent any
options {
ansiColor('xterm')
}
stages {
stage('Build') {
steps {
sh 'mvn -DskipTests clean package'
}
}
stage('Test') {
steps {
sh 'mvn test'
}
post {
always {
junit '*/target/surefire-reports/*.xml'
}
}
}
stage('SonarQube Analysis') {
steps {
withSonarQubeEnv('KSKE SonarQube') {
sh 'mvn org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184:sonar'
}
}
}
}
post {
success {
archiveArtifacts artifacts: 'client/target/envoy-client-*-shaded.jar, server/target/envoy-server-jar-with-dependencies.jar'
}
}
}

View File

@ -18,7 +18,7 @@ import envoy.client.util.IconUtil;
*/
public final class ChatControl extends HBox {
private static final Image userIcon = IconUtil.loadIconThemeSensitive("user_icon", 32),
private static Image userIcon = IconUtil.loadIconThemeSensitive("user_icon", 32),
groupIcon = IconUtil.loadIconThemeSensitive("group_icon", 32);
/**
@ -60,4 +60,14 @@ public final class ChatControl extends HBox {
}
getStyleClass().add("list-element");
}
/**
* Reloads the default icons.
*
* @since Envoy Client v0.3-beta
*/
public static void reloadDefaultChatIcons() {
userIcon = IconUtil.loadIconThemeSensitive("user_icon", 32);
groupIcon = IconUtil.loadIconThemeSensitive("group_icon", 32);
}
}

View File

@ -326,6 +326,7 @@ public final class ChatScene implements Restorable, KeyboardMapping {
@Event(ThemeChangeEvent.class)
private void onThemeChange() {
ChatControl.reloadDefaultChatIcons();
settingsButton.setGraphic(
new ImageView(IconUtil.loadIconThemeSensitive("settings", DEFAULT_ICON_SIZE)));
voiceButton.setGraphic(

View File

@ -18,10 +18,10 @@ import envoy.util.SerializationUtils;
* @author Leon Hofmeister
* @since Envoy Common v0.1-beta
*/
class UserTest {
public class UserTest {
@Test
void test() throws IOException, ClassNotFoundException {
public void test() throws IOException, ClassNotFoundException {
User user2 = new User(2, "kai");
User user3 = new User(3, "ai");
User user4 = new User(4, "ki", Set.of(user2, user3));

View File

@ -28,6 +28,13 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
</plugins>
</build>
<modules>