-
- Downloads
Merge branches 'master' and 'withoutbit' of...
Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit # Conflicts: # app/src/main/res/values/strings.xml
Showing
- .idea/caches/build_file_checksums.ser 0 additions, 0 deletions.idea/caches/build_file_checksums.ser
- app/src/main/AndroidManifest.xml 0 additions, 2 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/admin/sleepbetter/Data.java 2 additions, 8 deletionsapp/src/main/java/com/example/admin/sleepbetter/Data.java
- app/src/main/java/com/example/admin/sleepbetter/FirstPage.java 1 addition, 31 deletions...rc/main/java/com/example/admin/sleepbetter/FirstPage.java
- app/src/main/java/com/example/admin/sleepbetter/FirstPageLinkBitmoji.java 0 additions, 125 deletions...a/com/example/admin/sleepbetter/FirstPageLinkBitmoji.java
- app/src/main/java/com/example/admin/sleepbetter/GoalDiary.java 1 addition, 2 deletions...rc/main/java/com/example/admin/sleepbetter/GoalDiary.java
- app/src/main/java/com/example/admin/sleepbetter/MainMenu.java 3 additions, 5 deletions...src/main/java/com/example/admin/sleepbetter/MainMenu.java
- app/src/main/java/com/example/admin/sleepbetter/Questionnaire.java 3 additions, 3 deletions...ain/java/com/example/admin/sleepbetter/Questionnaire.java
- app/src/main/java/com/example/admin/sleepbetter/Questionnaire2.java 2 additions, 3 deletions...in/java/com/example/admin/sleepbetter/Questionnaire2.java
- app/src/main/java/com/example/admin/sleepbetter/Questionnaire3.java 1 addition, 2 deletions...in/java/com/example/admin/sleepbetter/Questionnaire3.java
- app/src/main/java/com/example/admin/sleepbetter/Questionnaire4.java 1 addition, 2 deletions...in/java/com/example/admin/sleepbetter/Questionnaire4.java
- app/src/main/java/com/example/admin/sleepbetter/SecondPage.java 1 addition, 2 deletions...c/main/java/com/example/admin/sleepbetter/SecondPage.java
- app/src/main/java/com/example/admin/sleepbetter/SecondPage2.java 1 addition, 2 deletions.../main/java/com/example/admin/sleepbetter/SecondPage2.java
- app/src/main/java/com/example/admin/sleepbetter/SecondPage3.java 1 addition, 2 deletions.../main/java/com/example/admin/sleepbetter/SecondPage3.java
- app/src/main/java/com/example/admin/sleepbetter/SecondPage4.java 1 addition, 2 deletions.../main/java/com/example/admin/sleepbetter/SecondPage4.java
- app/src/main/java/com/example/admin/sleepbetter/ThirdPage.java 0 additions, 101 deletions...rc/main/java/com/example/admin/sleepbetter/ThirdPage.java
- app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_Empty.java 2 additions, 3 deletions.../com/example/admin/sleepbetter/Update_Caffeine_Empty.java
- app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_limit.java 1 addition, 2 deletions.../com/example/admin/sleepbetter/Update_Caffeine_limit.java
- app/src/main/java/com/example/admin/sleepbetter/Update_Light_Bright.java 1 addition, 2 deletions...va/com/example/admin/sleepbetter/Update_Light_Bright.java
- app/src/main/java/com/example/admin/sleepbetter/Update_Light_Glasses.java 1 addition, 2 deletions...a/com/example/admin/sleepbetter/Update_Light_Glasses.java
Loading
Please register or sign in to comment