Merge pull request #67 from sepandhaghighi/dev

Version 0.6

CHANGELOG.md

@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.6] - 2022-06-22
+### Added
+- Calming2 program
+### Changed
+- Calming program renamed to Calming1
+- Logo updated
+- `README.md` modified
 ## [0.5] - 2022-05-09
 ### Added
 - Decision-Making program
@@ -66,7 +73,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Anti-Appetite program 
 - Cigarette Replace program
 
-[Unreleased]: https://github.com/sepandhaghighi/nafas/compare/v0.5...dev
+[Unreleased]: https://github.com/sepandhaghighi/nafas/compare/v0.6...dev
+[0.6]: https://github.com/sepandhaghighi/nafas/compare/v0.5...v0.6
 [0.5]: https://github.com/sepandhaghighi/nafas/compare/v0.4...v0.5
 [0.4]: https://github.com/sepandhaghighi/nafas/compare/v0.3...v0.4
 [0.3]: https://github.com/sepandhaghighi/nafas/compare/v0.2...v0.3

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-<img src="https://github.com/sepandhaghighi/nafas/raw/master/otherfiles/logo.png" height=320px width=320px>
+<img src="https://github.com/sepandhaghighi/nafas/raw/master/otherfiles/logo.png" width=320px>
 <hr/>
 <h1>Nafas</h1>
 
@@ -78,19 +78,19 @@ No need to walk away to take a break, just sit comfortably, run Nafas and let th
 ## Installation		
 
 ### Source Code
