Browse code Merge remote-tracking branch 'remotes/origin/master' into AddMember # Conflicts: # app/src/main/res/values/strings.xml # gradle/wrapper/gradle-wrapper.properties マージによる漏れ分 AchieveRequests AddGroupByGroupID AddGroupByGroupID2 AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DG_gitignore DisplayGroupIDToInvite DisplayGroupIDToInviteSecond DisplayTitleRep DisplaygID GPSgetInService GroupListActivity JacksonTest JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity RetrofitSample SearchResultDisplay StoreLocationClass UpdateRequestList app areaInfo groupListErorFix master master_backup removeDGBuild searchNotificationsFix20191114 sendNotification updateAreaInformation

commit dfacd5af771e4bc7fefc3626b81ade464053c24d 2 parents 2ee2e8e + ac88bc5 t-tai authored on 23 May 2019

Showing 20 changed files

• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
• app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java
• app/src/main/java/com/example/cosmosclient/views/ListViewAdapter.java
• app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
• app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
• app/src/main/res/drawable/camera_image.png
• app/src/main/res/drawable/group_image.png
• app/src/main/res/drawable/mail_image.png
• app/src/main/res/drawable/qr_code_ex.png
• app/src/main/res/drawable/search_image.png
• app/src/main/res/drawable/white.png
• app/src/main/res/layout/activity_add_member.xml
• app/src/main/res/layout/activity_display_qr.xml
• app/src/main/res/layout/activity_signin.xml
• app/src/main/res/layout/activity_signup.xml
• app/src/main/res/layout/list.xml
• app/src/main/res/values/strings.xml
• build.gradle

Ignore Space Show notes View app/build.gradle

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/ListViewAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/SigninActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/SignupActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/camera_image.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/group_image.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/mail_image.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/qr_code_ex.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/search_image.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/white.png 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_add_member.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_display_qr.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_signin.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_signup.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/list.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/strings.xml

Ignore Space Show notes View build.gradle

Show line notes below