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 deleted file mode 100644 index 3ceb9a0..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java +++ /dev/null @@ -1,113 +0,0 @@ -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.entities.Editor; -import org.ntlab.acanthus_client.entities.Work; -import org.ntlab.acanthus_client.resources.accounts.InvitedRest; -import org.ntlab.acanthus_client.resources.accounts.WorkRest; -import org.ntlab.acanthus_client.resources.gallery.EditorsRest; - -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; -import retrofit2.converter.scalars.ScalarsConverterFactory; - -//----------------------------------------------------------------- -// 招待されているかの問い合わせAPI -public class InvitedConnectionModel { - - private Retrofit retrofit; - private Acanthus acanthus; - //----------------------------------------------------------------- - private Boolean isInvited; - - //----------------------------------------------------------------- - // setter - private void setIsInvited(Boolean isInvited) { - this.isInvited = isInvited; - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // - public InvitedConnectionModel(Acanthus acanthus) { - init(acanthus); - } - - //----------------------------------------------------------------- - // 招待確認 - public void checkInvited(MutableLiveData mIsInvited) { - final InvitedRest invitedRest = retrofit.create(InvitedRest.class); - int dummyId = 2; - - Call call = invitedRest.checkAccountInvited(dummyId, acanthus.getAid()); - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.isSuccessful()) - mIsInvited.setValue(response.body()); - } - - @Override - public void onFailure(Call call, Throwable t) { - - } - }); - - } - - //----------------------------------------------------------------- - // 招待されているリストの取得API - public void getAccountInvitedList(){ - - } - - - //----------------------------------------------------------------- - // 招待承認 - public void acceptInvite() { - final WorkRest workRest = retrofit.create(WorkRest.class); - int dummy = 1111; - - - // 作品への参加 - // 自身のID, token, 該当作品ID - // ToDo: Aidを外部から取得する必要あり? -> AccountのInviteMapから任意の - // ToDo: getAidを招待一覧画面で更新してから取得すれば変更しなくてよさそう - - - - Call call = workRest.updateWork(acanthus.getPreferenceUid(), acanthus.getPreferenceToken(), dummy); - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - } - - @Override - public void onFailure(Call call, Throwable t) { - - } - }); - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // 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/MyPageInfoConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageInfoConnectionModel.java deleted file mode 100644 index 4df2214..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageInfoConnectionModel.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.ntlab.acanthus_client.views.main_menu_ui.mypage; - -import android.text.method.ReplacementTransformationMethod; - -import androidx.lifecycle.MutableLiveData; - -import org.ntlab.acanthus_client.Acanthus; -import org.ntlab.acanthus_client.databinding.ActivityAnimationBinding; -import org.ntlab.acanthus_client.entities.Account; -import org.ntlab.acanthus_client.resources.accounts.AccountsRest; - -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; -import retrofit2.converter.scalars.ScalarsConverterFactory; - -//----------------------------------------------------------------- -// マイページ情報の通信API (Follow, Followerの取得時に本格的に使うかも) -public class MyPageInfoConnectionModel { - - private Acanthus acanthus; - private Retrofit retrofit; - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // - public MyPageInfoConnectionModel(Acanthus acanthus) { - init(acanthus); - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // アカウント情報の取得API - public void getAccountByUid(MutableLiveData mUidText) { - final AccountsRest accountsRest = retrofit.create(AccountsRest.class); - mUidText.setValue(acanthus.getPreferenceUid().toString()); - - - //Todo: なんもわからん -// String uid = acanthus.getPreferenceUid().toString(); -// String token = acanthus.getPreferenceToken(); -// -// Call call = accountsRest.getAccountByUid(uid, token); -// -// call.enqueue(new Callback() { -// @Override -// public void onResponse(Call call, Response response) { -// if (response.isSuccessful()) { -// Account resAccount = response.body(); -// mUidText.setValue(acanthus.getPreferenceUid().toString()); -// } -// } -// -// @Override -// public void onFailure(Call call, Throwable t) { -// -// } -// }); - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // 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/MyPageModelContainer.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java index 7a641b3..41eb559 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 @@ -1,6 +1,8 @@ package org.ntlab.acanthus_client.views.main_menu_ui.mypage; import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.views.main_menu_ui.mypage.model.Invited.InvitedConnectionModel; +import org.ntlab.acanthus_client.views.main_menu_ui.mypage.model.MyPageInfoConnectionModel; //----------------------------------------------------------------- // diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java new file mode 100644 index 0000000..e8548a4 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java @@ -0,0 +1,108 @@ +package org.ntlab.acanthus_client.views.main_menu_ui.mypage.model.Invited; + +import androidx.lifecycle.MutableLiveData; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.entities.Work; +import org.ntlab.acanthus_client.resources.accounts.InvitedRest; +import org.ntlab.acanthus_client.resources.accounts.WorkRest; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + +//----------------------------------------------------------------- +// 招待されているかの問い合わせAPI +public class InvitedConnectionModel { + + private Retrofit retrofit; + private Acanthus acanthus; + //----------------------------------------------------------------- + private Boolean isInvited; + + //----------------------------------------------------------------- + // setter + private void setIsInvited(Boolean isInvited) { + this.isInvited = isInvited; + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // + public InvitedConnectionModel(Acanthus acanthus) { + init(acanthus); + } + + //----------------------------------------------------------------- + // 招待確認 + public void checkInvited(MutableLiveData mIsInvited) { + final InvitedRest invitedRest = retrofit.create(InvitedRest.class); + int dummyId = 2; + + Call call = invitedRest.checkAccountInvited(dummyId, acanthus.getAid()); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) + mIsInvited.setValue(response.body()); + } + + @Override + public void onFailure(Call call, Throwable t) { + + } + }); + + } + + //----------------------------------------------------------------- + // 招待されているリストの取得API + public void getAccountInvitedList(){ + + } + + + //----------------------------------------------------------------- + // 招待承認 + public void acceptInvite() { + final WorkRest workRest = retrofit.create(WorkRest.class); + int dummy = 1111; + + + // 作品への参加 + // 自身のID, token, 該当作品ID + // ToDo: Aidを外部から取得する必要あり? -> AccountのInviteMapから任意の + // ToDo: getAidを招待一覧画面で更新してから取得すれば変更しなくてよさそう + + + + Call call = workRest.updateWork(acanthus.getPreferenceUid(), acanthus.getPreferenceToken(), dummy); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + } + + @Override + public void onFailure(Call call, Throwable t) { + + } + }); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // 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/model/MyPageInfoConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/MyPageInfoConnectionModel.java new file mode 100644 index 0000000..9edeefc --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/MyPageInfoConnectionModel.java @@ -0,0 +1,77 @@ +package org.ntlab.acanthus_client.views.main_menu_ui.mypage.model; + +import android.text.method.ReplacementTransformationMethod; + +import androidx.lifecycle.MutableLiveData; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.databinding.ActivityAnimationBinding; +import org.ntlab.acanthus_client.entities.Account; +import org.ntlab.acanthus_client.resources.accounts.AccountsRest; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + +//----------------------------------------------------------------- +// マイページ情報の通信API (Follow, Followerの取得時に本格的に使うかも) +public class MyPageInfoConnectionModel { + + private Acanthus acanthus; + private Retrofit retrofit; + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // + public MyPageInfoConnectionModel(Acanthus acanthus) { + init(acanthus); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // アカウント情報の取得API + public void getAccountByUid(MutableLiveData mUidText) { + final AccountsRest accountsRest = retrofit.create(AccountsRest.class); + mUidText.setValue(acanthus.getPreferenceUid().toString()); + + + //Todo: なんもわからん +// String uid = acanthus.getPreferenceUid().toString(); +// String token = acanthus.getPreferenceToken(); +// +// Call call = accountsRest.getAccountByUid(uid, token); +// +// call.enqueue(new Callback() { +// @Override +// public void onResponse(Call call, Response response) { +// if (response.isSuccessful()) { +// Account resAccount = response.body(); +// mUidText.setValue(acanthus.getPreferenceUid().toString()); +// } +// } +// +// @Override +// public void onFailure(Call call, Throwable t) { +// +// } +// }); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // 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/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index 008dfce..7e63410 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 @@ -4,6 +4,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/res/layout/activity_paint.xml b/app/src/main/res/layout/activity_paint.xml index dd0e520..7259018 100644 --- a/app/src/main/res/layout/activity_paint.xml +++ b/app/src/main/res/layout/activity_paint.xml @@ -49,7 +49,7 @@ android:backgroundTint="#F4D5D5" android:onClick="onClickAddPage" android:text="pageNo" - android:textColor="#000000" + android:textColor="#FFFFFF" app:iconTint="#C88B8B" app:layout_constraintBottom_toTopOf="@+id/button_clear" app:layout_constraintEnd_toStartOf="@+id/button_Invite"