Skip to content

Commit

Permalink
Merge pull request #16 from Alsarmad/development
Browse files Browse the repository at this point in the history
v 1.2.0
  • Loading branch information
rn0x authored Apr 2, 2023
2 parents 82e6ea6 + f96ef43 commit 6daeece
Show file tree
Hide file tree
Showing 18 changed files with 157 additions and 7 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- حصن المسلم
- بطاقات القرآن الكريم
- التفسير الميسر
- المسبحة الإلكترونية
- إذاعات قرآن ورقية شرعية واذكار الخ...
- صور متنوعة لأحاديث وأذكار وأدعية بشكل عشوائي

Expand All @@ -36,6 +37,7 @@
| ![altaqwaa](/screenshots/7.jpg) | ![altaqwaa](/screenshots/8.jpg) |
| ![altaqwaa](/screenshots/9.jpg) | ![altaqwaa](/screenshots/10.jpg) |
| ![altaqwaa](/screenshots/11.jpg) | ![altaqwaa](/screenshots/12.jpg) |
| ![altaqwaa](/screenshots/13.jpg) | |

<br>

Expand Down Expand Up @@ -123,11 +125,11 @@ cordova requirements
| الأيقونات | https://www.flaticon.com |
| خط Noto Sans Arabic | https://fonts.google.com/noto/specimen/Noto+Sans+Arabic |
| خط Amiri | https://fonts.google.com/specimen/Amiri |
| خط digital-7 | https://www.dafont.com/digital-7.font |
| بطاقات القرآن | https://github.com/rn0x/albitaqat_quran |
| التفسير الميسر | https://qurancomplex.gov.sa/techquran/dev |
| حصن المسلم | https://hisnmuslim.com |
| اسماء الله الحسنى | https://github.com/rn0x/Names_Of_Allah_Json |
| حصن المسلم | https://hisnmuslim.com |

<br>

Expand Down
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.rn0x.altaqwaa" version="1.1.0"
<widget id="com.rn0x.altaqwaa" version="1.2.0"
xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>التقوى</name>
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.rn0x.altaqwaa",
"displayName": "التقوى",
"version": "1.1.0",
"version": "1.2.0",
"description": "تطبيق إسلامي سهل الإستخدام و جامع للكثير من الميزات التي يحتاجها المسلم في يومه",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -32,6 +32,7 @@
"cordova-plugin-navigationbar-color": "^0.1.0",
"cordova-plugin-network-information": "github:apache/cordova-plugin-network-information",
"cordova-plugin-statusbar": "^3.0.0",
"cordova-plugin-vibration": "^3.1.1",
"phonegap-plugin-mobile-accessibility": "github:phonegap/phonegap-mobile-accessibility"
},
"cordova": {
Expand All @@ -46,7 +47,8 @@
"cordova-plugin-dialogs": {},
"cordova-plugin-downloader": {},
"cordova-plugin-android-permissions": {},
"phonegap-plugin-mobile-accessibility": {}
"phonegap-plugin-mobile-accessibility": {},
"cordova-plugin-vibration": {}
},
"platforms": [
"android"
Expand Down
Binary file added screenshots/13.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/google_play.xcf
Binary file not shown.
3 changes: 2 additions & 1 deletion www/css/adhkar.css
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,9 @@
}

.repetition_number {
color: var(--color_font_grey);
color: var(--background_div_hover_2);
margin-right: 10px;
font-size: 20px;
}

#header {
Expand Down
5 changes: 5 additions & 0 deletions www/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
src: url(../font/NotoSansArabic.woff2) format("woff2-variations")
}

@font-face {
font-family: "digital_7";
src: url(../font/digital-7.ttf)
}

@font-face {
font-family: 'Amiri';
font-style: normal;
Expand Down
26 changes: 26 additions & 0 deletions www/css/sabha.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#content {
margin-top: 0px !important;
}

#sabha {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
position: absolute;
top: 50%;
transform: translateY(-50%);
margin: 0 auto;
right: 0;
left: 0;
}

