Merge branch 'master' into feature/#166_update_paint_ui

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into feature/#166_update_paint_ui # Conflicts: # .idea/misc.xml # app/src/main/res/layout/activity_paint.xml README master
commit 49a433226fbd5683eb7ba10f4729068227a382e5 2 parents e10f77d + 75bf917 k-fujii authored on 28 Sep 2021

Patch

Unified Split

Showing 15 changed files

Ignore Space Show notes View .idea/misc.xml

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java 0 → 100644

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

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

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

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

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

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

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

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

Show line notes below