WebSVN – Android Microlearning – Diff – /app/src/main/java/com/cesams/twogetskills/fragment/GalleryFragment.java

 package com.cesams.twogetskills.fragment;
-import static androidx.viewpager2.widget.ViewPager2.SCROLL_STATE_IDLE;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import com.cesams.twogetskills.Constants;
-import com.cesams.twogetskills.R;
-import com.cesams.twogetskills.adapter.GalleryViewPageAdapter;
+import com.cesams.twogetskills.R;
-import com.cesams.twogetskills.dao.DatabaseHelper;
+import com.cesams.twogetskills.adapter.GalleryViewPageAdapter;
 import com.cesams.twogetskills.dao.ProgressDao;
 import com.cesams.twogetskills.dao.SlideDao;
-import com.cesams.twogetskills.entity.Progress;
-import com.cesams.twogetskills.entity.Slide;
 import com.cesams.twogetskills.entity.Progress;
-import com.cesams.twogetskills.room.ResultCount;
-import com.cesams.twogetskills.skeleton.ITwoGetSkills;
-import com.cesams.twogetskills.viewdata.GalleryRefreshUIViewData;
-import com.cesams.twogetskills.viewdata.SlideRefreshUIViewData;
+import com.cesams.twogetskills.entity.Slide;
-import com.cesams.twogetskills.viewmodel.GalleryRefreshUIViewModel;
+import com.cesams.twogetskills.skeleton.ITwoGetSkills;
 import com.cesams.twogetskills.viewmodel.GalleryViewModel;
 import com.cesams.twogetskills.viewmodel.SlideRefreshUIViewModel;
 import com.wajahatkarim3.easyflipviewpager.BookFlipPageTransformer2;
     private ImageButton mButtonNext;
     private ImageButton mButtonPrevious;
     private GalleryViewPageAdapter adapter;
     private ITwoGetSkills iTwoGetSkills;
     private GalleryViewModel mGalleryViewModel;
-    private SlideRefreshUIViewModel mSlideRefreshUIViewModel;
-    private GalleryRefreshUIViewModel mGalleryRefreshUIView;
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
         setHasOptionsMenu(true);
+    }
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         iTwoGetSkills = (ITwoGetSkills) getActivity();
-        mGalleryRefreshUIView = new ViewModelProvider(requireActivity()).get(GalleryRefreshUIViewModel.class);
         mSlideRefreshUIViewModel = new ViewModelProvider(requireActivity()).get(SlideRefreshUIViewModel.class);
         mGalleryViewModel = new ViewModelProvider(requireActivity()).get(GalleryViewModel.class);
