Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #39

Merged
merged 8 commits into from
Oct 10, 2020
Merged

Develop #39

merged 8 commits into from
Oct 10, 2020

Conversation

feaaaaaa
Copy link
Contributor

No description provided.

ShanSimu and others added 8 commits October 2, 2020 15:32
* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
* Develop (#34)

* feat:navigation&jump&color (#31)

* Develop (#30)

* Develop (#25)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix: string

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: navigation between statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix

Signed-off-by: feaaaaaa <409834725@qq.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* Owner csj (#33)

* Develop (#29)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix:screen saver activity

* feat:calculate game

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* Owner yyc (#32)

* feat: setting and about page

* feat: two game added

* feat: two pages added

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* fix:merge

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:float button

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix:adjust jump

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix:adjust jump

Signed-off-by: feaaaaaa <409834725@qq.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>
* Develop (#36)

* Develop (#30)

* Develop (#25)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix: string

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: navigation between statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix

Signed-off-by: feaaaaaa <409834725@qq.com>

* Owner csj (#33)

* Develop (#29)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix:screen saver activity

* feat:calculate game

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* Owner yyc (#32)

* feat: setting and about page

* feat: two game added

* feat: two pages added

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>

* Owner feax (#35)

* Develop (#34)

* feat:navigation&jump&color (#31)

* Develop (#30)

* Develop (#25)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix: string

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: navigation between statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix

Signed-off-by: feaaaaaa <409834725@qq.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* Owner csj (#33)

* Develop (#29)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix:screen saver activity

* feat:calculate game

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* Owner yyc (#32)

* feat: setting and about page

* feat: two game added

* feat: two pages added

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* fix:merge

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:float button

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix:adjust jump

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix:adjust jump

Signed-off-by: feaaaaaa <409834725@qq.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: feaaaaaa <409834725@qq.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* feat:pomodoro list

* fix

* fix:app name

* fix

* apk

* fix

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: feaaaaaa <409834725@qq.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>
@feaaaaaa feaaaaaa merged commit c665c35 into owner-feax Oct 10, 2020
ShanSimu added a commit that referenced this pull request Oct 12, 2020
* Develop (#39)

* Develop (#29)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix:screen saver activity

* feat:calculate game

* Owner feax (#35)

* Develop (#34)

* feat:navigation&jump&color (#31)

* Develop (#30)

* Develop (#25)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix: string

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: navigation between statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix

Signed-off-by: feaaaaaa <409834725@qq.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* Owner csj (#33)

* Develop (#29)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix:screen saver activity

* feat:calculate game

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* Owner yyc (#32)

* feat: setting and about page

* feat: two game added

* feat: two pages added

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* fix:merge

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:float button

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix:adjust jump

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix:adjust jump

Signed-off-by: feaaaaaa <409834725@qq.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* Owner csj (#38)

* Develop (#36)

* Develop (#30)

* Develop (#25)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix: string

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: navigation between statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix

Signed-off-by: feaaaaaa <409834725@qq.com>

* Owner csj (#33)

* Develop (#29)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix:screen saver activity

* feat:calculate game

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* Owner yyc (#32)

* feat: setting and about page

* feat: two game added

* feat: two pages added

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>

* Owner feax (#35)

* Develop (#34)

* feat:navigation&jump&color (#31)

* Develop (#30)

* Develop (#25)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix: string

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: navigation between statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix

Signed-off-by: feaaaaaa <409834725@qq.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* Owner csj (#33)

* Develop (#29)

* fix:color (#23)

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs (#24)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* Owner feax (#28)

* fix:color

Signed-off-by: feaaaaaa <409834725@qq.com>

* docs

* feat:pieChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:barChart

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix: standardise id of textView

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: switch button for statistic

Signed-off-by: feaaaaaa <409834725@qq.com>

* style: color

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat: setting and about page (#27)

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>

* fix:screen saver activity

* feat:calculate game

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* Owner yyc (#32)

* feat: setting and about page

* feat: two game added

* feat: two pages added

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* fix:merge

Signed-off-by: feaaaaaa <409834725@qq.com>

* feat:float button

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix:adjust jump

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix:adjust jump

Signed-off-by: feaaaaaa <409834725@qq.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: feaaaaaa <409834725@qq.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* feat:pomodoro list

* fix

* fix:app name

* fix

* apk

* fix

Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: feaaaaaa <409834725@qq.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>

* fix: fix some style for iteration1

Signed-off-by: feaaaaaa <409834725@qq.com>

* fix

Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com>
Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants