From 0a5e9e4b505c0a24d88f949054f12f744cf8d8a6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:50:04 +0000 Subject: [PATCH 1/5] Update plugin org.jetbrains.intellij to v1.14.2 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 51d8e96..b321cf8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ fun properties(key: String) = project.findProperty(key).toString() plugins { id("java") - id("org.jetbrains.intellij") version "1.14.0" + id("org.jetbrains.intellij") version "1.14.2" id("org.jetbrains.changelog") version "2.1.0" } From eaae0cef3481ce7e6e1427b9185a5f91bbc683be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:34:57 +0000 Subject: [PATCH 2/5] Bump org.jetbrains.changelog from 2.1.0 to 2.1.2 Bumps org.jetbrains.changelog from 2.1.0 to 2.1.2. --- updated-dependencies: - dependency-name: org.jetbrains.changelog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 51d8e96..2e341ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ fun properties(key: String) = project.findProperty(key).toString() plugins { id("java") id("org.jetbrains.intellij") version "1.14.0" - id("org.jetbrains.changelog") version "2.1.0" + id("org.jetbrains.changelog") version "2.1.2" } version = properties("pluginVersion") From 7476c245c856e879b7703f3cacf1a8877fa632c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 21:56:01 +0000 Subject: [PATCH 3/5] Bump gradle/wrapper-validation-action from 1.0.6 to 1.1.0 Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.6 to 1.1.0. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1.0.6...v1.1.0) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45700b0..e44e99e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v3 - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v1.0.6 + uses: gradle/wrapper-validation-action@v1.1.0 # Run verifyPlugin and test Gradle tasks test: From 0e369b93fda4465bd5886ee461674dafb7e50462 Mon Sep 17 00:00:00 2001 From: Anas Date: Wed, 23 Aug 2023 01:57:19 +0300 Subject: [PATCH 4/5] Revert "Add the tafseer/translation text box to the ayah details dialog and make the user able to change the player edition on the fly" --- .../ayah/dialogs/AyahDetailsDialog.form | 107 +++--------------- .../ayah/dialogs/AyahDetailsDialog.java | 82 +------------- 2 files changed, 23 insertions(+), 166 deletions(-) diff --git a/src/main/java/com/anas/intellij/plugins/ayah/dialogs/AyahDetailsDialog.form b/src/main/java/com/anas/intellij/plugins/ayah/dialogs/AyahDetailsDialog.form index ce5d260..8d28764 100644 --- a/src/main/java/com/anas/intellij/plugins/ayah/dialogs/AyahDetailsDialog.form +++ b/src/main/java/com/anas/intellij/plugins/ayah/dialogs/AyahDetailsDialog.form @@ -3,7 +3,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -60,77 +60,25 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -159,7 +107,7 @@ - + @@ -189,25 +137,6 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/main/java/com/anas/intellij/plugins/ayah/dialogs/AyahDetailsDialog.java b/src/main/java/com/anas/intellij/plugins/ayah/dialogs/AyahDetailsDialog.java index c1d08f4..a0f8a1b 100644 --- a/src/main/java/com/anas/intellij/plugins/ayah/dialogs/AyahDetailsDialog.java +++ b/src/main/java/com/anas/intellij/plugins/ayah/dialogs/AyahDetailsDialog.java @@ -2,19 +2,15 @@ package com.anas.intellij.plugins.ayah.dialogs; import com.anas.alqurancloudapi.Ayah; import com.anas.alqurancloudapi.consts.Constants; -import com.anas.alqurancloudapi.edition.Edition; -import com.anas.alqurancloudapi.edition.EditionFormat; import com.anas.intellij.plugins.ayah.audio.AudioPlayer; import com.anas.intellij.plugins.ayah.audio.PlayerListener; -import com.anas.intellij.plugins.ayah.settings.userinterface.ReadableEdition; +import javazoom.jl.player.advanced.PlaybackEvent; import javax.swing.*; import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; -import java.util.Arrays; -import java.util.Objects; /** * @author Anas Elgarhy @@ -32,9 +28,6 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener { private JButton previousButton; private JButton nextButton; private JCheckBox autoPlayCheckBox; - private JTextArea tafseerTextArea; - private JComboBox tafseerAndTranslationComboBox; - private JComboBox editionComboBox; private boolean isPlaying; private AudioPlayer audioPlayer; private Ayah ayah; @@ -44,55 +37,21 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener { setContentPane(contentPane); setModal(true); - setSize(520, 320); + setSize(500, 300); setResizable(false); setLocationRelativeTo(null); getRootPane().setDefaultButton(playButton); - try { - setupTheUI(); - } catch (final IOException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(this, "Error while loading the ayah details", - "Error", JOptionPane.ERROR_MESSAGE); - } + updateAhaDetails(); addListeners(); } - private void setupTheUI() throws IOException { - previousButton.setEnabled(ayah.getNumber() != 1 && ayah.getSurah().getNumber() != 1); - nextButton.setEnabled(ayah.getNumber() != Constants.AYAHS_COUNT && ayah.getSurah().getNumber() != Constants.SURAS_COUNT); - - - final var tafserAndTranslationComboBoxModel = new DefaultComboBoxModel(); - final var editionComboBoxModel = new DefaultComboBoxModel(); - - Arrays.stream(Edition.getEditions()).forEach(edition -> { - if (edition.getFormat() == EditionFormat.AUDIO) { - editionComboBoxModel.addElement(new ReadableEdition(edition)); - } else { - tafserAndTranslationComboBoxModel.addElement(new ReadableEdition(edition)); - } - }); - - tafseerAndTranslationComboBox.setModel(tafserAndTranslationComboBoxModel); - editionComboBox.setModel(editionComboBoxModel); - - // Set the default selected item for the editionComboBox - editionComboBoxModel.setSelectedItem(new ReadableEdition(ayah.getEdition())); - // Set the actual information about the ayah in the UI - updateAyahDetails(); - } - - private void updateAyahDetails() { - // Update the ayah details + private void updateAhaDetails() { ayahTextArea.setText(ayah.getText()); surahNameLabel.setText(ayah.getSurah().getName()); numberOfAyahInSuarhLabel.setText("آية رقم: " + ayah.getNumberInSurah()); ayahRevelationType.setText(ayah.getSurah().getRevelationType().getArabicName()); - // Update the tafseer or translation - updateTheTauseerTextArea(); } private void addListeners() { @@ -133,24 +92,6 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener { } }); - tafseerAndTranslationComboBox.addActionListener(e -> { - updateTheTauseerTextArea(); - }); - - editionComboBox.addActionListener(e -> { - final var selectedEdition = ((ReadableEdition) Objects.requireNonNull( - editionComboBox.getSelectedItem())).getEdition(); - try { - ayah = Ayah.getAyah(ayah.getNumber(), selectedEdition); - updateAyahDetails(); - } catch (final IOException ioException) { - ioException.printStackTrace(); - JOptionPane.showMessageDialog(this, - "Error while loading the ayah - check your internet connection", - "Error", JOptionPane.ERROR_MESSAGE); - } - }); - buttonCancel.addActionListener(l -> close()); // call onCancel() when cross is clicked @@ -167,19 +108,6 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener { JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); } - private void updateTheTauseerTextArea() { - final var selectedEdition = ((ReadableEdition) Objects.requireNonNull( - tafseerAndTranslationComboBox.getSelectedItem())).getEdition(); - try { - tafseerTextArea.setText(Ayah.getAyah(ayah.getNumber(), selectedEdition).getText()); - } catch (final IOException ioException) { - ioException.printStackTrace(); - JOptionPane.showMessageDialog(this, - "Error while loading the tafseer - check your internet connection", - "Error", JOptionPane.ERROR_MESSAGE); - } - } - private void close() { if (audioPlayer != null) { audioPlayer.stop(); @@ -204,7 +132,7 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener { try { ayah = Ayah.getAyah(ayhNumber, ayah.getEdition().getIdentifier()); - updateAyahDetails(); + updateAhaDetails(); return true; } catch (final IOException ex) { JOptionPane.showMessageDialog(this, From 148268704ffb6f656618babecfe706c9fe15072d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 23:01:00 +0000 Subject: [PATCH 5/5] Update plugin org.jetbrains.intellij to v1.15.0 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2e341ba..9cb7617 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ fun properties(key: String) = project.findProperty(key).toString() plugins { id("java") - id("org.jetbrains.intellij") version "1.14.0" + id("org.jetbrains.intellij") version "1.15.0" id("org.jetbrains.changelog") version "2.1.2" }