Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client into Dialog(Category)

Fork: 0

nitta-lab-2020 / org.ntlab.amaryllis.client

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client into Dialog(Category) Conflicts: app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java Dialog(Category) master miyazaki1112_2 test test11/12
commit e78817db75d687f25f680b769f559cf9855607ad 2 parents 6abf24a + c087af4 h-fuji authored on 12 Nov 2020

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          88 ■■■■■
          app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
     private static final String TAG = MainActivity.class.getSimpleName();
    LocationManager locationManager;
    private ArrayList<LocationListener> listeners = new ArrayList<>();
    private HashMap<String ,Category> categories;
    private ArrayList<String> checkedList = new ArrayList<>();
    HashMap<Integer,String> menuItemMap = new HashMap<>();
    static HashMap<String ,Category> categories;
    ImageButton playbutton;
    ImageButton stopbutton;
    ImageButton skipbutton;
 
    public Category getCategory(String cid){
        return categories.get(cid);
    }
 
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
 
        //カテゴリーの数だけitemを定義
        int id=0;
        for(Category category : categories.values()){
            String name = category.getName();
            String cid = category.getcId();
            MenuItem newItem = menu.add(Menu.NONE, id, Menu.NONE, name);
            menuItemMap.put(newItem.getItemId(),cid);
            newItem.setCheckable(true);
            newItem.setChecked(true);
            checkedList.add(cid);
            id++;
        }
        return true;
    }
 
 
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        String cid = menuItemMap.get(item.getItemId());
 
        item.setChecked(!item.isChecked());
        if(item.isChecked()){
            checkedList.add(cid);
        }else{
            checkedList.remove(cid);
        }
        return super.onOptionsItemSelected(item);
    }
 
    public ArrayList getCheckedCidList() {
        return checkedList;
    }
    public static HashMap<String,Category> getCategories(){
        return categories;
    }
 
//
//    @Override
//    public boolean onCreateOptionsMenu(Menu menu) {
//        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
//
//        //カテゴリーの数だけitemを定義
//        int id=0;
//        for(Category category : categories.values()){
//            String name = category.getName();
//            String cid = category.getcId();
//            MenuItem newItem = menu.add(Menu.NONE, id, Menu.NONE, name);
//            menuItemMap.put(newItem.getItemId(),cid);
//            newItem.setCheckable(true);
//            newItem.setChecked(true);
//            checkedList.add(cid);
//            id++;
//        }
//        return true;
//    }
//
//
//    @Override
//    public boolean onOptionsItemSelected(MenuItem item) {
//        String cid = menuItemMap.get(item.getItemId());
//
//        item.setChecked(!item.isChecked());
//        if(item.isChecked()){
//            checkedList.add(cid);
//        }else{
//            checkedList.remove(cid);
//        }
//        return super.onOptionsItemSelected(item);
//    }
//
//    public ArrayList getCheckedCidList() {
//        return checkedList;
//    }
 
}
     private static final String TAG = MainActivity.class.getSimpleName();
     LocationManager locationManager;
     private ArrayList<LocationListener> listeners = new ArrayList<>();
+    private HashMap<String ,Category> categories;
+    private ArrayList<String> checkedList = new ArrayList<>();
+    HashMap<Integer,String> menuItemMap = new HashMap<>();
+    static HashMap<String ,Category> categories;
     ImageButton playbutton;
     ImageButton stopbutton;
     ImageButton skipbutton;
     public Category getCategory(String cid){
         return categories.get(cid);
     }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
+        //カテゴリーの数だけitemを定義
+        int id=0;
+        for(Category category : categories.values()){
+            String name = category.getName();
+            String cid = category.getcId();
+            MenuItem newItem = menu.add(Menu.NONE, id, Menu.NONE, name);
+            menuItemMap.put(newItem.getItemId(),cid);
+            newItem.setCheckable(true);
+            newItem.setChecked(true);
+            checkedList.add(cid);
+            id++;
+        }
+        return true;
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        String cid = menuItemMap.get(item.getItemId());
+        item.setChecked(!item.isChecked());
+        if(item.isChecked()){
+            checkedList.add(cid);
+        }else{
+            checkedList.remove(cid);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    public ArrayList getCheckedCidList() {
+        return checkedList;
+    }
+    public static HashMap<String,Category> getCategories(){
+        return categories;
+    }
+//
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
+//
+//        //カテゴリーの数だけitemを定義
+//        int id=0;
+//        for(Category category : categories.values()){
+//            String name = category.getName();
+//            String cid = category.getcId();
+//            MenuItem newItem = menu.add(Menu.NONE, id, Menu.NONE, name);
+//            menuItemMap.put(newItem.getItemId(),cid);
+//            newItem.setCheckable(true);
+//            newItem.setChecked(true);
+//            checkedList.add(cid);
+//            id++;
+//        }
+//        return true;
+//    }
+//
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        String cid = menuItemMap.get(item.getItemId());
+//
+//        item.setChecked(!item.isChecked());
+//        if(item.isChecked()){
+//            checkedList.add(cid);
+//        }else{
+//            checkedList.remove(cid);
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
+//
+//    public ArrayList getCheckedCidList() {
+//        return checkedList;
+//    }
 }

                Ignore Space
               Show notes
              View
            
          
          60 ■■■■■
          app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java
 public class PlayListManager{
    int index = 0;
    ArrayList<VoiceMemo> playlist = new ArrayList<>();
    ArrayList<VoiceMemo> unplayedlist = new ArrayList<>();
    //範囲内にある全てのvoicememoのリストを作成
    public void addVoiceMemos(ArrayList<VoiceMemo> voicememos){
        for(int i = 0;i < voicememos.size(); i++) {
            boolean exist = false;
    }
 
    //次に聞くvoicememoを渡す
    public ArrayList<VoiceMemo> getUnplayedList(){
        ArrayList<VoiceMemo> unplayedlist = new ArrayList<>();
        if (index != 0){
            index++;
 
//        next();
//        unplayedlist.clear();
//        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));
        }
        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));
//        }
        for(int i = index; i < playlist.size(); i++){
            unplayedlist.add(playlist.get(i));
        }
        return unplayedlist;
    }
   
    public VoiceMemo getNextVoicememo(){
        VoiceMemo result=getUnplayedList().remove(0);
        next();
        return result;
 
    }
 
    //次のvoicememoに移動する
    public void next() {
 public class PlayListManager{
     int index = 0;
     ArrayList<VoiceMemo> playlist = new ArrayList<>();
+    ArrayList<VoiceMemo> unplayedlist = new ArrayList<>();
     //範囲内にある全てのvoicememoのリストを作成
     public void addVoiceMemos(ArrayList<VoiceMemo> voicememos){
         for(int i = 0;i < voicememos.size(); i++) {
             boolean exist = false;
     }
     //次に聞くvoicememoを渡す
     public ArrayList<VoiceMemo> getUnplayedList(){
+        ArrayList<VoiceMemo> unplayedlist = new ArrayList<>();
+        if (index != 0){
+            index++;
+//        next();
+//        unplayedlist.clear();
+//        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));
         }
+        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));
+//        }
+        for(int i = index; i < playlist.size(); i++){
+            unplayedlist.add(playlist.get(i));
+        }
         return unplayedlist;
+    }
+    public VoiceMemo getNextVoicememo(){
+        VoiceMemo result=getUnplayedList().remove(0);
+        next();
+        return result;
     }
     //次のvoicememoに移動する
     public void next() {

Show line notes below