diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java index 28a99cb..b503b4c 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java @@ -85,6 +85,7 @@ public void onFailure(Call> call, Throwable t) { } + }); diff --git a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java index 80a5faa..0222576 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java @@ -5,7 +5,6 @@ public class PlayListManager{ int index = 0; ArrayList playlist = new ArrayList<>(); - ArrayList unplayedlist = new ArrayList<>(); //範囲内にある全てのvoicememoのリストを作成 public void addVoiceMemos(ArrayList voicememos){ for(int i = 0;i < voicememos.size(); i++) { @@ -23,18 +22,20 @@ public ArrayList getPlayList(){ return playlist; } - //まだ聞いていないvoicememoのリスト + + //次に聞くvoicememoを渡す public ArrayList getUnplayedList(){ - unplayedlist.remove(0); - for(int i = 0;i < unplayedlist.size(); i++) { - boolean exist = false; - for(int j= index;j < playlist.size(); j++){ - if(playlist.get(j).getVid().equals(unplayedlist.get(i).getVid())) - exist = true; - } - if(exist = false) - playlist.add(unplayedlist.get(i)); - } + ArrayList unplayedlist = new ArrayList<>(); + unplayedlist.add(playlist.get(index)); +// for(int i = 0;i < unplayedlist.size(); i++) { +// boolean exist = false; +// for(int j= index;j < playlist.size(); j++){ +// if(playlist.get(j).getVid().equals(unplayedlist.get(i).getVid())) +// exist = true; +// } +// if(exist = false) +// playlist.add(unplayedlist.get(i)); +// } // for(int i = index; i < playlist.size(); i++){ // unplayedlist.add(playlist.get(i)); // } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7bb78b0..31acee6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,6 +5,9 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#FFFFFF" + android:backgroundTint="@color/design_default_color_background" + android:foregroundTint="#FFFFFF" android:visibility="visible" tools:context=".MainActivity"> @@ -22,7 +25,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:menu="@menu/bottom_nav_menu" > + app:menu="@menu/bottom_nav_menu"> @@ -43,8 +46,11 @@ + + + + app:layout_constraintVertical_bias="0.968" /> \ No newline at end of file