diff --git a/assets/path/sohila_sahib_en.txt b/assets/path/sohila_sahib_en.txt new file mode 100644 index 0000000..a479e64 --- /dev/null +++ b/assets/path/sohila_sahib_en.txt @@ -0,0 +1,55 @@ +Kirtan Sohila + +Sohilaa raag ga-orhee deepkee mehlaa 1 Ik-oNkaar satgur parsaad. jai ghar keerat aakhee-ai kartay kaa ho-ay beechaaro. tit ghar gaavhu sohilaa sivrihu sirjanhaaro. ||1|| + +tum gaavhu mayray nirbha-o kaa sohilaa. ha-o vaaree jit sohilai sadaa sukh ho-ay. ||1|| rahaa-o. + +nit nit jee-arhay samaalee-an daykhaigaa dayvanhaar. tayray daanai keemat naa pavai tis daatay kavan sumaar. ||2|| + +sambat saahaa likhi-aa mil kar paavhu tayl. dayh sajan aseesrhee-aa ji-o hovai saahib si-o mayl. ||3|| + +ghar ghar ayho paahuchaa sad-rhay nit pavann. sadanhaaraa simree-ai Nanak say dih aavann. ||4||1|| + +Raag Aasaa Mehlaa 1. + +chhi-a ghar chhi-a gur chhi-a updays. gur gur ayko vays anayk. ||1|| + +baabaa jai ghar kartay keerat ho-ay. so ghar raakh vadaa-ee to-ay. ||1|| rahaa-o. + +visu-ay chasi-aa gharhee-aa pahraa thitee vaaree maahu ho-aa. sooraj ayko rut anayk. Nanak kartay kay kaytay vays. ||2||2|| + +Raag Dhanaasree Mehlaa 1. + +gagan mai thaal rav chand deepak banay taarikaa mandal janak motee. Dhoop mal-aanlo pavan chavro karay sagal banraa-ay foolant jotee. ||1|| + +kaisee aartee ho-ay. bhav khandnaa tayree aartee. anhataa sabad vaajant bhayree. ||1|| rahaa-o. + +sahas tav nain nan nain heh tohi ka-o sahas moorat nanaa ayk tohee. sahas pad bimal nan ayk pad ganDh bin sahas tav ganDh iv chalat mohee. ||2|| + +sabh meh jot jot hai so-ay. tis dai chaanan sabh meh chaanan ho-ay. gur saakhee jot pargat ho-ay. jo tis bhaavai so aartee ho-ay. ||3|| + +har charan kaval makrand lobhit mano andino mohi aahee pi-aasaa. kirpaa jal deh Nanak saaring ka-o ho-ay jaa tay tayrai naa-ay vaasaa. ||4||3|| + +Raag Ga-orhee Poorbee Mehlaa 4. + +kaam karoDh nagar baho bhari-aa mil saaDhoo khandal khanda hay. poorab likhat likhay gur paa-i-aa man har liv mandal mandaa hay. ||1|| + +kar saaDhoo anjulee pun vadaa hay. kar dand-ut pun vadaa hay. ||1|| rahaa-o. + +saakat har ras saad na jaani-aa tin antar ha-umai kandaa hay. ji-o ji-o chaleh chubhai dukh paavahi jamkaal saheh sir dandaa hay. ||2|| + +har jan har har naam samaanay dukh janam maran bhav khanda hay. abhinaasee purakh paa-i-aa parmaysar baho sobh khand barahmandaa hay. ||3|| + +ham gareeb maskeen parabh tayray har raakh raakh vad vadaa hay. jan Nanak naam aDhaar tayk hai har naamay hee sukh mandaa hay. ||4||4|| + +Raag Ga-orhee Poorbee Mehlaa 5. + +kara-o baynantee sunhu mayray meetaa sant tahal kee baylaa. eehaa khaat chalhu har laahaa aagai basan suhaylaa. ||1|| + +a-oDh ghatai dinas rainaaray. man gur mil kaaj savaaray. ||1|| rahaa-o. + +ih sansaar bikaar sansay meh tari-o barahm gi-aanee. jisahi jagaa-ay pee-aavai ih ras akath kathaa tin jaanee. ||2|| + +jaa ka-o aa-ay so-ee bihaajhahu har gur tay maneh basayraa. nij ghar mahal paavhu sukh sehjay bahur na ho-igo fayraa. ||3|| + +antarjaamee purakh biDhaatay sarDhaa man kee pooray. Nanak daas ihai sukh maagai mo ka-o kar santan kee Dhooray. ||4||5|| \ No newline at end of file diff --git a/assets/path/sohila_sahib_hi.txt b/assets/path/sohila_sahib_hi.txt new file mode 100644 index 0000000..ef165e9 --- /dev/null +++ b/assets/path/sohila_sahib_hi.txt @@ -0,0 +1,62 @@ +kIrqn soihlw + +Soihlw rwgu gauVI dIpkI mhlw 1 +<> siqgur pRswid ] +jY Gir kIriq AwKIAY krqy kw hoie bIcwro ] +iqqu Gir gwvhu soihlw isvirhu isrjxhwro ]1] +qum gwvhu myry inrBau kw soihlw ] +hau vwrI ijqu soihlY sdw suKu hoie ]1] rhwau ] +inq inq jIAVy smwlIAin dyKYgw dyvxhwru ] +qyry dwnY kImiq nw pvY iqsu dwqy kvxu sumwru ]2] +sMbiq swhw iliKAw imil kir pwvhu qylu ] +dyhu sjx AsIsVIAw ijau hovY swihb isau mylu ]3] +Gir Gir eyhu pwhucw sdVy inq pvMin ] +sdxhwrw ismrIAY nwnk sy idh AwvMin ]4]1] +rwgu Awsw mhlw 1] +iCA Gr iCA gur iCA aupdys ] +guru guru eyko vys Anyk ]1] +bwbw jY Gir krqy kIriq hoie ] +so Gru rwKu vfweI qoie ]1] rhwau ] +ivsuey cisAw GVIAw phrw iQqI vwrI mwhu hoAw ] +sUrju eyko ruiq Anyk ] +nwnk krqy ky kyqy vys ]2]2] +rwgu DnwsrI mhlw 1] +ggn mY Qwlu riv cMdu dIpk bny qwirkw mMfl jnk moqI ] +DUpu mlAwnlo pvxu cvro kry sgl bnrwie PUlμq joqI ]1] +kYsI AwrqI hoie ] +Bv KMfnw qyrI AwrqI ] +Anhqw sbd vwjMq ByrI ]1] rhwau ] +shs qv nYn nn nYn hih qoih kau +shs mUriq nnw eyk quohI ] +shs pd ibml nn eyk pd gMD ibnu +shs qv gMD iev clq mohI ]2] +sB mih joiq joiq hY soie ] +iqs dY cwnix sB mih cwnxu hoie ] +gur swKI joiq prgtu hoie ] +jo iqsu BwvY su AwrqI hoie ]3] +hir crx kvl mkrMd loiBq +mno Anidnuo moih AwhI ipAwsw ] +ik®pw jlu dyih nwnk swirMg kau +hoie jw qy qyrY nwie vwsw ]4]3] +rwgu gauVI pUrbI mhlw 4] +kwim kroiD ngru bhu BirAw imil swDU KMfl KMfw hy ] +pUrib ilKq ilKy guru pwieAw min hir ilv mMfl mMfw hy ]1] +kir swDU AMjulI punu vfw hy ] +kir fMfauq punu vfw hy ]1] rhwau ] +swkq hir rs swdu n jwixAw iqn AMqir haumY kMfw hy ] +ijau ijau clih cuBY duKu pwvih jmkwlu shih isir fMfw hy ]2] +hir jn hir hir nwim smwxy duKu jnm mrx Bv KMfw hy ] +AibnwsI purKu pwieAw prmysru bhu soB KMf bRhmMfw hy ]3] +hm grIb mskIn pRB qyry hir rwKu rwKu vf vfw hy ] +jn nwnk nwmu ADwru tyk hY hir nwmy hI suKu mMfw hy ]4]4] +rwgu gauVI pUrbI mhlw 5] +krau bynμqI suxhu myry mIqw sMq thl kI bylw ] +eIhw Kwit clhu hir lwhw AwgY bsnu suhylw ]1] +AauD GtY idnsu rYxwry ] +mn gur imil kwj svwry ]1] rhwau ] +iehu sMswru ibkwru sMsy mih qirE bRhm igAwnI ] +ijsih jgwie pIAwvY iehu rsu AkQ kQw iqin jwnI ]2] +jw kau Awey soeI ibhwJhu hir gur qy mnih bsyrw ] +inj Gir mhlu pwvhu suK shjy bhuir n hoiego Pyrw ]3] +AMqrjwmI purK ibDwqy srDw mn kI pUry ] +nwnk dwsu iehY suKu mwgY mo kau kir sMqn kI DUry ]4]5] \ No newline at end of file diff --git a/assets/path/sohila_sahib_pa.txt b/assets/path/sohila_sahib_pa.txt new file mode 100644 index 0000000..339a84d --- /dev/null +++ b/assets/path/sohila_sahib_pa.txt @@ -0,0 +1,68 @@ +rwgu gauVI dIpkI mhlw ñ +<> siqgur pRswid ] +jY Gir kIriq AwKIAY krqy kw hoie bIcwro ] +iqqu Gir gwvhu soihlw isvirhu isrjxhwro ]ñ] +qum gwvhu myry inrBau kw soihlw ] +hau vwrI ijqu soihlY sdw suKu hoie ]ñ] rhwau ] +inq inq jIAVy smwlIAin dyKYgw dyvxhwru ] +qyry dwnY kImiq nw pvY iqsu dwqy kvxu sumwru ]ò] +sMbiq swhw iliKAw imil kir pwvhu qylu ] +dyhu sjx AsIsVIAw ijau hovY swihb isau mylu ]ó] +Gir Gir eyhu pwhucw sdVy inq pvMin ] +sdxhwrw ismrIAY nwnk sy idh AwvMin ]ô]ñ] +rwgu Awsw mhlw ñ] +iCA Gr iCA gur iCA aupdys ] guru guru eyko vys Anyk +]ñ] +bwbw jY Gir krqy kIriq hoie ] so Gru rwKu vfweI qoie +]ñ] rhwau ] +www.sikhzone.net +ivsuey cisAw GVIAw phrw iQqI vwrI mwhu hoAw ] +sUrju eyko ruiq Anyk ] nwnk krqy ky kyqy vys ]ò]ò] +rwgu DnwsrI mhlw ñ] +ggn mY Qwlu riv cMdu dIpk bny qwirkw mMfl jnk moqI +] +DUpu mlAwnlo pvxu cvro kry sgl bnrwie PUl +μq joqI +]ñ] +kYsI AwrqI hoie ] Bv KMfnw qyrI AwrqI ] +Anhqw sbd vwjMq ByrI ]ñ] rhwau ] +shs qv nYn nn nYn hih qoih kau shs mUriq nnw eyk +quohI ] +shs pd ibml nn eyk pd gMD ibnu shs qv gMD iev +clq mohI ]ò] +sB mih joiq joiq hY soie ] iqs dY cwnix sB mih cwnxu +hoie ] +gur swKI joiq prgtu hoie ] jo iqsu BwvY su AwrqI hoie +]ó] +hir crx kvl mkrMd loiBq mno Anidnuo moih AwhI +ipAwsw ] +ik®pw jlu dyih nwnk swirMg kau hoie jw qy qyrY nwie vwsw +]ô]ó] +rwgu gauVI pUrbI mhlw ô] +www.sikhzone.net +kwim kroiD ngru bhu BirAw imil swDU KMfl KMfw hy ] +pUrib ilKq ilKy guru pwieAw min hir ilv mMfl mMfw hy +]ñ] +kir swDU AMjulI punu vfw hy ] kir fMfauq punu vfw hy +]ñ] rhwau ] +swkq hir rs swdu n jwixAw iqn AMqir haumY kMfw hy ] +ijau ijau clih cuBY duKu pwvih jmkwlu shih isir fMfw hy +]ò] +hir jn hir hir nwim smwxy duKu jnm mrx Bv KMfw hy ] +AibnwsI purKu pwieAw prmysru bhu soB KMf bRhmMfw hy +]ó] +hm grIb mskIn pRB qyry hir rwKu rwKu vf vfw hy ] +jn nwnk nwmu ADwru tyk hY hir nwmy hI suKu mMfw hy +]ô]ô] +rwgu gauVI pUrbI mhlw õ] +krau bynμqI suxhu myry mIqw sMq thl kI bylw ] +eIhw Kwit clhu hir lwhw AwgY bsnu suhylw ]ñ] +AauD GtY idnsu rYxwry ] mn gur imil kwj svwry ]ñ] +rhwau ] +iehu sMswru ibkwru sMsy mih qirE bRhm igAwnI ] +ijsih jgwie pIAwvY iehu rsu AkQ kQw iqin jwnI ]ò] +jw kau Awey soeI ibhwJhu hir gur qy mnih bsyrw ] +www.sikhzone.net +inj Gir mhlu pwvhu suK shjy bhuir n hoiego Pyrw ]ó] +AMqrjwmI purK ibDwqy srDw mn kI pUry ] +nwnk dwsu iehY suKu mwgY mo kau kir sMqn kI DUry ]ô]õ] \ No newline at end of file diff --git a/lib/data/pathtiledata.dart b/lib/data/pathtiledata.dart index 51b4897..a47f559 100644 --- a/lib/data/pathtiledata.dart +++ b/lib/data/pathtiledata.dart @@ -7,9 +7,12 @@ class PathTileData { new PathTile(3, 'Chaupai Sahib', 'cOpeI swihb', 'chaupai_sahib'), new PathTile(4, 'Anand Sahib', 'Anµdu swihb', 'anand_sahib'), new PathTile(5, 'Rehras Sahib', 'rhrwis swihb', 'rehraas_sahib'), - new PathTile(6, 'Tav-Prasad Savaiye', 'qÍ pRswid sv`X', 'tavprasad_savaiye'), + new PathTile( + 6, 'Tav-Prasad Savaiye', 'qÍ pRswid sv`X', 'tavprasad_savaiye'), new PathTile(7, 'Ardas', 'Ardws', 'ardas'), new PathTile(8, 'Sukhmani Sahib', 'suKmnI swihb', 'sukhmani_sahib'), - new PathTile(9, 'Dukh Bhanjani Sahib', 'duK BMjnI swihb', 'dukh_bhanjani_sahib'), + new PathTile( + 9, 'Dukh Bhanjani Sahib', 'duK BMjnI swihb', 'dukh_bhanjani_sahib'), + new PathTile(10, 'Sohila Sahib', 'soihlw swihb', 'sohila_sahib'), ]; -} \ No newline at end of file +} diff --git a/lib/redux/selectors/selectors.dart b/lib/redux/selectors/selectors.dart index 9abd4c8..a86f507 100644 --- a/lib/redux/selectors/selectors.dart +++ b/lib/redux/selectors/selectors.dart @@ -1,4 +1,3 @@ - import 'package:nitnem/constants/appconstants.dart'; import 'package:nitnem/data/languagedata.dart'; import 'package:nitnem/models/scrollinfo.dart'; @@ -6,22 +5,36 @@ import 'package:nitnem/models/themes.dart'; import 'package:nitnem/state/appstate.dart'; //AppState Persistent Options -String themeSelector(AppState state) => (state != null) ? state.options.themeName : ThemeName.Default.toString(); -bool showReaderOptionSelector(AppState state) => (state != null) ? state.showReaderOptions : false; -double textScaleValueSelector(AppState state) => (state != null) ? state.options.textScaleValue : 1.0; -bool isBoldSelector(AppState state) => (state != null) ? state.options.bold : false; -bool showStatusSelector(AppState state) => (state != null) ? state.options.showStatus : false; +String themeSelector(AppState state) => + (state != null) ? state.options.themeName : ThemeName.Default.toString(); +bool showReaderOptionSelector(AppState state) => + (state != null) ? state.showReaderOptions : false; +double textScaleValueSelector(AppState state) => + (state != null) ? state.options.textScaleValue : 1.0; +bool isBoldSelector(AppState state) => + (state != null) ? state.options.bold : false; +bool showStatusSelector(AppState state) => + (state != null) ? state.options.showStatus : false; //AppState Volatile Options -String languageSelector(AppState state) => (state != null) ? state.options.languageName : languages[0].title; -String pathDataSelector(AppState state) => (state != null) ? state.pathData : AppConstants.EMPTY_STRING; -String pathTitleSelector(AppState state) => (state != null) ? state.pathTitle : -AppConstants.EMPTY_STRING; -double scrollOffsetSelector(AppState state) => (state != null) ? getScrollOffsetForThisPath(state.options.scrollOffset, state.pathId): 0.0; -double maxOffsetSelector(AppState state) => (state != null) ? getMaxOffsetForThisPath(state.options.scrollOffset, state.pathId): 0.0; -String timeStringSelector(AppState state) => (state != null) ? state.statusTime : AppConstants.EMPTY_STRING; -int batteryPercSelector(AppState state) => (state != null) ? state.batteryPerc : 0.0; -bool saveScrollPositionSelector(AppState state) => (state != null) ? state.options.saveScrollPosition : false; +String languageSelector(AppState state) => + (state != null) ? state.options.languageName : languages[0].title; +String pathDataSelector(AppState state) => + (state != null) ? state.pathData : AppConstants.EMPTY_STRING; +String pathTitleSelector(AppState state) => + (state != null) ? state.pathTitle : AppConstants.EMPTY_STRING; +double scrollOffsetSelector(AppState state) => (state != null) + ? getScrollOffsetForThisPath(state.options.scrollOffset, state.pathId) + : 0.0; +double maxOffsetSelector(AppState state) => (state != null) + ? getMaxOffsetForThisPath(state.options.scrollOffset, state.pathId) + : 0.0; +String timeStringSelector(AppState state) => + (state != null) ? state.statusTime : AppConstants.EMPTY_STRING; +int batteryPercSelector(AppState state) => + (state != null) ? state.batteryPerc : 0.0; +bool saveScrollPositionSelector(AppState state) => + (state != null) ? state.options.saveScrollPosition : false; double getScrollOffsetForThisPath(Map scrollPos, int id) { return scrollPos[id.toString()].scrollOffset; @@ -29,4 +42,4 @@ double getScrollOffsetForThisPath(Map scrollPos, int id) { double getMaxOffsetForThisPath(Map scrollPos, int id) { return scrollPos[id.toString()].maxOffset; -} \ No newline at end of file +} diff --git a/pubspec.yaml b/pubspec.yaml index b59dbfc..0d83327 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -85,6 +85,9 @@ flutter: - assets/path/dukh_bhanjani_sahib_pa.txt - assets/path/dukh_bhanjani_sahib_en.txt - assets/path/dukh_bhanjani_sahib_hi.txt + - assets/path/sohila_sahib_pa.txt + - assets/path/sohila_sahib_en.txt + - assets/path/sohila_sahib_hi.txt fonts: - family: RobotoSlab