Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client into Dialog(Category)

Fork: 0

nitta-lab-2020 / org.ntlab.amaryllis.client

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client into Dialog(Category) Conflicts: app/src/main/AndroidManifest.xml app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java Dialog(Category) master miyazaki1112_2 test test11/12
commit 3ed36d7712f567b9c9a11877374d8f1b1c2f659d 2 parents 1477024 + f56c4f8 h-fuji authored on 12 Nov 2020

Browse code

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
	app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java
	app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
	app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java

Dialog(Category) master miyazaki1112_2 test test11/12

commit 3ed36d7712f567b9c9a11877374d8f1b1c2f659d

2 parents 1477024 + f56c4f8

h-fuji authored on 12 Nov 2020

Patch

Unified Split

Showing 31 changed files

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/amaryllis/client/Amaryllis.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/TestPlayActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/entities/AmaryllisBackgroundService.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/entities/MessageJson.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/entities/PlayListListener.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/amaryllis/client/entities/PutIntroductionResponse.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/voiceservice/MusicService.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/voiceservice/TestVoiceService.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoiceMemo.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoicememoReceiver.java 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/ic_baseline_pause_circle_outline_24.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/ic_baseline_play_circle_outline_24.xml 0 → 100644

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/menu/nav_drawer_menu.xml 0 → 100644

Show line notes below