Merge remote-tracking branch 'origin/master'
|
---|
.idea/compiler.xml |
---|
.idea/gradle.xml |
---|
.idea/runConfigurations.xml 100644 → 0 |
---|
app/src/main/ic_launcher-playstore.png 0 → 100644 |
---|
|
app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java |
---|
app/src/main/res/drawable-v24/acanthus_icon_500x500.png 0 → 100644 |
---|
|
app/src/main/res/drawable/ic_launcher_background.xml |
---|
app/src/main/res/layout/fragment_mypage.xml |
---|
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml |
---|
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml |
---|
app/src/main/res/mipmap-hdpi/ic_launcher.png |
---|
|
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png 0 → 100644 |
---|
|
app/src/main/res/mipmap-hdpi/ic_launcher_round.png |
---|
|
app/src/main/res/mipmap-mdpi/ic_launcher.png |
---|
|
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png 0 → 100644 |
---|
|
app/src/main/res/mipmap-mdpi/ic_launcher_round.png |
---|
|
app/src/main/res/mipmap-xhdpi/ic_launcher.png |
---|
|
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png 0 → 100644 |
---|
|
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png |
---|
|
app/src/main/res/mipmap-xxhdpi/ic_launcher.png |
---|
|
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png 0 → 100644 |
---|
|
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png |
---|
|
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png |
---|
|
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png 0 → 100644 |
---|
|
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png |
---|
|
app/src/main/res/values/ic_launcher_background.xml 0 → 100644 |
---|