Fix Merge
Showing
- .idea/modules.xml 1 addition, 0 deletions.idea/modules.xml
- app/src/main/AndroidManifest.xml 0 additions, 1 deletionapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/leo/fitnessdiy/Adapter/JogginHistoryAdapter.java 75 additions, 0 deletions.../example/leo/fitnessdiy/Adapter/JogginHistoryAdapter.java
- app/src/main/java/com/example/leo/fitnessdiy/Adapter/PlankHistoryAdapter.java 68 additions, 0 deletions...m/example/leo/fitnessdiy/Adapter/PlankHistoryAdapter.java
- app/src/main/java/com/example/leo/fitnessdiy/ChatActivity.java 46 additions, 0 deletions...rc/main/java/com/example/leo/fitnessdiy/ChatActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/SettingActivity.java 8 additions, 2 deletions...main/java/com/example/leo/fitnessdiy/SettingActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java 4 additions, 4 deletions...c/main/java/com/example/leo/fitnessdiy/SitupActivity.java
- app/src/main/res/drawable/beach_2_theme.jpg 0 additions, 0 deletionsapp/src/main/res/drawable/beach_2_theme.jpg
- app/src/main/res/drawable/beach_theme.jpg 0 additions, 0 deletionsapp/src/main/res/drawable/beach_theme.jpg
- app/src/main/res/drawable/cartoon_theme.jpg 0 additions, 0 deletionsapp/src/main/res/drawable/cartoon_theme.jpg
- app/src/main/res/drawable/cat_theme.jpg 0 additions, 0 deletionsapp/src/main/res/drawable/cat_theme.jpg
- app/src/main/res/drawable/flat_theme.jpg 0 additions, 0 deletionsapp/src/main/res/drawable/flat_theme.jpg
- app/src/main/res/drawable/layout_bg.xml 6 additions, 0 deletionsapp/src/main/res/drawable/layout_bg.xml
- app/src/main/res/drawable/natural_theme.jpg 0 additions, 0 deletionsapp/src/main/res/drawable/natural_theme.jpg
- app/src/main/res/drawable/plank_icon.png 0 additions, 0 deletionsapp/src/main/res/drawable/plank_icon.png
- app/src/main/res/drawable/pushup_icon.png 0 additions, 0 deletionsapp/src/main/res/drawable/pushup_icon.png
- app/src/main/res/drawable/red_2_theme.jpg 0 additions, 0 deletionsapp/src/main/res/drawable/red_2_theme.jpg
- app/src/main/res/drawable/red_theme.jpg 0 additions, 0 deletionsapp/src/main/res/drawable/red_theme.jpg
- app/src/main/res/drawable/situp_icon.png 0 additions, 0 deletionsapp/src/main/res/drawable/situp_icon.png
- app/src/main/res/layout/activity_login.xml 50 additions, 49 deletionsapp/src/main/res/layout/activity_login.xml
Please register or sign in to comment