Skip to content

Commit

Permalink
Merge pull request #2 from Lion6477/dev
Browse files Browse the repository at this point in the history
License
  • Loading branch information
Lion6477 committed Jan 19, 2024
2 parents 6feddea + a88d95a commit 1ee2e6f
Show file tree
Hide file tree
Showing 13 changed files with 142 additions and 50 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ build/
.vscode/

### Mac OS ###
.DS_Store
.DS_Store
.idea/aws.xml
/out/
3 changes: 3 additions & 0 deletions .idea/aws.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

module FileSorter {

requires javafx.controls;
requires javafx.graphics;
requires javafx.fxml;

opens org.example; // Экспорт пакета org.example
opens org.example.controller to javafx.fxml;
}
}
12 changes: 12 additions & 0 deletions src/main/java/org/example/FileSorterApp.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.example;

import javafx.application.Application;
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/example/Launcher.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.example;

public class Launcher {
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/example/controller/FileSorterController.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.example.controller;

import javafx.event.ActionEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.example.exception;

public class EmptyDirectoryPathException extends RuntimeException {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.example.exception;

public class InvalidDirectoryPathException extends RuntimeException {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.example.exception;

public class NoDirectorySelectedException extends RuntimeException {
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/example/service/FolderPathValidator.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.example.service;

import java.util.regex.Matcher;
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/example/service/Sorter.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.example.service;

import java.io.File;
Expand Down
60 changes: 12 additions & 48 deletions src/main/resources/components/theme.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Copyright 2024 Serhii Kushnerov
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at serhiikushnerov@gmail.com
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
export const theme = createTheme({
palette: {
primary: {
Expand All @@ -13,52 +25,4 @@ export const theme = createTheme({
// grey: '#6B6C6F',
},
},
typography: {
fontFamily: ['Roboto', 'Helvetica Neue', 'Arial', 'sans-serif'].join(','),
h1: {
fontSize: 64,
fontWeight: 800,
lineHeight: '96px',
},
h2: {
fontSize: 48,
fontWeight: 700,
lineHeight: '58px',
},
h3: {
fontSize: 36,
fontWeight: 700,
lineHeight: '44px',
},
h4: {
fontSize: 28,
fontWeight: 700,
lineHeight: '28px',
},
h5: {
fontSize: 24,
fontWeight: 700,
lineHeight: '24px',
},
h6: {
fontSize: 20,
fontWeight: 700,
lineHeight: '24px',
},
subtitle1: {
fontSize: 14,
fontWeight: 700,
lineHeight: '18px',
},
},

breakpoints: {
values: {
xs: 0,
sm: 600,
md: 900,
lg: 1200,
xl: 1536,
},
},
});
13 changes: 13 additions & 0 deletions src/main/resources/fxml/fileSorter.fxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--Copyright 2024 Serhii Kushnerov-->
<!--Licensed under the Apache License, Version 2.0 (the "License");-->
<!--you may not use this file except in compliance with the License.-->
<!--You may obtain a copy of the License at serhiikushnerov@gmail.com-->
<!-- -->
<!-- http://www.apache.org/licenses/LICENSE-2.0-->
<!-- -->
<!--Unless required by applicable law or agreed to in writing, software-->
<!--distributed under the License is distributed on an "AS IS" BASIS,-->
<!--WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-->
<!--See the License for the specific language governing permissions and-->
<!--limitations under the License.-->

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
Expand Down

0 comments on commit 1ee2e6f

Please sign in to comment.