Develop #36
Merged
Develop #36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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>
Signed-off-by: feaaaaaa <409834725@qq.com>
Signed-off-by: feaaaaaa <409834725@qq.com>
* 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>
* 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>
* 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>
mark-yyc
added a commit
that referenced
this pull request
Oct 9, 2020
* 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
added a commit
that referenced
this pull request
Oct 10, 2020
* 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>
ShanSimu
added a commit
that referenced
this pull request
Oct 12, 2020
* 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 * feat:random number game Co-authored-by: Cui Shaojie <46640505+cui-shaojie@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>
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>
ShanSimu
added a commit
that referenced
this pull request
Oct 19, 2020
* feat: clock setting page (#3) * feat: login®ister page (#4) * feat: LoginActivity1 * feat:login®ister page * docs：plan for iteration1 (#5) * Initial Commit Signed-off-by: feaaaaaa <409834725@qq.com> * docs:plan for iteration1 * feat: unfinished while list (#7) * change color, standardize naming and a prototype of navigation (#8) * Initial Commit Signed-off-by: feaaaaaa <409834725@qq.com> * docs:plan for iteration1 * tmp commit Signed-off-by: feaaaaaa <409834725@qq.com> * change color, standardize naming and a prototype of navigation Signed-off-by: feaaaaaa <409834725@qq.com> * feat:screen saver and task success and fix:white list (#12) * feat: unfinished while list * feat: task success activity * fix:task succuess activity * fix：white list * feat:screen saver activity * confict * fix:for the stupid name * feat: clock page relative (#13) * feat: clock setting page * feat;ring setting * feat: clock pages complete * feat for task list and fix for white list (#15) * feat: unfinished while list * feat: task success activity * fix:task succuess activity * fix：white list * feat:screen saver activity * confict * fix:for the stupid name * fix:white list layout * feat:task list * feat: adding FriendsListPage and CreditDetailPage (#14) * feat: LoginActivity1 * feat:login®ister page * feat: personinfo page * feat: adding FriendListPage and CreditDetailPage * feat:daily statistic (#16) * Initial Commit Signed-off-by: feaaaaaa <409834725@qq.com> * docs:plan for iteration1 * tmp commit Signed-off-by: feaaaaaa <409834725@qq.com> * change color, standardize naming and a prototype of navigation Signed-off-by: feaaaaaa <409834725@qq.com> * completion of navigation and color changes Signed-off-by: feaaaaaa <409834725@qq.com> * feat:daily statistic Signed-off-by: feaaaaaa <409834725@qq.com> * Update strings.xml * fix: some feat modified (#17) * feat: clock setting page * feat;ring setting * feat: clock pages complete * fix: some feat modified * fix (#18) * feat: unfinished while list * feat: task success activity * fix:task succuess activity * fix：white list * feat:screen saver activity * confict * fix:for the stupid name * fix:white list layout * feat:task list * fix:layout and strings * feat: fix (#19) * feat: LoginActivity1 * feat:login®ister page * feat: personinfo page * feat: adding FriendListPage and CreditDetailPage * feat: fix * fix: clock feat modified (#20) * fix (#21) * Initial Commit Signed-off-by: feaaaaaa <409834725@qq.com> * docs:plan for iteration1 * tmp commit Signed-off-by: feaaaaaa <409834725@qq.com> * change color, standardize naming and a prototype of navigation Signed-off-by: feaaaaaa <409834725@qq.com> * completion of navigation and color changes Signed-off-by: feaaaaaa <409834725@qq.com> * feat:daily statistic Signed-off-by: feaaaaaa <409834725@qq.com> * Update strings.xml * tmp * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * fix:color (#23) Signed-off-by: feaaaaaa <409834725@qq.com> * docs * docs (#24) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs * 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> * 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> * style: background and position Signed-off-by: feaaaaaa <409834725@qq.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> * 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> * style:color&fontSize Signed-off-by: feaaaaaa <409834725@qq.com> * fix: fontSize Signed-off-by: feaaaaaa <409834725@qq.com> * style: circle button & login style Signed-off-by: feaaaaaa <409834725@qq.com> * style: circle button & background color Signed-off-by: feaaaaaa <409834725@qq.com> * feat: part of navigation & fragment of view Signed-off-by: feaaaaaa <409834725@qq.com> * 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> * 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> * fix:screen saver activity * feat:calculate game * 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> * 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: mark-yyc <61784497+mark-yyc@users.noreply.github.com> Co-authored-by: ziliuziliu <43852461+ziliuziliu@users.noreply.github.com> Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com> Co-authored-by: feaaaaaa <409834725@qq.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
feaaaaaa
added a commit
that referenced
this pull request
Oct 23, 2020
* feat: clock setting page (#3) * feat: login®ister page (#4) * feat: LoginActivity1 * feat:login®ister page * docs：plan for iteration1 (#5) * Initial Commit Signed-off-by: feaaaaaa <409834725@qq.com> * docs:plan for iteration1 * feat: unfinished while list (#7) * change color, standardize naming and a prototype of navigation (#8) * Initial Commit Signed-off-by: feaaaaaa <409834725@qq.com> * docs:plan for iteration1 * tmp commit Signed-off-by: feaaaaaa <409834725@qq.com> * change color, standardize naming and a prototype of navigation Signed-off-by: feaaaaaa <409834725@qq.com> * feat:screen saver and task success and fix:white list (#12) * feat: unfinished while list * feat: task success activity * fix:task succuess activity * fix：white list * feat:screen saver activity * confict * fix:for the stupid name * feat: clock page relative (#13) * feat: clock setting page * feat;ring setting * feat: clock pages complete * feat for task list and fix for white list (#15) * feat: unfinished while list * feat: task success activity * fix:task succuess activity * fix：white list * feat:screen saver activity * confict * fix:for the stupid name * fix:white list layout * feat:task list * feat: adding FriendsListPage and CreditDetailPage (#14) * feat: LoginActivity1 * feat:login®ister page * feat: personinfo page * feat: adding FriendListPage and CreditDetailPage * feat:daily statistic (#16) * Initial Commit Signed-off-by: feaaaaaa <409834725@qq.com> * docs:plan for iteration1 * tmp commit Signed-off-by: feaaaaaa <409834725@qq.com> * change color, standardize naming and a prototype of navigation Signed-off-by: feaaaaaa <409834725@qq.com> * completion of navigation and color changes Signed-off-by: feaaaaaa <409834725@qq.com> * feat:daily statistic Signed-off-by: feaaaaaa <409834725@qq.com> * Update strings.xml * fix: some feat modified (#17) * feat: clock setting page * feat;ring setting * feat: clock pages complete * fix: some feat modified * fix (#18) * feat: unfinished while list * feat: task success activity * fix:task succuess activity * fix：white list * feat:screen saver activity * confict * fix:for the stupid name * fix:white list layout * feat:task list * fix:layout and strings * feat: fix (#19) * feat: LoginActivity1 * feat:login®ister page * feat: personinfo page * feat: adding FriendListPage and CreditDetailPage * feat: fix * fix: clock feat modified (#20) * fix (#21) * Initial Commit Signed-off-by: feaaaaaa <409834725@qq.com> * docs:plan for iteration1 * tmp commit Signed-off-by: feaaaaaa <409834725@qq.com> * change color, standardize naming and a prototype of navigation Signed-off-by: feaaaaaa <409834725@qq.com> * completion of navigation and color changes Signed-off-by: feaaaaaa <409834725@qq.com> * feat:daily statistic Signed-off-by: feaaaaaa <409834725@qq.com> * Update strings.xml * tmp * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * fix:color (#23) Signed-off-by: feaaaaaa <409834725@qq.com> * docs * docs (#24) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs * 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> * 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> * style: background and position Signed-off-by: feaaaaaa <409834725@qq.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> * 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> * style:color&fontSize Signed-off-by: feaaaaaa <409834725@qq.com> * fix: fontSize Signed-off-by: feaaaaaa <409834725@qq.com> * style: circle button & login style Signed-off-by: feaaaaaa <409834725@qq.com> * style: circle button & background color Signed-off-by: feaaaaaa <409834725@qq.com> * feat: part of navigation & fragment of view Signed-off-by: feaaaaaa <409834725@qq.com> * 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> * 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> * fix:screen saver activity * feat:calculate game * 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> * 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: mark-yyc <61784497+mark-yyc@users.noreply.github.com> Co-authored-by: ziliuziliu <43852461+ziliuziliu@users.noreply.github.com> Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com> Co-authored-by: feaaaaaa <409834725@qq.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.