بعض التحسينات v1.2.1

rn0x · Nov 20, 2023 · 91510e4 · 91510e4
1 parent 6daeece
commit 91510e4
Show file tree

Hide file tree

Showing 44 changed files with 1,980 additions and 2,309 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ node_modules
 plugins
 platforms
 .idea
-package-lock.json
+package-lock.json
+tqw.keystore
diff --git a/config.xml b/config.xml
@@ -1,37 +1,44 @@
 <?xml version='1.0' encoding='utf-8'?>
-<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">
+<widget id="com.rn0x.altaqwaa" version="1.2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>التقوى</name>
     <description>تطبيق إسلامي سهل الإستخدام و جامع للكثير من الميزات التي يحتاجها المسلم في يومه</description>
-    <author email="[email protected]" href="https://altaqwaa.org">
-        Altaqwaa
-    </author>
+    <author email="[email protected]" href="https://altaqwaa.org">Altaqwaa</author>
     <content src="index.html" />
+
+    <!-- Allow-intent settings -->
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
+
+    <!-- Preferences -->
     <preference name="AndroidXEnabled" value="true" />
     <preference name="KeepRunning" value="true" />
     <preference name="loglevel" value="DEBUG" />
     <preference name="ErrorUrl" value="error.html" />
     <preference name="Fullscreen" value="false" />
     <preference name="DisallowOverscroll" value="true" />
-    <preference name="StatusBarOverlaysWebView" value="false" />
-    <preference name="StatusBarBackgroundColor" value="#2e3338" />
     <preference name="NavigationBarLight" value="true" />
     <preference name="Orientation" value="portrait" />
     <preference name="BackgroundColor" value="#2e3338" />
     <preference name="HideKeyboardFormAccessoryBar" value="true" />
     <preference name="NavigationBarBackgroundColor" value="#232527" />
-    <preference name="android-compileSdkVersion" value="32" />
+    <preference name="android-compileSdkVersion" value="33" />
     <preference name="SplashScreenBackgroundColor" value="#2e3338" />
+    <!-- StatusBar settings -->
+    <preference name="StatusBarBackgroundColor" value="#2e3338" />
+    <preference name="StatusBarOverlaysWebView" value="false" />
+
+    <!-- Android platform settings -->
     <platform name="android">
+
+        <!-- Icons -->
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
         <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
         <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
         <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
         <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
         <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+
+        <!-- Splash Screen settings -->
         <preference name="AndroidWindowSplashScreenAnimatedIcon" value="resources/splash.png" />
         <preference name="AndroidWindowSplashScreenBackground" value="#2e3338" />
     </platform>

diff --git a/keytool.js b/keytool.js
@@ -0,0 +1,10 @@
+const { exec } = require('child_process');
+
+exec('keytool -genkey -v -keystore ./debug.keystore -alias "rn0x" -storepass "11223344" -keypass "11223344" -keyalg RSA -keysize 2048 -dname "CN=rn0x, OU=altaqwaa, O=altaqwaa, L=makkah, ST=makkah, C=sa"', (error, stdout, stderr) => {
+    if (error) {
+        console.error(`Error: ${error.message}`);
+        return;
+    }
+    console.log(`stdout: ${stdout}`);
+    console.error(`stderr: ${stderr}`);
+});
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.rn0x.altaqwaa",
   "displayName": "التقوى",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "تطبيق إسلامي سهل الإستخدام و جامع للكثير من الميزات التي يحتاجها المسلم في يومه",
   "main": "index.js",
   "scripts": {
@@ -11,29 +11,25 @@
     "bundle": "cordova build android --release -- --packageTypjetifiere=bundle",
     "android": "cordova platform add android@latest",
     "clear": "rm -rf ./node_modules && cordova platforms rm android && npm cache clean --force && npm i && cordova platform add android@latest",
-    "keytool": "keytool -genkey -v -keystore ./debug.keystore -alias 'rn0x' -storepass '11223344' -keypass '11223344' -keyalg RSA -keysize 2048 -dname 'CN=rn0x, OU=altaqwaa, O=altaqwaa, L=makkah, ST=makkah, C=sa'"
+    "keytool": "node keytool.js"
   },
   "author": {
     "name": "Ryan Almalki",
     "email": "[email protected]",
     "url": "https://www.altaqwaa.org"
   },
   "license": "GPL-3.0",
-  "devDependencies": {
+  "dependencies": {
     "browser-sync": "^2.28.3",
     "cordova": "^11.1.0",
-    "cordova-android": "^11.0.0",
     "cordova-clipboard": "^1.3.0",
     "cordova-plugin-android-permissions": "^1.1.5",
     "cordova-plugin-device": "^2.1.0",
     "cordova-plugin-dialogs": "^2.0.2",
-    "cordova-plugin-downloader": "github:asadaries/cordova-plugin-downloader",
     "cordova-plugin-geolocation": "^4.1.0",
     "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-plugin-vibration": "^3.1.1"
   },
   "cordova": {
     "plugins": {
@@ -53,5 +49,11 @@
     "platforms": [
       "android"
     ]
+  },
+  "devDependencies": {
+    "cordova-android": "^12.0.1",
+    "cordova-plugin-downloader": "github:asadaries/cordova-plugin-downloader",
+    "cordova-plugin-network-information": "github:apache/cordova-plugin-network-information",
+    "phonegap-plugin-mobile-accessibility": "github:phonegap/phonegap-mobile-accessibility"
   }
 }
diff --git a/www/css/adhkar.css b/www/css/adhkar.css
@@ -136,6 +136,7 @@
     border-radius: 15px;
     margin-right: auto;
     margin-left: auto;
+    position: relative;
 }
 
 .adhkar:nth-child(1) {
@@ -164,16 +165,26 @@
     color: var(--green);
 } */
 
-.text_bottom {
+.text_description {
     margin-bottom: 8px;
     margin-top: 10px;
     font-family: var(--NotoSansArabic);
     font-weight: 500;
-    color: var(--color_font_grey);
+    color: #1fa05d;
     font-size: 14px;
     text-align: center;
+    word-break: break-all;
+}
 
-
+.text_source {
+    display: block;
+    margin-bottom: 8px;
+    margin-top: 10px;
+    font-family: var(--NotoSansArabic);
+    color: #819953;
+    font-size: 12px;
+    text-align: center;
+    word-break: break-all;
 }
 
 .text {
@@ -183,6 +194,7 @@
     text-align: center;
     margin-bottom: 0px;
     font-size: 23px;
+    word-break: break-all;
 }
 
 .repetition {
@@ -269,6 +281,29 @@
     font-weight:900;
 }
 
+.icon_copy_adhkar {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    right: 20px;
+    bottom: 20px;
+    cursor: pointer;
+}
+
+.icon_repetition_adhkar {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    left: 20px;
+    bottom: 20px;
+    cursor: pointer;
+}
 /* @media (max-width: 330px) {
     #adhkar_ul li {
         width: 85%;

diff --git a/www/css/info.css b/www/css/info.css
@@ -13,6 +13,43 @@
     color: var(--white);
 }
 
+#app_description {
+    font-size: 12px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
+    color: var(--color_font_grey);
+}
+
+#license {
+    font-size: 11px;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    color: var(--white);
+}
+
+#free {
+    font-size: 11px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    color: var(--white);
+}
+
+#telegram_info {
+    font-size: 11px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    color: var(--color_font_grey);
+    direction: ltr;
+}
+#telegram_info a {
+    text-decoration: none;
+    color: var(--white);
+}
+
+
+
 #app_version {
     margin: 0 auto;
     color: var(--white);
@@ -27,6 +64,7 @@
     margin-top: 3px;
     margin-bottom: 20px;
     color: var(--color_font_grey);
+    text-decoration: none;
 }
 
 #Do_not_forget {

diff --git a/www/css/main.css b/www/css/main.css
@@ -150,6 +150,24 @@ html {
     /* For some Androids */
 }
 
+input:focus,
+textarea:focus,
+select:focus,
+a:focus {
+    outline: none;
+}
+
+
+#loading {
+    display: none;
+    width: 80px;
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    z-index: 100;
+}
+
 @media (min-width: 500px) {
     .text_alert {
         margin-top: 30% !important;

diff --git a/www/css/prayer.css b/www/css/prayer.css
@@ -118,8 +118,10 @@
 #remaining {
     display: none;
     color: var(--color_font_grey);
-    font-size: 15px;
+    font-size: 13px;
     text-align: center;
+    margin-top: 0px;
+    margin-bottom: 5px;
 }
 
 #remaining_name {
@@ -130,13 +132,14 @@
 #remaining_time {
     display: none;
     color: var(--white-div);
-    font-size: 20px;
+    font-size: 14px;
     text-align: center;
     background-color: var(--background_div_hover);
-    width: 60%;
+    width: 70%;
+    max-width: 150px;
     border-radius: 8px;
-    margin-bottom: auto;
-    margin-top: auto;
+    margin-bottom: 20px;
+    margin-top: 0pc;
     margin-left: auto;
     margin-right: auto;
     box-shadow: rgba(0, 0, 0, 0.4) 0px 2px 4px, rgba(0, 0, 0, 0.3) 0px 7px 13px -3px, rgba(0, 0, 0, 0.2) 0px -3px 0px inset;

diff --git a/www/css/quran.css b/www/css/quran.css
@@ -179,6 +179,28 @@
     /* cursor: pointer; */
 }
 
+#search_reader {
+    display: block;
+    width: 80%;
+    max-width: 300px;
+    background-image: url(/img/searchicon.png);
+    background-position: 5px 10px;
+    background-repeat: no-repeat;
+    padding: 7px;
+    background-color: #ffffff;
+    color: #000000;
+    border: none;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    margin-left: auto;
+    margin-right: auto;
+    font-family: var(--NotoSansArabic);
+    font-weight: 700;
+    font-size: 12px;
+    border-radius: 5px;
+
+}
+
 @media (max-width: 320px) {
     .quran_reader li {
         width: calc(70% / 2);

diff --git a/www/css/sabha.css b/www/css/sabha.css
@@ -23,4 +23,11 @@
         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);
+}
+
+#repetition_bt {
+    position: absolute;
+    width: 30px;
+    top: 100px;
+    cursor: pointer;
 }