-- Download [Version 0.5](https://github.com/sepandhaghighi/nafas/archive/v0.5.zip) or [Latest Source ](https://github.com/sepandhaghighi/nafas/archive/dev.zip)
+- Download [Version 0.6](https://github.com/sepandhaghighi/nafas/archive/v0.6.zip) or [Latest Source ](https://github.com/sepandhaghighi/nafas/archive/dev.zip)
 - `pip install -r requirements.txt` or `pip3 install -r requirements.txt` (Need root access)
 - `python3 setup.py install` or `python setup.py install` (Need root access)				
 
 ### PyPI
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install nafas==0.5` or `pip3 install nafas==0.5` (Need root access)							
+- `pip install nafas==0.6` or `pip3 install nafas==0.6` (Need root access)							
 
 
 ### Exe Version (Only Windows)
-- Download [Exe-Version 0.5](https://github.com/sepandhaghighi/nafas/releases/download/v0.5/NAFAS-0.5.exe)
-- Run `NAFAS-0.5.exe`
+- Download [Exe-Version 0.6](https://github.com/sepandhaghighi/nafas/releases/download/v0.6/NAFAS-0.6.exe)
+- Run `NAFAS-0.6.exe`
 
 
 ## Usage			
@@ -150,9 +150,12 @@ You can also join our discord server
 <blockquote>9- <a href="https://www.hgi.org.uk/resources/delve-our-extensive-library/resources-and-techniques/7-11-breathing-how-does-deep">Human Givens Institute</a> </blockquote>
 
 <blockquote>10- <a href="https://www.inc.com/mithu-storoni/this-2-minute-breathing-exercise-can-help-you-make-better-decisions-according-to-a-new-study.html">This 2-Minute Breathing Exercise Can Help You Make Better Decisions</a> </blockquote>
+
+<blockquote>11- <a href="https://k12.thoughtfullearning.com/minilesson/using-5-5-5-breathing-calm-down">Using 5-5-5 Breathing to Calm Down</a> </blockquote>
 					
-<blockquote>11- <a href="https://ttsmp3.com/">Free Text-To-Speech and Text-to-MP3 for US English</a> </blockquote>
+<blockquote>12- <a href="https://ttsmp3.com/">Free Text-To-Speech and Text-to-MP3 for US English</a> </blockquote>
 
+* Logo designed by [Sara Amiri Fard](https://github.com/sarahfard)
 
 ## Show your support
 								
@@ -187,4 +190,4 @@ zil1knmz8zj88cf0exr2ry7nav9elehxfcgqu3c5e5
 <h4>Coffeete</h4>
 <a href="http://www.coffeete.ir/opensource">
 <img src="http://www.coffeete.ir/images/buttons/lemonchiffon.png" style="width:260px;" />
-</a>
+</a>

nafas/params.py

@@ -16,7 +16,7 @@
 3. When exhaling through your mouth, it is recommended to fold the lips
 """
 
-NAFAS_VERSION = "0.5"
+NAFAS_VERSION = "0.6"
 
 SOUND_ERROR_MESSAGE = "ERROR : Unable to play sound."
 
@@ -43,13 +43,14 @@
         2: "Relax1",
         3: "Relax2",
         4: "Relax3",
-        5: "Calming",
-        6: "Power",
-        7: "Harmony",
-        8: "Anti-Stress",
-        9: "Anti-Appetite",
-        10: "Cigarette Replace",
-        11: "Decision-Making"},
+        5: "Calming1",
+        6: "Calming2",
+        7: "Power",
+        8: "Harmony",
+        9: "Anti-Stress",
+        10: "Anti-Appetite",
+        11: "Cigarette Replace",
+        12: "Decision-Making"},
     "level": {
         1: "Beginner",
         2: "Medium",
@@ -77,6 +78,12 @@
 
 CALMING_ADVANCED = {"ratio": [1, 4, 1, 4], "unit": 3, "pre": 3, "cycle": 20}
 
+CALMING2_BEGINNER = {"ratio": [5, 0, 5, 5], "unit": 1, "pre": 3, "cycle": 4}
+
+CALMING2_MEDIUM = {"ratio": [5, 0, 5, 5], "unit": 1, "pre": 3, "cycle": 6}
+
+CALMING2_ADVANCED = {"ratio": [5, 0, 5, 5], "unit": 1, "pre": 3, "cycle": 8}
+
 POWER_BEGINNER = {"ratio": [1, 2, 2, 0], "unit": 3, "pre": 3, "cycle": 28}
 
 POWER_MEDIUM = {"ratio": [1, 3, 2, 0], "unit": 3, "pre": 3, "cycle": 24}
@@ -277,9 +284,12 @@
             "Relax1": {"Beginner": RELAX_BEGINNER,
                        "Medium": RELAX_MEDIUM,
                        "Advanced": RELAX_ADVANCED},
-            "Calming": {"Beginner": CALMING_BEGINNER,
-                        "Medium": CALMING_MEDIUM,
-                        "Advanced": CALMING_ADVANCED},
+            "Calming1": {"Beginner": CALMING_BEGINNER,
+                         "Medium": CALMING_MEDIUM,
+                         "Advanced": CALMING_ADVANCED},
+            "Calming2": {"Beginner": CALMING2_BEGINNER,
+                         "Medium": CALMING2_MEDIUM,
+                         "Advanced": CALMING2_ADVANCED},
             "Power": {"Beginner": POWER_BEGINNER,
                       "Medium": POWER_MEDIUM,
                       "Advanced": POWER_ADVANCED},

otherfiles/Version.rc

@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(0, 5, 0, 0),
-    prodvers=(0, 5, 0, 0),
+    filevers=(0, 6, 0, 0),
+    prodvers=(0, 6, 0, 0),
     mask=0x3f,
     flags=0x0,
     OS=0x40004,
@@ -16,12 +16,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u'Sepand Haghighi'),
         StringStruct(u'FileDescription', u'NAFAS.exe'),
-        StringStruct(u'FileVersion', u'0.5.0.0'),
+        StringStruct(u'FileVersion', u'0.6.0.0'),
         StringStruct(u'InternalName', u'NAFAS.exe'),
         StringStruct(u'LegalCopyright', u'Copyright (c) 2020-2022 Sepand Haghighi'),
         StringStruct(u'OriginalFilename', u'NAFAS.exe'),
         StringStruct(u'ProductName', u'NAFAS'),
-        StringStruct(u'ProductVersion', u'0, 5, 0, 0')])
+        StringStruct(u'ProductVersion', u'0, 6, 0, 0')])
     ]), 
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]

otherfiles/version_check.py

@@ -4,7 +4,7 @@
 import sys
 import codecs
 Failed = 0
-VERSION = "0.5"
+VERSION = "0.6"
 
 VERSION_1 = VERSION.split(".")[0]
 VERSION_2 = str(int(float(VERSION) * 10 - int(VERSION_1) * 10))

setup.py

@@ -29,15 +29,15 @@ def read_description():
 setup(
     name='nafas',
     packages=['nafas'],
-    version='0.5',
+    version='0.6',
     description='Breathing gymnastics application',
     long_description=read_description(),
     long_description_content_type='text/markdown',
     include_package_data=True,
     author='Sepand Haghighi',
     author_email='[email protected]',
     url='https://github.com/sepandhaghighi/nafas',
-    download_url='https://github.com/sepandhaghighi/nafas/tarball/v0.5',
+    download_url='https://github.com/sepandhaghighi/nafas/tarball/v0.6',
     keywords="python3 python breath breathing meditation",
     project_urls={
         'Source': 'https://github.com/sepandhaghighi/nafas',
@@ -46,7 +46,7 @@ def read_description():
     install_requires=get_requires(),
     python_requires='>=3.5',
     classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'License :: OSI Approved :: MIT License',

test/test.py

@@ -34,13 +34,14 @@
 2- Relax1 (~ 7 minutes)
 3- Relax2 (~ 3 minutes)
 4- Relax3 (~ 6 minutes)
-5- Calming (~ 9 minutes)
-6- Power (~ 7 minutes)
-7- Harmony (~ 7 minutes)
-8- Anti-Stress (~ 4 minutes)
-9- Anti-Appetite (~ 10 minutes)
-10- Cigarette Replace (~ 5 minutes)
-11- Decision-Making (~ 2 minutes)
+5- Calming1 (~ 9 minutes)
+6- Calming2 (~ 2 minutes)
+7- Power (~ 7 minutes)
+8- Harmony (~ 7 minutes)
+9- Anti-Stress (~ 4 minutes)
+10- Anti-Appetite (~ 10 minutes)
+11- Cigarette Replace (~ 5 minutes)
+12- Decision-Making (~ 2 minutes)
 - Please choose a level :
 <BLANKLINE>
 1- Beginner