-        adapter = new GalleryViewPageAdapter(requireActivity(), mGalleryViewModel.getSlideArrayList());
+        adapter = new GalleryViewPageAdapter(getActivity(), mGalleryViewModel.getSlideArrayList());
-        viewPager2 = getView().findViewById(R.id.fragment_gallery_viewpager2);
-        viewPager2.setAdapter(adapter);
-        // Create an object of page transformer
-        BookFlipPageTransformer2 bookFlipPageTransformer = new BookFlipPageTransformer2();
-        // Enable / Disable scaling while flipping. If true, then next page will scale in (zoom in). By default, its true.
-        bookFlipPageTransformer.setEnableScale(false);
-        // The amount of scale the page will zoom. By default, its 5 percent.
-        bookFlipPageTransformer.setScaleAmountPercent(10f);
-        // Assign the page transformer to the ViewPager2.
-        viewPager2.setPageTransformer(bookFlipPageTransformer);
+        viewPager2 = (ViewPager2) getView().findViewById(R.id.fragment_gallery_viewpager2);
         viewPager2.setAdapter(adapter);
 /*
         Observer<ArrayList<Slide>> slideArrayListUpdateObserver = new Observer<ArrayList<Slide>>() {
-            @Override
-            public void onChanged(ArrayList<Slide> slideArrayList) {
-                //Este metodo se ejecuta si el slide Array sufre cambios
             @Override
             public void onChanged(ArrayList<Slide> slideArrayList) {
-            }
-        };
-*/
+                adapter.notifyDataSetChanged();
+            }
-        //mGalleryViewModel.getSlideMutableLiveData().observe(requireActivity(),slideArrayListUpdateObserver);
+        };
-        mButtonNext = getView().findViewById(R.id.fragment_gallery_button_next);
+        mGalleryViewModel.getSlideMutableLiveData().observe(requireActivity(),slideArrayListUpdateObserver);
-        mButtonNext.setOnClickListener(new View.OnClickListener() {
+        mButtonNext = (ImageButton) getView().findViewById(R.id.fragment_gallery_button_next);
-            @Override
+        mButtonNext.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
+            @Override
-                SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
-                slideRefreshUIViewData.setNextFromButton(true);
+            public void onClick(View view) {
-                mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
+                Log.d("Gallery ViewPager2", "CurrentItem = " + viewPager2.getCurrentItem()  );
                 if(viewPager2.getCurrentItem() < (mGalleryViewModel.getSlideArrayList().size() - 1)) {
-                viewPager2.setCurrentItem(getItem(+1), true); //getItem(-1) for previous
+                    viewPager2.setCurrentItem(viewPager2.getCurrentItem() + 1);
-            }
+                }
-        });
+            }
-        mButtonPrevious = getView().findViewById(R.id.fragment_gallery_button_previous);
+        });
-        mButtonPrevious.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
+        mButtonPrevious = (ImageButton) getView().findViewById(R.id.fragment_gallery_button_previous);
+        mButtonPrevious.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.d("Gallery ViewPager2", "CurrentItem = " + viewPager2.getCurrentItem()  );
+                if(viewPager2.getCurrentItem() > 0 && mGalleryViewModel.getSlideArrayList().size() > 0 ) {
+                    viewPager2.setCurrentItem(viewPager2.getCurrentItem() - 1 );
+                }
+            }
+        });
-              //  Log.d("Gallery ViewPager2", "CurrentItem = " + viewPager2.getCurrentItem()  );
+        // Create an object of page transformer
+        BookFlipPageTransformer2 bookFlipPageTransformer = new BookFlipPageTransformer2();
                 SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
-                slideRefreshUIViewData.setNextFromButton(true);
+        // Enable / Disable scaling while flipping. If true, then next page will scale in (zoom in). By default, its true.
-                mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
+        bookFlipPageTransformer.setEnableScale(false);
-                viewPager2.setCurrentItem(getItem(-1), true);
+        // The amount of scale the page will zoom. By default, its 5 percent.
         bookFlipPageTransformer.setScaleAmountPercent(10f);
-            }
         });
         // Assign the page transformer to the ViewPager2.
