Browse code Merge branch 'master' into addcontent # Conflicts: # app/src/main/AndroidManifest.xml CleanArchitecture chenge_design correct_design master onResponse update update2
commit d20d9cba3021073e7611ae520786119ae17c2c98 2 parents 73630c0 + 3282929 n-konishi authored on 8 Jun 2018

Showing 18 changed files

• .gitignore
• .idea/caches/build_file_checksums.ser
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/test.txt
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/test
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/CallBack.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/login.xml
• app/src/main/res/layout/login_fragment.xml
• app/src/main/res/layout/sign_up_fragment.xml

Ignore Space Show notes View .gitignore

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

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/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/test.txt 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/test 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/CallBack.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java

Ignore Space Show notes View app/src/main/res/layout/activity_main.xml

Show notes View app/src/main/res/layout/login.xml 100644 → 0

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

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

Show line notes below