| Línea 23... |
Línea 23... |
| 23 |
import com.cesams.twogetskills.dao.DatabaseHelper;
|
23 |
import com.cesams.twogetskills.dao.DatabaseHelper;
|
| 24 |
import com.cesams.twogetskills.dao.ProgressDao;
|
24 |
import com.cesams.twogetskills.dao.ProgressDao;
|
| 25 |
import com.cesams.twogetskills.dao.SlideDao;
|
25 |
import com.cesams.twogetskills.dao.SlideDao;
|
| 26 |
import com.cesams.twogetskills.entity.Progress;
|
26 |
import com.cesams.twogetskills.entity.Progress;
|
| 27 |
import com.cesams.twogetskills.entity.Slide;
|
27 |
import com.cesams.twogetskills.entity.Slide;
|
| - |
|
28 |
|
| - |
|
29 |
|
| - |
|
30 |
|
| 28 |
import com.cesams.twogetskills.skeleton.ITwoGetSkills;
|
31 |
import com.cesams.twogetskills.skeleton.ITwoGetSkills;
|
| - |
|
32 |
import com.cesams.twogetskills.viewdata.SlideRefreshUIViewData;
|
| 29 |
import com.cesams.twogetskills.viewmodel.GalleryViewModel;
|
33 |
import com.cesams.twogetskills.viewmodel.GalleryViewModel;
|
| - |
|
34 |
import com.cesams.twogetskills.viewmodel.SlideRefreshUIViewModel;
|
| 30 |
import com.wajahatkarim3.easyflipviewpager.BookFlipPageTransformer2;
|
35 |
import com.wajahatkarim3.easyflipviewpager.BookFlipPageTransformer2;
|
| Línea 31... |
Línea 36... |
| 31 |
|
36 |
|
| 32 |
import java.util.List;
|
37 |
import java.util.List;
|
| Línea 39... |
Línea 44... |
| 39 |
private ImageButton mButtonNext;
|
44 |
private ImageButton mButtonNext;
|
| 40 |
private ImageButton mButtonPrevious;
|
45 |
private ImageButton mButtonPrevious;
|
| 41 |
private GalleryViewPageAdapter adapter;
|
46 |
private GalleryViewPageAdapter adapter;
|
| 42 |
private ITwoGetSkills iTwoGetSkills;
|
47 |
private ITwoGetSkills iTwoGetSkills;
|
| 43 |
private GalleryViewModel mGalleryViewModel;
|
48 |
private GalleryViewModel mGalleryViewModel;
|
| 44 |
boolean isnextfrombutton = false;
|
49 |
private SlideRefreshUIViewModel mSlideRefreshUIViewModel;
|
| Línea 45... |
Línea 50... |
| 45 |
|
50 |
|
| 46 |
|
51 |
|
| 47 |
@Override
|
52 |
@Override
|
| Línea 68... |
Línea 73... |
| 68 |
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
73 |
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
| 69 |
super.onViewCreated(view, savedInstanceState);
|
74 |
super.onViewCreated(view, savedInstanceState);
|
| 70 |
iTwoGetSkills = (ITwoGetSkills) getActivity();
|
75 |
iTwoGetSkills = (ITwoGetSkills) getActivity();
|
| Línea -... |
Línea 76... |
| - |
|
76 |
|
| 71 |
|
77 |
|
| 72 |
|
78 |
mSlideRefreshUIViewModel = new ViewModelProvider(requireActivity()).get(SlideRefreshUIViewModel.class);
|
| Línea 73... |
Línea 79... |
| 73 |
mGalleryViewModel = new ViewModelProvider(requireActivity()).get(GalleryViewModel.class);
|
79 |
mGalleryViewModel = new ViewModelProvider(requireActivity()).get(GalleryViewModel.class);
|
| 74 |
adapter = new GalleryViewPageAdapter(getActivity(), mGalleryViewModel.getSlideArrayList());
|
80 |
adapter = new GalleryViewPageAdapter(getActivity(), mGalleryViewModel.getSlideArrayList());
|
| Línea 92... |
Línea 98... |
| 92 |
|
98 |
|
| 93 |
|
99 |
|
| 94 |
Observer<ArrayList<Slide>> slideArrayListUpdateObserver = new Observer<ArrayList<Slide>>() {
|
100 |
Observer<ArrayList<Slide>> slideArrayListUpdateObserver = new Observer<ArrayList<Slide>>() {
|
| - |
|
101 |
@Override
|
| Línea 95... |
Línea -... |
| 95 |
@Override
|
- |
|
| 96 |
public void onChanged(ArrayList<Slide> slideArrayList) {
|
- |
|
| 97 |
|
- |
|
| Línea -... |
Línea 102... |
| - |
|
102 |
public void onChanged(ArrayList<Slide> slideArrayList) {
|
| - |
|
103 |
SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
|
| - |
|
104 |
|
| 98 |
if(DatabaseHelper.imagenviewerontrol.equals("SI")) {
|
105 |
|
| Línea 99... |
Línea 106... |
| 99 |
|
106 |
//if(DatabaseHelper.imagenviewerontrol.equals("SI")) {
|
| 100 |
adapter.notifyItemChanged(viewPager2.getCurrentItem());
|
107 |
if (slideRefreshUIViewData.isImagenViewerControl()) {
|
| Línea 101... |
Línea 108... |
| 101 |
|
108 |
adapter.notifyItemChanged(viewPager2.getCurrentItem());
|
| Línea 115... |
Línea 122... |
| 115 |
mButtonNext.setOnClickListener(new View.OnClickListener() {
|
122 |
mButtonNext.setOnClickListener(new View.OnClickListener() {
|
| 116 |
@Override
|
123 |
@Override
|
| 117 |
public void onClick(View view) {
|
124 |
public void onClick(View view) {
|
| 118 |
// Log.e("Gallery ViewPager2", "CurrentItem = " + viewPager2.getCurrentItem()+1 );
|
125 |
// Log.e("Gallery ViewPager2", "CurrentItem = " + viewPager2.getCurrentItem()+1 );
|
| 119 |
// Log.e("Gallery ViewPager2", "Size = " + mGalleryViewModel.getSlideArrayList().size() );
|
126 |
// Log.e("Gallery ViewPager2", "Size = " + mGalleryViewModel.getSlideArrayList().size() );
|
| - |
|
127 |
SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
|
| 120 |
isnextfrombutton = true;
|
128 |
slideRefreshUIViewData.setNextFromButton(true);
|
| - |
|
129 |
mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
|
| Línea 121... |
Línea 130... |
| 121 |
|
130 |
|
| 122 |
viewPager2.setCurrentItem(getItem(+1), true); //getItem(-1) for previous
|
131 |
viewPager2.setCurrentItem(getItem(+1), true); //getItem(-1) for previous
|
| 123 |
}
|
132 |
}
|
| Línea 127... |
Línea 136... |
| 127 |
|
136 |
|
| 128 |
mButtonPrevious.setOnClickListener(new View.OnClickListener() {
|
137 |
mButtonPrevious.setOnClickListener(new View.OnClickListener() {
|
| 129 |
@Override
|
138 |
@Override
|
| 130 |
public void onClick(View view) {
|
139 |
public void onClick(View view) {
|
| - |
|
140 |
// Log.d("Gallery ViewPager2", "CurrentItem = " + viewPager2.getCurrentItem() );
|
| 131 |
// Log.d("Gallery ViewPager2", "CurrentItem = " + viewPager2.getCurrentItem() );
|
141 |
SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
|
| - |
|
142 |
slideRefreshUIViewData.setNextFromButton(true);
|
| - |
|
143 |
mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
|
| 132 |
isnextfrombutton = true;
|
144 |
|
| Línea 133... |
Línea 145... |
| 133 |
viewPager2.setCurrentItem(getItem(-1), true);
|
145 |
viewPager2.setCurrentItem(getItem(-1), true);
|
| 134 |
|
146 |
|
| Línea 170... |
Línea 182... |
| 170 |
@Override
|
182 |
@Override
|
| 171 |
public void onResume() {
|
183 |
public void onResume() {
|
| 172 |
super.onResume();
|
184 |
super.onResume();
|
| Línea 173... |
Línea 185... |
| 173 |
|
185 |
|
| - |
|
186 |
iTwoGetSkills.getPreference().save(requireActivity());
|
| - |
|
187 |
|
| - |
|
188 |
SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
|
| - |
|
189 |
slideRefreshUIViewData.setResumenVisores(true);
|
| - |
|
190 |
mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
|
| 174 |
iTwoGetSkills.getPreference().save(requireActivity());
|
191 |
|
| Línea 175... |
Línea 192... |
| 175 |
DatabaseHelper.ResumenVisores="SI";
|
192 |
//DatabaseHelper.ResumenVisores="SI";
|
| Línea 176... |
Línea 193... |
| 176 |
|
193 |
|
| 177 |
Log.e("OnResumen"," Aqui llegue");
|
194 |
Log.e("OnResumen"," Aqui llegue");
|
| Línea 276... |
Línea 293... |
| 276 |
//Entrar a ver una pagina especifica que quieras ver de la lista, pero colisiona con el next and back buttons
|
293 |
//Entrar a ver una pagina especifica que quieras ver de la lista, pero colisiona con el next and back buttons
|
| 277 |
//viewPager2.setCurrentItem(position, false);
|
294 |
//viewPager2.setCurrentItem(position, false);
|
| Línea 278... |
Línea 295... |
| 278 |
|
295 |
|
| Línea 279... |
Línea 296... |
| 279 |
}
|
296 |
}
|
| Línea -... |
Línea 297... |
| - |
|
297 |
|
| - |
|
298 |
SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
|
| - |
|
299 |
|
| 280 |
|
300 |
|
| 281 |
Log.e("Lo que viene", " En el booleano: " + isnextfrombutton);
|
301 |
Log.e("Lo que viene", " En el booleano: " + slideRefreshUIViewData.isNextFromButton());
|
| 282 |
|
302 |
|
| Línea 283... |
Línea 303... |
| 283 |
if (!isnextfrombutton) {
|
303 |
if (!slideRefreshUIViewData.isNextFromButton()) {
|
| Línea 284... |
Línea 304... |
| 284 |
if (DatabaseHelper.CambioSlide.equals("SI")) {
|
304 |
if (slideRefreshUIViewData.isCambioSlide()) {
|
| 285 |
viewPager2.setCurrentItem(position, false);
|
305 |
viewPager2.setCurrentItem(position, false);
|
| 286 |
|
306 |
|
| 287 |
}
|
307 |
}
|
| 288 |
|
308 |
|
| 289 |
}
|
309 |
}
|
| Línea 290... |
Línea 310... |
| 290 |
//Cuando ejecuto los visores de capsula como el reproductor de video y regreso, me aseguro de marcar vista el slide
|
310 |
//Cuando ejecuto los visores de capsula como el reproductor de video y regreso, me aseguro de marcar vista el slide
|
| Línea -... |
Línea 311... |
| - |
|
311 |
if (slideRefreshUIViewData.isResumenVisores()) {
|
| - |
|
312 |
//viewPager2.setCurrentItem(position, false);
|
| - |
|
313 |
Log.e("Hago", "Lo de actualizar resumen");
|
| - |
|
314 |
adapter.notifyItemChanged(position);
|
| - |
|
315 |
|
| - |
|
316 |
|
| - |
|
317 |
}
|
| 291 |
if (DatabaseHelper.ResumenVisores.equals("SI")) {
|
318 |
|
| 292 |
//viewPager2.setCurrentItem(position, false);
|
319 |
|
| 293 |
Log.e("Hago", "Lo de actualizar resumen");
|
320 |
slideRefreshUIViewData.setCambioSlide(false);
|
| Línea -... |
Línea 321... |
| - |
|
321 |
slideRefreshUIViewData.setResumenVisores(false);
|
| - |
|
322 |
slideRefreshUIViewData.setNextFromButton(false);
|
| 294 |
adapter.notifyItemChanged(position);
|
323 |
mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
|
| 295 |
|
324 |
|
| 296 |
|
325 |
/*
|
| 297 |
}
|
326 |
DatabaseHelper.CambioSlide = "NO";
|
| 298 |
|
327 |
DatabaseHelper.ResumenVisores = "NO";
|
| 299 |
DatabaseHelper.CambioSlide = "NO";
|
328 |
isnextfrombutton = false;
|
| Línea -... |
Línea 329... |
| - |
|
329 |
|
| - |
|
330 |
*/
|
| - |
|
331 |
|
| 300 |
DatabaseHelper.ResumenVisores = "NO";
|
332 |
if (setValue) {
|
| 301 |
isnextfrombutton = false;
|
333 |
mGalleryViewModel.getSlideMutableLiveData().setValue(mGalleryViewModel.getSlideArrayList());
|