WebSVN – Android Microlearning - Nuevo Interface – Diff – /app/src/main/java/com/cesams/twogetskills/fragment/WelcomeFragment.java

 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.cesams.twogetskills.entity.Progress;
 import com.cesams.twogetskills.entity.Slide;
 import com.cesams.twogetskills.entity.Topic;
 import com.cesams.twogetskills.library.MD5;
 import com.cesams.twogetskills.skeleton.ITwoGetSkills;
+import com.cesams.twogetskills.viewdata.SlideRefreshUIViewData;
+import com.cesams.twogetskills.viewmodel.SlideRefreshUIViewModel;
 import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.Calendar;
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link WelcomeFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class WelcomeFragment extends Fragment implements LifecycleOwner {
+public class WelcomeFragment extends Fragment implements TabsCapsulesAdapter.ClickListener, LifecycleOwner {
     TextView username, titulotarjeta, progresoporcentaje, empezar; ProgressBar progresotarjeta;
     private ITwoGetSkills iTwoGetSkills; View card;
     ArrayList<HashMap<String, String>> capsuleList;
     ImageView imagetarjeta;
     TabsCapsulesAdapter adapter2;
     RecyclerView categorizados;
     EditText busqueda; TextView textowelcome; Button continuar;
+    TabLayout tabs; String tabactual="pendientes";     private SlideRefreshUIViewModel mSlideRefreshUi;
     TabLayout tabs; String tabactual="pendientes";
     public WelcomeFragment() {
         textowelcome= view.findViewById(R.id.textView15);
         busqueda=view.findViewById(R.id.busqueda);
         card= view.findViewById(R.id.include); empezar= view.findViewById(R.id.titlenotifi); tabs=view.findViewById(R.id.tabLayout);
         capsuleList = new ArrayList<>();
+        mSlideRefreshUi = new ViewModelProvider(requireActivity()).get(SlideRefreshUIViewModel.class);
         //Tarjeta Principal
         titulotarjeta = view.findViewById(R.id.description); progresotarjeta= view.findViewById(R.id.progressBar2); imagetarjeta= view.findViewById(R.id.imagelist);
+            }
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                Log.e("El texto","buscado: "+s);
+            //    Log.e("El texto","buscado: "+s);
                 capsuleList.clear();
                 adapter2.notifyDataSetChanged();
         GridLayoutManager layoutcategoria = new GridLayoutManager(getContext(),1,GridLayoutManager.VERTICAL, false);
         categorizados.setLayoutManager(layoutcategoria);
         categorizados.setAdapter(adapter2);
         adapter2.setClickListener(this);
         categorizados.setOnFlingListener(new RecyclerView.OnFlingListener() {
             @Override
             public boolean onFling(int velocityX, int velocityY) {
                 if (categorizados.canScrollVertically(-1) ) {
-                    Log.e("Se activa", "On fling");
+                   // Log.e("Se activa", "On fling");
     public void onResume() {
         super.onResume();
         loadContinuecard();
+    }
     @Override
     public void onHiddenChanged(boolean hidden) {
         super.onHiddenChanged(hidden);
-        Log.e("TAG", "onHiddenChanged : " + (hidden ? "true" : "false"));
+       // Log.e("TAG", "onHiddenChanged : " + (hidden ? "true" : "false"));
+        }
+    }
     private void loadContinuecard(){
-        Log.e("Cargo datos"," en tarjeta principal");
+      //  Log.e("Cargo datos"," en tarjeta principal");
         //Capsula de primera tarjeta
+        CapsuleDao capsuleDao = iTwoGetSkills.getDatabase().getCapsuleDao();
-        CapsuleDao capsuleDao = iTwoGetSkills.getDatabase().getCapsuleDao();
+        Progress progress;
         ProgressDao progressDao = iTwoGetSkills.getDatabase().getProgressDao();
         Progress progress;
-        ProgressDao progressDao = iTwoGetSkills.getDatabase().getProgressDao();
+        Capsule capsulafinal = null;
         List<Capsule> dbCapsules= capsuleDao.selectAll();
         for(Capsule dbCapsule : dbCapsules)
+        {
             progress = progressDao.selectByCapsuleUuid(dbCapsule.getUuid());
             if (progress != null) {
                     if (progress.getProgress() < 100) {
-                        Log.e("Es menor"," a 100");
+                    //    Log.e("Es menor"," a 100");
                         titulotarjeta.setText(dbCapsule.getName());
-                        progresotarjeta.setVisibility(View.VISIBLE);
+                        titulotarjeta.setText(dbCapsule.getName());
-                        progresoporcentaje.setVisibility(View.VISIBLE);
+                        progresotarjeta.setVisibility(View.VISIBLE);
+        }
         if(titulotarjeta.getText().equals(""))
+        {
-            Log.e("Nombre","vacio");
+           // Log.e("Nombre","vacio");
                 progress = progressDao.selectByCapsuleUuid(dbCapsule.getUuid());
                 if (progress == null) {
-                        Log.e("Es nueva","");
+                      //  Log.e("Es nueva","");
                         titulotarjeta.setText(dbCapsule.getName());
                         progresotarjeta.setVisibility(View.INVISIBLE);
-                        progresoporcentaje.setVisibility(View.INVISIBLE);
-                        empezar.setText("Nueva");
+                        progresoporcentaje.setVisibility(View.INVISIBLE);
-                        continuar.setText("Ver cápsula");
+                        empezar.setText("Nueva");
                         continuar.setText("Ver cápsula");
                         iTwoGetSkills.getPreference().setCapsuleUuidActive(dbCapsule.getUuid());
-                        iTwoGetSkills.getPreference().setTopicUuidActive(dbCapsule.getTopicUuid());
+                        capsulafinal=dbCapsule;
+        }
+        Capsule finalCapsulafinal = capsulafinal;
         continuar.setOnClickListener(v -> {
             iTwoGetSkills.getPreference().setCapsuleUuidActive(finalCapsulafinal.getUuid());
                     capsule.setProgress(progress.getProgress());
                     m_li.put("view", String.valueOf(progress.getViewSlides()));
                     m_li.put("total", String.valueOf(progress.getTotalSlides()));
+                    m_li.put("progress", String.valueOf(progress.getProgress()));
-                    m_li.put("progress", String.valueOf(progress.getProgress()));
+                    m_li.put("completado",String.valueOf(progress.getCompleted()));
+                }
                 List<Slide> slides = slideDao.selectAllByCapsuleUuid(capsule.getUuid());
                 if (slides.isEmpty()) {
-                    Log.e("Capsula","Es omitida, no tiene slides");
+                  //  Log.e("Capsula","Es omitida, no tiene slides");
                 } else {
                                 capsuleList.add(m_li);
+                            }
                         }
-                    } else if (tabposition.equals("cursando") && progress != null && progress.getProgress() < 100) {
+                    } else if (tabposition.equals("cursando") && progress != null && progress.getProgress() < 100 && capsule.getCompleted()==0) {
                                 capsuleList.add(m_li);
+                            }
                         }
+                    } else if (tabposition.equals("finalizados") && progress != null && progress.getProgress() >= 100 && capsule.getCompleted()==1) {
                     } else if (tabposition.equals("finalizados") && progress != null && progress.getProgress() >= 100) {
                         if (buscar.equals("")) {
-                        if (buscar.equals("")) {
+                            //capsule.getCompleted();
                             capsuleList.add(m_li);
+        }
+    }
+    @Override
+    public void onItemClick(int position, View v) {
+        Log.e("Evento","del click"+position);
+        //Cambio de livedata en el Slide cuando se va alla.
+        SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUi.getSlideRefreshUIViewData();
+        slideRefreshUIViewData.setCapsuleUuidActiveViewData(capsuleList.get(position).get("uuid"));
+        iTwoGetSkills.getPreference().setCapsuleUuidActive(capsuleList.get(position).get("uuid"));
+        iTwoGetSkills.getPreference().setTopicUuidActive(capsuleList.get(position).get("topicuuid"));
+        iTwoGetSkills.invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
        // Log.e("Capsula","topic active"+mDataSet.get(viewHolder.getAbsoluteAdapterPosition()).get("topicuuid"));

Proyectos de Subversion Android Microlearning - Nuevo Interface

(root)/app/src/main/java/com/cesams/twogetskills/fragment/WelcomeFragment.java @ 17 – Rev 16 → 17