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

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 acfrag 1110 11101 Dialog(Category) PLM PLM2 Shinji_1105 acfrag master miyazaki1110 miyazaki1112 miyazaki1112_2 set_category shinji11_12 test test11/12 voicememo_1112
commit 5bfa0c4a2425681a4efca06dc9b676fddce3bd0b 2 parents e829216 + 27ad499 yugo-asano authored on 29 Oct 2020

Patch

Unified Split

Showing 9 changed files

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/MainActivity.java

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/Voicememo.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/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/PlayListManager.java

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

Show line notes below