diff --git a/.idea/misc.xml b/.idea/misc.xml index 658b7fd..213d936 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,37 +3,6 @@ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 45eb023..993f4ef 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,6 +36,10 @@ + + + + uidList = new ArrayList<>(); + private ArrayList uid = new ArrayList<>(); //----------------------------------------------------------------- public EditorJson() { @@ -13,13 +14,13 @@ //----------------------------------------------------------------- // getter - public ArrayList getUidList() { - return uidList; + public Collection getUid() { + return uid; } //----------------------------------------------------------------- // setter - public void addUid(Integer uid) { - this.uidList.add(uid); + public void setAid(ArrayList uid) { + this.uid = uid; } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/InvitesRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/InvitesRest.java index fc9ced3..ee28858 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/InvitesRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/InvitesRest.java @@ -1,6 +1,7 @@ package org.ntlab.acanthus_client.resources.gallery; import org.ntlab.acanthus_client.entities.Account; +import org.ntlab.acanthus_client.entities.InvitesJson; import java.util.Collection; @@ -18,7 +19,7 @@ //----------------------------------------------------------------- @GET("gallery/{aid}/invites") - Call> isGalleryInvites( + Call isGalleryInvites( @Path("aid") Integer aid, @Query("invited") String invitedUid, @Query("invitedUserToken") String invitedUserToken, @@ -29,7 +30,7 @@ @FormUrlEncoded @PUT("gallery/{aid}/invites") - Call addInvite( + Call addInvite( @Path("aid") Integer aid, @Field("ownerUid") String ownerUid, @Field("invitedUid") String invitedUid, diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java index 25d437a..9a275da 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java @@ -43,6 +43,7 @@ //ボタン系 private boolean buttonView = true; + private boolean player = true; private Button buttonPlayback; private Button buttonReset; private Button buttonClose; @@ -82,12 +83,7 @@ buttonPlayback = findViewById(R.id.button_playback); buttonPlayback.setOnClickListener(new View.OnClickListener(){ public void onClick(View v) { - if(onClickPlayback()){ - buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_play_arrow)); - } - else { - buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_pause)); - } + onClickPlayback(); } }); @@ -128,6 +124,7 @@ buttonDetail = findViewById(R.id.button_detail); buttonDetail.setOnClickListener(new View.OnClickListener(){ public void onClick(View v) { + if(player) onClickPlayback(); Intent intent = new Intent(AnimationActivity.this, AnimationDetailActivity.class); intent.putExtra("AnimationJsonData", animationJson); startActivity(intent); @@ -220,19 +217,21 @@ } //アニメーションの再生停止 - public boolean onClickPlayback(){ + public void onClickPlayback(){ if(timer != null){ //timerの終了 timer.cancel(); timer = null; - return true; + buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_play_arrow)); + player = false; } else{ //timerの生成 this.timer = new Timer(); this.timerTask = new CountUpTimerTask(); this.timer.schedule(timerTask,0, this.msec);//スケジュールを100ms毎に設定する。 - return false; + buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_pause)); + player = true; } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java index d5d059f..a45f7fc 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java @@ -39,7 +39,7 @@ final StrokesRest strokesRest = retrofit.create(StrokesRest.class); // 筆跡追加API - Call> call = strokesRest.getPageUrls(1111); + Call> call = strokesRest.getPageUrls(acanthus.getAid()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { 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 f78cae3..250f5b3 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 @@ -41,6 +41,7 @@ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTheme(R.style.AppTheme_NoTitleBar);//タイトルバーを消す init(); } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java index 82babd0..7eb1d91 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java @@ -30,6 +30,7 @@ private CreateViewModel createViewModel; private FragmentCreateBinding binding; private HomeViewModel homeViewModel; + private Acanthus acanthus; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -57,7 +58,7 @@ Integer uid = 1; String token = "abc0"; - Acanthus acanthus = (Acanthus) getActivity().getApplication(); + acanthus = (Acanthus) getActivity().getApplication(); appButton.setOnClickListener(v -> { //Integer uid = acanthus.getPreferenceUid(); String name = ((EditText)view.findViewById(R.id.AnimationNameCreate)).getText().toString(); @@ -81,6 +82,7 @@ private void transitionPaintActivity() { Acanthus acanthus = (Acanthus) getActivity().getApplication(); Intent intent = new Intent(acanthus, PaintActivity.class); + homeViewModel.updateGallery(acanthus); // ギャラリーをアップデート startActivity(intent); } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java index c192d57..ad02038 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java @@ -47,7 +47,8 @@ private EditViewModel editViewModel; private FragmentEditBinding binding; - private ArrayList aidList; + private ArrayList userAidList; + private ArrayList aidList = new ArrayList<>(); private ArrayList AnimationJsonList; private ArrayList nameList; private ArrayList lastUpDateList; @@ -86,7 +87,7 @@ Integer uid = 1; String token = "abc0"; editViewModel.getWorkList(uid, token); - aidList = new ArrayList<>(); + userAidList = new ArrayList<>(); nameList = new ArrayList<>(); lastUpDateList = new ArrayList<>(); AnimationJsonList = new ArrayList<>(); @@ -98,6 +99,8 @@ ListView listView = (ListView) getActivity().findViewById(R.id.list_view); listView.addHeaderView(header); + homeViewModel.updateGallery(acanthus); // ギャラリーをアップデート + // SwipeRefreshLayoutを作成 createSwipeRefreshLayout(); @@ -106,23 +109,22 @@ //listViewの表示をしている @Override public void onChanged(@Nullable WorkJson workJson) { - aidList = (ArrayList) editViewModel.getWorkJson().getValue().getAid(); + userAidList = (ArrayList) editViewModel.getWorkJson().getValue().getAid(); AnimationJsonList = (ArrayList) acanthus.getAnimationJsonList(); - ArrayList workList = new ArrayList<>(); + HashMap workList = new HashMap<>(); if(AnimationJsonList != null){ - for(int i=0; i entry : list_entries) { lastUpDateList.add(entry.getValue()); nameList.add(nameHashMap.get(entry.getKey())); + aidList.add(entry.getKey()); } //-------------------------------------------------------------------------------------------------------------------- @@ -150,7 +153,7 @@ listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int position, long id) { - transitionPaintActivity(workList.get(position-1)); + transitionPaintActivity(aidList.get(position-1)); } }); } @@ -185,16 +188,16 @@ //----------------------------------------------------------------- // 画面遷移 private void transitionPaintActivity() { - acanthus = (Acanthus) getActivity().getApplication(); + Acanthus acanthus = (Acanthus) getActivity().getApplication(); Intent intent = new Intent(acanthus, PaintActivity.class); startActivity(intent); } //各作品毎の画面遷移 - private void transitionPaintActivity(AnimationJson animationJson) { - acanthus = (Acanthus) getActivity().getApplication(); + private void transitionPaintActivity(Integer aid) { + Acanthus acanthus = (Acanthus) getActivity().getApplication(); Intent intent = new Intent(acanthus, PaintActivity.class); - acanthus.setAid(animationJson.getAid()); + acanthus.setAid(aid); startActivity(intent); } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java index cc7bb55..48173c3 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java @@ -51,8 +51,6 @@ View root = binding.getRoot(); ListView listView = binding.animationView; - -// homeViewModel.updateGallery(); // // final TextView textView = binding.textHome; // homeViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { @@ -82,7 +80,7 @@ // SwipeRefreshLayoutを作成 createSwipeRefreshLayout(); - homeViewModel.updateGallery(acanthus); + updateGallery(); homeViewModel.getAnimationJson().observe(getViewLifecycleOwner(), new Observer>() { @Override @@ -156,7 +154,7 @@ // ひっぱり更新の処理 @Override public void onRefresh() { - homeViewModel.updateGallery(acanthus); + updateGallery(); mSwipeRefreshLayout.setRefreshing(false); } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteActivity.java index 2ad1829..6e9bee7 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteActivity.java @@ -8,16 +8,35 @@ import android.widget.ListView; import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.entities.Account; +import org.ntlab.acanthus_client.entities.AccountJson; +import org.ntlab.acanthus_client.entities.EditorJson; +import org.ntlab.acanthus_client.entities.FollowerJson; +import org.ntlab.acanthus_client.entities.InvitesJson; +import org.ntlab.acanthus_client.entities.WorkJson; +import org.ntlab.acanthus_client.views.main_menu_ui.edit.EditViewModel; -public class InviteActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { +import java.util.ArrayList; +import java.util.Collection; + +public class InviteActivity extends AppCompatActivity { private InviteViewModel inviteViewModel; - private static final String[] scenes = { - "UserName", - }; + private Integer aid; + private Integer uid; + private Integer invitedUid; + private String ownerToken; + private Acanthus acanthus; + private ArrayList followersUidList = new ArrayList<>(); + private ArrayList followersNameList = new ArrayList<>(); + private ArrayList collectionAccountUid = new ArrayList<>(); + private EditorJson editorJson; + private InvitesJson invitedUidList; + private Integer followersNameIndex; //----------------------------------------------------------------- @Override @@ -27,32 +46,80 @@ setContentView((R.layout.activity_invite)); // ListViewのインスタンスを生成 ListView listView = findViewById(R.id.list_view); + Acanthus acanthus = (Acanthus) getApplication(); + inviteViewModel = new ViewModelProvider(this).get(InviteViewModel.class); + aid = acanthus.getAid(); + uid = 1; + ownerToken = acanthus.getPreferenceToken(); - // BaseAdapter を継承したadapterのインスタンスを生成 - // レイアウトファイル list.xml を activity_main.xml に - // inflate するためにadapterに引数として渡す - BaseAdapter adapter = new ListViewAdapter(this.getApplicationContext(), R.layout.list, scenes); - // ListViewにadapterをセット - listView.setAdapter(adapter); + //フォロワー情報を取得する + inviteViewModel.startFollowersUidJson(uid, aid, ownerToken); + inviteViewModel.getFollowerUidJson().observe(this, new Observer() { + @Override + public void onChanged(FollowerJson followerUidJson) { + followersUidList = inviteViewModel.getFollowerUidJson().getValue().getFollowerUids(); + followersNameList = inviteViewModel.getFollowerUidJson().getValue().getFollowerNames(); + inviteViewModel.startGalleryInvites(aid, ownerToken); + } + }); - // クリックリスナーをセット - listView.setOnItemClickListener(this); + //すべての招待情報を取得する + inviteViewModel.getInvitesJson().observe(this, new Observer() { + @Override + public void onChanged(InvitesJson collectionAccount) { + invitedUidList = inviteViewModel.getInvitesJson().getValue(); + + inviteViewModel.startGalleryEditors(aid); + } + }); + + inviteViewModel.getEditorJson().observe(this, new Observer() { + @Override + public void onChanged(EditorJson collectionAccount) { + editorJson = inviteViewModel.getEditorJson().getValue(); + + if(editorJson != null){ + for(Integer editorUid : editorJson.getUid()){ + followersNameIndex = followersUidList.indexOf(editorUid); + followersUidList.remove(editorUid); + followersNameList.remove(followersNameIndex); + } + } + + if(invitedUidList != null){ + for(Integer invitedUid : invitedUidList.getInvites()){ + followersNameList.remove(followersUidList.indexOf(invitedUid)); + followersUidList.remove(invitedUid); + } + } + + // BaseAdapter を継承したadapterのインスタンスを生成 + // レイアウトファイル list.xml を activity_main.xml に + // inflate するためにadapterに引数として渡す + BaseAdapter adapter = new ListViewAdapter(getApplication(), R.layout.invites_list, followersNameList); + + // ListViewにadapterをセット + listView.setAdapter(adapter); + + listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView adapterView, View view, int position, long id) { + invitedUid = followersUidList.get(position); + inviteViewModel.addInvite(aid, uid.toString(), invitedUid.toString(), ownerToken); + } + }); + } + }); + + inviteViewModel.getMessage().observe(this, new Observer() { + @Override + public void onChanged(Boolean message) { + finish(); + } + }); } - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - Intent intent = new Intent( - this.getApplicationContext(), PaintActivity.class); - - // clickされたpositionのtextとphotoのID - String selectedText = scenes[position]; - // インテントにセット - intent.putExtra("Text", selectedText); - - // SubActivityへ遷移 - startActivity(intent); - } //----------------------------------------------------------------- // init @@ -60,4 +127,4 @@ Acanthus acanthus = (Acanthus) getApplication(); inviteViewModel = new ViewModelProvider(this).get(InviteViewModel.class); } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java index 7de98da..5fda98b 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java @@ -1,8 +1,167 @@ package org.ntlab.acanthus_client.views.paint; +import android.util.Log; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.entities.Account; +import org.ntlab.acanthus_client.entities.AccountJson; +import org.ntlab.acanthus_client.entities.AidJson; +import org.ntlab.acanthus_client.entities.Animation; +import org.ntlab.acanthus_client.entities.AnimationJson; +import org.ntlab.acanthus_client.entities.EditorJson; +import org.ntlab.acanthus_client.entities.FollowerJson; +import org.ntlab.acanthus_client.entities.InvitesJson; +import org.ntlab.acanthus_client.resources.accounts.AccountsRest; +import org.ntlab.acanthus_client.resources.accounts.FollowersRest; +import org.ntlab.acanthus_client.resources.gallery.EditorsRest; +import org.ntlab.acanthus_client.resources.gallery.GalleryRest; +import org.ntlab.acanthus_client.resources.gallery.InvitesRest; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; + public class InviteViewModel extends ViewModel { + private MutableLiveData followersUidJsonMutableLiveData; + private MutableLiveData> collectionAccountJsonMutableLiveData; + private MutableLiveData collectionInvitesJsonMutableLiveData; + private MutableLiveData messageMutableLiveData; + private MutableLiveData editorJsonMutableLiveData; -} + + public InviteViewModel() { + this.followersUidJsonMutableLiveData = new MutableLiveData<>(); + this.collectionAccountJsonMutableLiveData = new MutableLiveData<>(); + this.collectionInvitesJsonMutableLiveData = new MutableLiveData<>(); + this.messageMutableLiveData = new MutableLiveData<>(); + this.editorJsonMutableLiveData = new MutableLiveData<>(); + } + + public LiveData getFollowerUidJson() { + return this.followersUidJsonMutableLiveData; + } + + public LiveData> getCollectionAccountJson() { + return this.collectionAccountJsonMutableLiveData; + } + + public LiveData getInvitesJson() { + return this.collectionInvitesJsonMutableLiveData; + } + + public LiveData getMessage() { + return this.messageMutableLiveData; + } + + public LiveData getEditorJson() { + return this.editorJsonMutableLiveData; + } + + public void startFollowersUidJson(Integer uid, Integer aid, String ownerToken){ + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + final FollowersRest followersRest = retrofit.create(FollowersRest.class); + Call call = followersRest.getFollowers(uid); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()){ + if (response.body() != null) { + followersUidJsonMutableLiveData.setValue(response.body()); + } + } + } + + @Override + public void onFailure(Call call, Throwable t) { + startGalleryInvites(aid, ownerToken); + } + }); + } + + public void startGalleryInvites(Integer aid, String ownerToken){ + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + final InvitesRest invitesRest = retrofit.create(InvitesRest.class); + Call call = invitesRest.isGalleryInvites(aid, null, null, ownerToken); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()){ + if (response.body() != null) { + collectionInvitesJsonMutableLiveData.setValue(response.body()); + } + } + } + + @Override + public void onFailure(Call call, Throwable t) { + startGalleryEditors(aid); + } + }); + } + + public void startGalleryEditors(Integer aid){ + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + final EditorsRest invitesRest = retrofit.create(EditorsRest.class); + Call call = invitesRest.getEditors(aid); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()){ + if (response.body() != null) { + editorJsonMutableLiveData.setValue(response.body()); + } + } + } + + @Override + public void onFailure(Call call, Throwable t) { + editorJsonMutableLiveData.setValue(null); + } + }); + } + + + public void addInvite(Integer aid, String ownerUid, String invitedUid, String ownerToken){ + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + final InvitesRest invitesRest = retrofit.create(InvitesRest.class); + Call call = invitesRest.addInvite(aid, ownerUid, invitedUid, ownerToken); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()){ + if (response.body() != null) { + messageMutableLiveData.setValue(response.body()); + } + } + } + + @Override + public void onFailure(Call call, Throwable t) { + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java index c4c0adf..e3d1bf5 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java @@ -9,6 +9,9 @@ import org.ntlab.acanthus_client.R; +import java.util.ArrayList; +import java.util.Collection; + public class ListViewAdapter extends BaseAdapter { static class ViewHolder { @@ -17,16 +20,16 @@ private LayoutInflater inflater; private int itemLayoutId; - private String[] titles; + private ArrayList titles = new ArrayList<>(); private int[] ids; ListViewAdapter(Context context, int itemLayoutId, - String[] scenes) { + ArrayList collectionAccountName) { super(); this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); this.itemLayoutId = itemLayoutId; - this.titles = scenes; + this.titles = collectionAccountName; } @Override @@ -38,7 +41,7 @@ convertView = inflater.inflate(itemLayoutId, parent, false); // ViewHolder を生成 holder = new ViewHolder(); - holder.textView = convertView.findViewById(R.id.textView); + holder.textView = convertView.findViewById(R.id.textViewInvitesName); convertView.setTag(holder); } // holder を使って再利用 @@ -47,7 +50,7 @@ } // 現在の position にあるファイル名リストを holder の textView にセット - holder.textView.setText(titles[position]); + holder.textView.setText(titles.get(position)); return convertView; } @@ -55,7 +58,7 @@ @Override public int getCount() { // texts 配列の要素数 - return titles.length; + return titles.size(); } @Override @@ -67,4 +70,4 @@ public long getItemId(int position) { return 0; } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java index a014d0c..0fa352e 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java @@ -50,15 +50,15 @@ String token = "abc0"; int dummyAid = 1111; - Call call = invitesRest.addInvite(dummyAid, owner.toString(), invitedUid.toString(), token); - call.enqueue(new Callback() { + Call call = invitesRest.addInvite(dummyAid, owner.toString(), invitedUid.toString(), token); + call.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()) ; } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { } }); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java index 8d4d1fa..25744bb 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java @@ -32,6 +32,7 @@ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTheme(R.style.AppTheme_NoTitleBar);//タイトルバーを消す init(); } diff --git a/app/src/main/res/layout/activity_login_screen.xml b/app/src/main/res/layout/activity_login_screen.xml index ff13fca..9ec0573 100644 --- a/app/src/main/res/layout/activity_login_screen.xml +++ b/app/src/main/res/layout/activity_login_screen.xml @@ -51,7 +51,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textEmailAddress" - android:text="d0@dummy.com" /> + android:text="d0@dummy.com" + android:textColor="@color/black"/> @@ -82,7 +83,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textPassword" - android:text="nittalab" /> + android:text="nittalab" + android:textColor="@color/black"/> @@ -115,6 +117,7 @@ android:gravity="center|center_vertical" android:onClick="onClickSignUp" android:text="新規登録はこちら" + android:textColor="@color/black" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index 34e086d..3300896 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -50,7 +50,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textPersonName" - android:text="name" /> + android:text="name" + android:textColor="@color/black"/> @@ -81,7 +82,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textEmailAddress" - android:text="d0@dummy.com" /> + android:text="d0@dummy.com" + android:textColor="@color/black"/> @@ -112,7 +114,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textPassword" - android:text="nittalab" /> + android:text="nittalab" + android:textColor="@color/black"/> @@ -145,7 +148,8 @@ android:gravity="center|center_vertical" android:onClick="onClickAlreadyLoggedIn" android:text="ログインはこちら" - android:textStyle="bold" /> + android:textStyle="bold" + android:textColor="@color/black"/>