-        viewPager2.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+        viewPager2.setPageTransformer(bookFlipPageTransformer);
-            @Override
-            public void onPageSelected(int position) {
-                super.onPageSelected(position);
-                Log.e("Seleccion","de pagina");
-              //  Log.d(TAG, "registerOnPageChangeCallback");
-                Slide mItem = mGalleryViewModel.getSlideArrayList().get(position);
-                Log.e("ONPageSelecte","aqui¡ "+mItem.getType());
-                iTwoGetSkills.setTitleActionBar(mItem.getName());
-                iTwoGetSkills.changeSlideActive(mItem.getUuid(), mItem.getType(), false);
-                //Resuelve el fix de pagina vista de imagenes no marcada
-                loadData(false);
-            @Override
-            public void onPageScrollStateChanged(int state) {
-                super.onPageScrollStateChanged(state);
+       // viewPager2.setPageTransformer(new ZoomOutPageTransformer());
-                SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
-                if (slideRefreshUIViewData.isImagenViewerControl() && state==ViewPager2.SCROLL_STATE_IDLE) {
-                    adapter.notifyItemChanged(viewPager2.getCurrentItem());
+        viewPager2.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override
             public void onPageSelected(int position) {
+                super.onPageSelected(position);
-            }
-        });
-        loadData(false);
+                Log.d(TAG, "registerOnPageChangeCallback");
                 Slide mItem = mGalleryViewModel.getSlideArrayList().get(position);
     private int getItem(int i) {
         return viewPager2.getCurrentItem() + i;
-    }
-    @Override
+                iTwoGetSkills.setTitleActionBar(mItem.getName());
-    public void onPause() {
+                iTwoGetSkills.changeSlideActive(mItem.getUuid(), mItem.getType(), false);
-        super.onPause();
-    }
                 loadData(true);
     @Override
-    public void onResume() {
+            }
+        });
-        super.onResume();
+    }
+    @Override
-        iTwoGetSkills.getPreference().save();
-        SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
-        slideRefreshUIViewData.setResumenVisores(true);
-        mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
-        loadData(true);
-    }
+    public void onResume() {
+        super.onResume();
-    @Override
-    public void onHiddenChanged(boolean hidden) {
+        Log.d(TAG, "onResume");
+        loadData(true);
-        super.onHiddenChanged(hidden);
-        adapter.notifyDataSetChanged();
+    }
-        iTwoGetSkills.getPreference().save();
     @Override
-        if(!hidden) {
+    public void onHiddenChanged(boolean hidden) {
-            loadData( false);
+        super.onHiddenChanged(hidden);
-        }
+        Log.d(TAG, "onHiddenChanged : " + (hidden ? "true" : "false"));
         if(!hidden) {
-    private void loadData( boolean background) {
+            loadData(true);
+        }
+    }
         GalleryRefreshUIViewData galleryRefreshUIViewData = mGalleryRefreshUIView.getGalleryRefreshUIViewData();
     private void loadData(boolean setValue) {
-        SlideDao slideDao = iTwoGetSkills.getDatabase().getSlideDao();
+        int fragmentIdxActive = iTwoGetSkills.getPreference().getFragmentIdxActive();
         Progress progress;
-        boolean showFinish = false;
+        if (fragmentIdxActive != Constants.IDX_FRAGMENT_GALLERY
-        List<Slide> dbSlides;
+            && fragmentIdxActive != Constants.IDX_FRAGMENT_SLIDES
-        ProgressDao progressDao = iTwoGetSkills.getDatabase().getProgressDao();
+        ) {
             return;
             slide.setFile(dbSlide.getFile());
             slide.setBackground(dbSlide.getBackground());
             slide.setPosition(dbSlide.getPosition());
-            if (slide.getUuid().equals(iTwoGetSkills.getSlideUuidActive())) {
+            if(slide.getUuid().equals(iTwoGetSkills.getSlideUuidActive())) {
                 position = i;
             }
-            progress = progressDao.selectBySlideUuid(slide.getUuid());
+            progress = progressDao.selectBySlideUuidAndUserUuid(slide.getUuid(), userUuid);
-            if (progress != null) {
+            if(progress != null) {
                 slide.setCompleted(progress.getCompleted());
             } else {
                 slide.setCompleted(0);
+            }
             slide.setShowFinish(showFinish);
-            i++;
-            mGalleryViewModel.getSlideArrayList().add(slide);
-        }
-           iTwoGetSkills.setTitleActionBar(mGalleryViewModel.getSlideArrayList().get(position).getName());
-            SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
-            if (!slideRefreshUIViewData.isNextFromButton()) {
-                if (slideRefreshUIViewData.isCambioSlide()) {
-                    viewPager2.setCurrentItem(position, false);
-                }
-            }
-            //Cuando ejecuto los visores de capsula como el reproductor de video y regreso, me aseguro de marcar vista el slide
-            if (slideRefreshUIViewData.isResumenVisores()) {
-                adapter.notifyItemChanged(viewPager2.getCurrentItem());
-            }
-            slideRefreshUIViewData.setCambioSlide(false);
+            i++;
-            slideRefreshUIViewData.setResumenVisores(false);
+            mGalleryViewModel.getSlideArrayList().add(slide);
+        }
+        Log.d(TAG, "slide position : " + position);
-            slideRefreshUIViewData.setNextFromButton(false);
-            mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
+       // if(setValue) {
             mGalleryViewModel.getSlideMutableLiveData().setValue(mGalleryViewModel.getSlideArrayList());
         //} else {

Proyectos de Subversion Android Microlearning

(root)/app/src/main/java/com/cesams/twogetskills/fragment/GalleryFragment.java – Rev 39 → 44