#sabha_number {
font-family: var(--digital_7);
font-size: 150px;
color: var(--background_div_hover);
text-shadow: 0px 3px 0px var(--green),
0px 14px 10px rgba(0, 0, 0, 0.15),
0px 24px 2px rgba(0, 0, 0, 0.1),
0px 34px 30px rgba(0, 0, 0, 0.1);
}
1 change: 1 addition & 0 deletions www/css/var.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
:root {
--NotoSansArabic: "NotoSansArabic";
--Amiri: "Amiri";
--digital_7: "digital_7";
--font_size_surah: 30px;
--font_size_adhkar: 20px;
--background_body: #2e3338;
Expand Down
Binary file added www/font/digital-7.ttf
Binary file not shown.
Binary file added www/img/sabha.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion www/js/adhkar.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,15 @@ export default async () => {
let adhkarEl = document.getElementById(item.id);
let numEl = document.querySelector(`[id='${item.id}'] > .copy_and_paste > .repetition > .repetition_number`).textContent
numbers.push(numEl);
adhkarEl.addEventListener("click", (e) => {
adhkarEl.addEventListener("click", async (e) => {

let adhkar_database = storage.getItem('adhkar_database');
let numberEl = document.querySelector(`[id='${item.id}'] > .copy_and_paste > .repetition > .repetition_number`)

if (Number(numberEl.textContent) > 0) {

navigator?.vibrate(0);
navigator?.vibrate(50);
numberEl.innerText = Number(numberEl.textContent) - 1;
storage.setItem("adhkar_database", Number(adhkar_database ? adhkar_database : 0) + 1);

Expand Down
2 changes: 2 additions & 0 deletions www/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import tfs from './tfs.js';
import images from './images.js';
import allah from './allah.js';
import settings from './settings.js';
import sabha from './sabha.js';
import notification from './notification.js';
import error_handling from './modules/error_handling.js';

Expand Down Expand Up @@ -61,6 +62,7 @@ document.addEventListener('deviceready', async (e) => {
await images();
await allah();
await settings();
await sabha();
await notification();

}, false);
6 changes: 6 additions & 0 deletions www/js/more.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default async () => {
let more_images = document.getElementById("more_images");
let more_settings = document.getElementById("more_settings");
let more_info = document.getElementById("more_info");
let more_sabha = document.getElementById("more_sabha");


more_albitaqat.addEventListener("click", e => {
Expand Down Expand Up @@ -56,6 +57,11 @@ export default async () => {
window.location.href = "/pages/info.html"
});

more_sabha.addEventListener("click", e => {

window.location.href = "/pages/sabha.html"
});

} catch (error) {

error_handling(error);
Expand Down
32 changes: 32 additions & 0 deletions www/js/sabha.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import error_handling from './modules/error_handling.js';

export default async () => {

if (window.location.pathname === '/pages/sabha.html') {

try {

let back = document.getElementById('back');
let sabha_number = document.getElementById('sabha_number');
let sabha = document.getElementById('sabha');

back.addEventListener("click", e => {
window.location.href = "/more.html";
});

sabha.addEventListener("click", e => {

let number = Number(sabha_number.innerText) + 1;
sabha_number.innerText = number;

});

} catch (error) {

error_handling(error);

}

}

}
10 changes: 10 additions & 0 deletions www/more.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@ <h3 class="more_title">

</li>

<li id="more_sabha">

<img src="/img/sabha.png">

<h3 class="more_title">
المسبحة
</h3>

</li>

<li id="more_settings">

<img src="/img/settings.png">
Expand Down
2 changes: 1 addition & 1 deletion www/pages/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h3 id="app_name">
تطبيق التقوى
</h3>

<p id="app_version">الإصدار: <span>v1.1.0</span></p>
<p id="app_version">الإصدار: <span>v1.2.0</span></p>

<p id="url_altaqwaa">
www.altaqwaa.org
Expand Down
59 changes: 59 additions & 0 deletions www/pages/sabha.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport" content="initial-scale=1, width=device-width, viewport-fit=cover">
<meta name="color-scheme" content="light dark">
<link rel="stylesheet" href="/css/var.css"> <!-- المتغيرات -->
<link rel="stylesheet" href="/css/main.css"> <!-- ملف الإستايل الأساسي -->
<link rel="stylesheet" href="/css/footer.css"> <!-- ملف css الفوتر -->
<link rel="stylesheet" href="/css/sabha.css">
<link rel="stylesheet" href="/css/more.css">
<link rel="stylesheet" href="/css/animate.min.css"> <!-- مؤثرات الإنتقال -->
<title>التقوى</title>
</head>

<body>

<div id="more_header" class="animate__animated animate__fadeIn">

<img src="/img/back.png" id="back">

<p id="more_header_title">
المسبحة الإلكترونية
</p>

</div>

<div id="content" class="animate__animated animate__fadeIn">

<!-- ================ ضع هنا محتوى الصفحة =============== -->


<div id="sabha">

<h1 id="sabha_number">
0
</h1>

</div>


<!-- ================ ضع هنا محتوى الصفحة =============== -->

</div>


<footer id="footer">
<!-- الفوتر مربوط بالجافاسكربت -->
</footer>

<script src="/cordova.js"></script>
<script src="/js/index.js" type="module"></script>
</body>

</html>

0 comments on commit 6daeece

Please sign in to comment.