diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..61a9130 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d225031..ed9c379 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -15,6 +15,7 @@ diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..91e690e --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java index 078e70f..2270d30 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java @@ -6,6 +6,9 @@ private Integer uid; private String token; + public LoginResponseJson() { + } + //----------------------------------------------------------------- // getter public Integer getUid() { diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java index e3afb6c..f78cae3 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java @@ -20,15 +20,13 @@ //----------------------------------------------------------------- private LoginScreenViewModel loginScreenViewModel; - private ActivityLoginScreenBinding binding; - //----------------------------------------------------------------- // ログインボタン押下時の処理 public void onClickLogin(View view) { Acanthus acanthus = (Acanthus) getApplication(); loginScreenViewModel.issueLoginToken( - acanthus, binding.editTextTextLoginEmail, binding.editTextTextLoginPassword); + acanthus, findViewById(R.id.editTextTextLoginEmail), findViewById(R.id.editTextTextLoginPassword)); } //----------------------------------------------------------------- @@ -51,8 +49,6 @@ // 初期化 private void init() { setContentView(R.layout.activity_login_screen); - binding = ActivityLoginScreenBinding.inflate(getLayoutInflater()); - startObserve(); } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java index 816d368..521075b 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java @@ -1,5 +1,9 @@ package org.ntlab.acanthus_client.views.main_menu_ui.mypage; +import android.util.Log; + +import androidx.lifecycle.MutableLiveData; + import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.resources.accounts.InvitedRest; @@ -15,8 +19,7 @@ // public class InvitedConnectionModel { - private String successMessage; - + private final String TAG = "InvitedConnectionModel"; private Retrofit retrofit; private Acanthus acanthus; @@ -28,38 +31,18 @@ } //----------------------------------------------------------------- - // getter - public String getSuccessMessage() { - return successMessage; - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // - public void init(Acanthus acanthus) { - this.acanthus = acanthus; - this.retrofit = new Retrofit.Builder() - .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") - .addConverterFactory(ScalarsConverterFactory.create()) - .addConverterFactory(JacksonConverterFactory.create()) - .build(); - checkInvited(); - } - - //----------------------------------------------------------------- // 招待確認 - public void checkInvited() { + public void checkInvited(MutableLiveData mText) { final InvitedRest invitedRest = retrofit.create(InvitedRest.class); - Integer uid = acanthus.getPreferenceUid(); - Integer aid = acanthus.getAid(); - - Call call = invitedRest.checkAccountInvited(2, aid); - + Call call = invitedRest.checkAccountInvited(acanthus.getPreferenceUid(), acanthus.getAid()); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { - if (response.isSuccessful()) successMessage = "招待されています"; + if (response.isSuccessful()){ + Log.d(TAG, response.body().toString()); + mText.setValue(response.body().toString()); + } } @Override @@ -69,6 +52,18 @@ }); } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // init + private void init(Acanthus acanthus) { + this.acanthus = acanthus; + this.retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(ScalarsConverterFactory.create()) + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + } //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java index 2adff03..c43fb32 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java @@ -52,15 +52,16 @@ Acanthus acanthus = (Acanthus) getActivity().getApplication(); mypageViewModel = new ViewModelProvider(this).get(MyPageViewModel.class); mypageViewModel.init(acanthus); - startObserve(); + + mypageViewModel.checkInvitedRequest(); } //----------------------------------------------------------------- // private void startObserve() { final TextView textView = binding.textMypage; - mypageViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + mypageViewModel.getImmutableText().observe(getViewLifecycleOwner(), new Observer() { @Override public void onChanged(@Nullable String s) { textView.setText(s); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java index b298612..4265072 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java @@ -2,20 +2,27 @@ import org.ntlab.acanthus_client.Acanthus; +//----------------------------------------------------------------- +// public class MyPageModelContainer { private InvitedConnectionModel invitedConnectionModel; //----------------------------------------------------------------- - // - public void init(Acanthus acanthus) { - invitedConnectionModel = new InvitedConnectionModel(acanthus); + //----------------------------------------------------------------- + public MyPageModelContainer(Acanthus acanthus){ + init(acanthus); } - //----------------------------------------------------------------- // getter public InvitedConnectionModel getInvitedConnectionModel() { return invitedConnectionModel; } //----------------------------------------------------------------- + //----------------------------------------------------------------- + // init + private void init(Acanthus acanthus) { + invitedConnectionModel = new InvitedConnectionModel(acanthus); + } + //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java index c457bd6..dad604a 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java @@ -1,5 +1,7 @@ package org.ntlab.acanthus_client.views.main_menu_ui.mypage; +import android.telephony.mbms.MbmsErrors; + import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; @@ -16,20 +18,12 @@ //----------------------------------------------------------------- // public class MyPageViewModel extends ViewModel { - private MyPageModelContainer myPageModelContainer; - private MutableLiveData mText; - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - public MyPageViewModel() { - myPageModelContainer = new MyPageModelContainer(); - mText = new MutableLiveData<>(); - } + private MutableLiveData mText = new MutableLiveData<>(); //----------------------------------------------------------------- // getter - public LiveData getText() { + public LiveData getImmutableText() { return mText; } @@ -37,10 +31,15 @@ //----------------------------------------------------------------- // init public void init(Acanthus acanthus) { - myPageModelContainer.init(acanthus); - mText.setValue(myPageModelContainer.getInvitedConnectionModel().getSuccessMessage()); + myPageModelContainer = new MyPageModelContainer(acanthus); + myPageModelContainer.getInvitedConnectionModel().checkInvited(mText); } + //----------------------------------------------------------------- + // + public void checkInvitedRequest() { + myPageModelContainer.getInvitedConnectionModel().checkInvited(mText); + } //----------------------------------------------------------------- } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index d173367..b54769a 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java @@ -36,7 +36,7 @@ //----------------------------------------------------------------- // public void onClickInvite(View view) { - Integer dummy1Id = 2; + Integer dummy1Id = 1; paintViewModel.inviteNewUserRequest(dummy1Id); } diff --git a/app/src/main/res/drawable-v24/acanthus_icon_500x500.png b/app/src/main/res/drawable-v24/acanthus_icon_500x500.png new file mode 100644 index 0000000..da2b1f0 --- /dev/null +++ b/app/src/main/res/drawable-v24/acanthus_icon_500x500.png Binary files differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..ca3826a 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_mypage.xml b/app/src/main/res/layout/fragment_mypage.xml index 252535f..a0d44e7 100644 --- a/app/src/main/res/layout/fragment_mypage.xml +++ b/app/src/main/res/layout/fragment_mypage.xml @@ -9,14 +9,16 @@ \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cf..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cf..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..9107bde 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..b62383d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 61da551..2f230e7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..b5f827b 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..36fe3dc --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index db5080a..f17810a 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..c2587ec 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..8ef8582 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index da31a87..f2e0caa 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15ac681..0d2b05d 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..7234f3e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index b216f2d..857c971 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f25a419..67ade20 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..0b85230 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index e96783c..7cc03ba 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file