diff --git a/README.md b/README.md index 4958af7..ceb3217 100644 --- a/README.md +++ b/README.md @@ -92,9 +92,9 @@ On Salawat you can choose to play an Adhan or not, you can import your own audio - [ ] Aur - [ ] Fix bugs - [ ] Fix bug that causes crash after Adhan is played (need more information about the cause) -- [ ] Weather +- [x] Weather - [ ] Sunnah times -- [ ] DateFormat +- [x] DateFormat - [x] Make progress bar display audio progress - [x] Make progress bar squared - Calculation methods diff --git a/pom.xml b/pom.xml index 54a31cb..15c6a71 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.dbchoco Salawat - 1.0.3 + 1.3.0 Salawat Salawat: Adhan app @@ -159,13 +159,17 @@ src/main/resources/io/github/dbchoco/Salawat/images/icon.ico - console + gui ${name}-${version}.exe - installForCurrentUser + askTheUser false false + false + false + false + false @@ -174,7 +178,7 @@ HKCU:Software\Microsoft\Windows\CurrentVersion\Run Salawat REG_SZ - %USERPROFILE%\AppData\Local\Programs\Salawat\Salawat.exe + ""{app}\{#MyAppExeName}"" diff --git a/src/main/java/io/github/dbchoco/Salawat/Main.java b/src/main/java/io/github/dbchoco/Salawat/Main.java index 4d5c91c..280c730 100644 --- a/src/main/java/io/github/dbchoco/Salawat/Main.java +++ b/src/main/java/io/github/dbchoco/Salawat/Main.java @@ -69,7 +69,10 @@ public void start(Stage stage) throws IOException, ClassNotFoundException { stage.setWidth(UserSettings.windowWidth); stage.setHeight(UserSettings.windowHeight); } - else stage.setMaximized(true); + else{ + stage.setWidth(1280); + stage.setHeight(720); + } addStageSizeListener(stage); playStartupSound(); diff --git a/src/main/java/io/github/dbchoco/Salawat/app/MainTimer.java b/src/main/java/io/github/dbchoco/Salawat/app/MainTimer.java index a9db0d3..0f9142a 100644 --- a/src/main/java/io/github/dbchoco/Salawat/app/MainTimer.java +++ b/src/main/java/io/github/dbchoco/Salawat/app/MainTimer.java @@ -68,9 +68,6 @@ private void checkAdhan(){ int minutes = Main.getPrayerTimesCalculator().timeAfterCurrentPrayer().getMinutes(); int seconds = Main.getPrayerTimesCalculator().timeAfterCurrentPrayer().getSeconds(); if (hours == 00 && minutes <= 10){ - if (AudioPlayer.getIsPlaying()){ - Controllers.getTimeController().displayTimeLeft("adhan"); - } if (minutes == 0 && seconds <= 10){ if (!launchedAlerts){ if (UserSettings.enableAdhan){ @@ -93,7 +90,12 @@ private void checkAdhan(){ } } else { - Controllers.getTimeController().displayTimeLeft("now"); + if (AudioPlayer.getIsPlaying()){ + Controllers.getTimeController().displayTimeLeft("adhan"); + } + else { + Controllers.getTimeController().displayTimeLeft("now"); + } } } else { diff --git a/src/main/resources/language_ar.properties b/src/main/resources/language_ar.properties index 90ce5f0..d4567b1 100644 --- a/src/main/resources/language_ar.properties +++ b/src/main/resources/language_ar.properties @@ -32,10 +32,10 @@ language= \u0627\u0644\u0644\u063A\u0629 timeformat= \u0634\u0643\u0644 \u0627\u0644\u0648\u0642\u062A 24hour= 24 \u0633\u0627\u0639\u0629 12hour= 12 \u0633\u0627\u0639\u0629 -dateformat= Date format -ddmmyyyy= DD/MM/YYYY -mmddyyyy= MM/DD/YYYY -yyyymmdd = YYYY/MM/DD +dateformat= \u0635\u064A\u063A\u0629 \u0627\u0644\u062A\u0627\u0631\u064A\u062E +ddmmyyyy= \u064A \u064A/\u0634 \u0634/\u0639 \u0639 \u0639 \u0639 +mmddyyyy= \u0634 \u0634/\u064A \u064A/\u0639 \u0639 \u0639 \u0639 +yyyymmdd = \u0639 \u0639 \u0639 \u0639/\u0634 \u0634/\u064A \u064A showSeconds = \u0639\u0631\u0636 \u0627\u0644\u062B\u0648\u0627\u0646\u064A notifications = \u0625\u0634\u0639\u0627\u0631\u0627\u062A notifCheck = \u062A\u0634\u063A\u064A\u0644 \u0627\u0644\u0625\u062E\u0637\u0627\u0631\u0627\u062A