179 Commits

Author SHA1 Message Date
ScorpioMiku
06e16847b0 cardview 2018-09-02 14:47:43 +08:00
ScorpioMiku
d73ad163d5 float button 2018-09-02 13:52:18 +08:00
ScorpioMiku
06a8aca2f6 bmb 2018-09-01 22:04:55 +08:00
ScorpioMiku
f9142b1326 menu 2018-09-01 21:52:07 +08:00
ScorpioMiku
cde71dbe6f body information 2018-09-01 17:24:29 +08:00
ScorpioMiku
7e35c2dc00 1 2018-08-30 21:31:16 +08:00
ScorpioMiku
06ecb1770f 1 2018-08-30 21:07:31 +08:00
ScorpioMiku
9ffae4a84d information bar 2018-08-30 14:57:50 +08:00
ScorpioMiku
659be48a31 Merge branch 'wangtianrui' 2018-08-30 12:44:26 +08:00
ScorpioMiku
6e8b39001d 1 2018-08-30 12:44:20 +08:00
ScorpioMiku
ea403e5994 BMI 2018-08-29 16:36:46 +08:00
ScorpioMiku
6e0b877d1d 1 2018-08-28 14:49:57 +08:00
ScorpioMiku
19f959bc80 计步ok了 2018-08-28 13:36:41 +08:00
ScorpioMiku
c57388dc94 计步ok了 2018-08-28 13:31:46 +08:00
zhaolizhi
1e03292d60 Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-08-28 10:33:19 +08:00
zhaolizhi
bbf1b5b398 1 2018-08-28 10:33:13 +08:00
ScorpioMiku
8b1d6a6527 需求分析 2018-08-27 23:38:26 +08:00
ScorpioMiku
92476c7a2e Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-08-27 22:51:32 +08:00
zhaolizhi
6738616580 Merge branch 'develop' into zhaolizhi 2018-08-27 17:39:51 +08:00
zhaolizhi
c16d0d6972 update dataset site 2018-08-27 17:37:43 +08:00
ScorpioMiku
3c614af2ff 左侧ui 2018-08-26 17:49:59 +08:00
ScorpioMiku
aa49f6f02f viewpager transformer 2018-08-26 17:16:19 +08:00
ScorpioMiku
b504741257 viewpager 2018-08-26 17:03:06 +08:00
ScorpioMiku
9ece16e6ea 侧拉 2018-08-26 16:31:56 +08:00
ScorpioMiku
f1a5f3dd33 Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-08-26 14:28:38 +08:00
ScorpioMiku
711a3e6788 init 2018-08-26 14:27:51 +08:00
zhaolizhi
d02e06ad63 add a readme 2018-08-26 11:29:56 +08:00
ScorpioMiku
06c3d8af82 wangtianrui 2018-08-26 11:08:52 +08:00
ScorpioMiku
4c0ab00758 init 2018-08-26 10:47:58 +08:00