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

 import com.cesams.twogetskills.entity.UserLog;
 import com.cesams.twogetskills.preference.Preference;
 import com.cesams.twogetskills.receiver.ConnectivityReceiver;
 import com.cesams.twogetskills.receiver.InternalReceiver;
 import com.cesams.twogetskills.room.ResultCount;
+import com.cesams.twogetskills.viewdata.SlideRefreshUIViewData;
+import com.cesams.twogetskills.viewmodel.SlideRefreshUIViewModel;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.navigation.NavigationView;
 import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.widget.Toolbar;
-import androidx.appcompat.widget.Toolbar;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.room.Database;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.TimeZone;
 //import de.hdodenhof.circleimageview.CircleImageView;
 public class MainActivity extends  AppCompatActivity implements ITwoGetSkills,NavigationView.OnNavigationItemSelectedListener {
     private boolean isSyncDevice = false;
     private boolean isSyncToken = false;
     private boolean isSyncBatch = false;
     private boolean isForeground = false;
-    private boolean issmartlockloginrun = false;
+    private boolean isSmartLockLoginRun = false;
     private final static String PREFIX_FRAG = "FRAG";
     private final static String TAG = "C2GS - MainActivity";
     private ProgressBar mProgressBar;
     private Account mAccount;
+    private AppDatabase mAppDatabase;
-    private AppDatabase mAppDatabase;
+    private SlideRefreshUIViewModel mSlideRefreshUIViewModel;
         /**** CANAL DE NOTIFICACIONES **/
         createNotificationChannel();
         /*** CUENTAS DE SINCRONIZACION **/
-        mAccount =  CreateSyncAccount(this);
+        mAccount =  CreateSyncAccount(getApplicationContext());
+        // Get the content resolver for your app
-        // Get the content resolver for your app
+        //mResolver = getContentResolver();
-        //mResolver = getContentResolver();
         mAppDatabase = DatabaseHelper.getInstance(getApplicationContext()).getAppDatabase();
-        mAppDatabase = DatabaseHelper.getInstance(this).getAppDatabase();
         preference = Preference.getInstance(getApplicationContext());
-        preference = new Preference(this);
+        preference.load();
         navHeaderUserName = header.findViewById(R.id.nav_header_user_name);
         navHeaderUserEmail =  header.findViewById(R.id.nav_header_user_email);
+        textViewMessageNotConnection = findViewById(R.id.main_activity_text_view_message_not_connection);
+        mSlideRefreshUIViewModel = new ViewModelProvider(this).get(SlideRefreshUIViewModel.class);
         textViewMessageNotConnection = findViewById(R.id.main_activity_text_view_message_not_connection);
         mConnectivityReceiver = new ConnectivityReceiver();
         registerReceiver(mConnectivityReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
     @Override
     protected void onResume() {
         super.onResume();
         isForeground = true;
-        if(preference == null) {
+        preference = Preference.getInstance(getApplicationContext());
-            preference = new Preference(this);
-        }
+        preference.load();
         reloadNavHeader();
         Log.e("Se ejecuta", "On resumen");
         if(TextUtils.isEmpty(preference.getUserUuid())) {
             //Verifico que el teclado no vaya a relanzar el fragment de intro al usar Google Smartlock para traer
             //Informacion de inicio de sesion almacenada en su cuenta personal de Google
-            if (!issmartlockloginrun) {
+            if (!isSmartLockLoginRun) {
                 invokeFragment(Constants.IDX_FRAGMENT_INTRO);
     @Override
     protected void onPause() {
         super.onPause();
         isForeground = false;
+        preference.save();
+    }
+    /*
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        preference = Preference.getInstance(getApplicationContext());
+        preference.load();
+        if(TextUtils.isEmpty(preference.getUserUuid())) {
+            //Verifico que el teclado no vaya a relanzar el fragment de intro al usar Google Smartlock para traer
+            //Informacion de inicio de sesion almacenada en su cuenta personal de Google
+            if (!isSmartLockLoginRun) {
+                invokeFragment(Constants.IDX_FRAGMENT_INTRO);
+                isSmartLockLoginRun= true;
+            }
+        } else {
+            if(preference.getFragmentIdxActive() == 0) {
+                invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
+            } else {
+                invokeFragment(preference.getFragmentIdxActive());
+            }
+        }
         preference.save(this);
+    }
+    */
+    /*
+    @Override
+    protected void onStop() {
+        super.onStop();
+        preference.save();
+    }
     */
     @Override
     public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
         if(new_capsules > 0) {
             builder.setBadgeIconType(NotificationCompat.BADGE_ICON_LARGE);
             builder.setNumber(new_capsules);
+        }
-        Intent notificationIntent = new Intent(this, MainActivity.class);
+        Intent notificationIntent = new Intent(getApplicationContext(), MainActivity.class);
         notificationIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         //notification message will get at NotificationView
         notificationIntent.putExtra(title, body);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent,
+        PendingIntent pendingIntent = PendingIntent.getActivity(getApplicationContext(), 0, notificationIntent,
                 PendingIntent.FLAG_IMMUTABLE);
         builder.setContentIntent(pendingIntent);
             String message = new_capsules == 1
                     ? "Hay 1 cápsula nueva disponible"
                     : "Hay " + new_capsules + " cápsulas disponible";
-           // showMessageSnackBarWithClose(message);
+            showMessageSnackBarWithClose(message);
         } else {
-           // showMessageSnackBarWithClose(body);
+            showMessageSnackBarWithClose(body);
         preference.setCompanyCount(0);
         preference.setCompanyUuidActive("");
         preference.setTopicUuidActive("");
         preference.setCapsuleUuidActive("");
         preference.setSlideUuidActive("");
-        preference.save(this);
+        preference.save();
         invokeFragment(Constants.IDX_FRAGMENT_INTRO);
+    }
             case Constants.IDX_FRAGMENT_FINISH_TOPIC :
                 preference.setTopicUuidActive("");
                 preference.setCapsuleUuidActive("");
                 preference.setSlideUuidActive("");
-                preference.save(this);
+                preference.save();
                 invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
                 return;
             case Constants.IDX_FRAGMENT_FINISH_CAPSULE :
                 preference.setCapsuleUuidActive("");
                 preference.setSlideUuidActive("");
-                preference.save(this);
+                preference.save();
                 invokeFragment(Constants.IDX_FRAGMENT_CAPSULES);
     @Override
     public void createSyncRecordNewToken(String token)
+    {
         preference.setDeviceToken (token);
-        preference.save(this);
+        preference.save();
         if(!TextUtils.isEmpty(preference.getDeviceUuid())) {
             Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_FCM, token);
     public void invokeFragment(int fragmentIdxActiveNuevo)
+    {
         String fragmentKeyActual    = PREFIX_FRAG + preference.getFragmentIdxActive();
         String fragmentKeyNuevo 	= PREFIX_FRAG + fragmentIdxActiveNuevo;
         preference.setFragmentIdxActive(fragmentIdxActiveNuevo);
-        preference.save(this);
+        preference.save();
         Fragment fragment;
         if(!fragmentKeyActual.equalsIgnoreCase(fragmentKeyNuevo)) {
             if(fragmentHashMap.containsKey(fragmentKeyActual)) {
                 fragment = fragmentHashMap.get(fragmentKeyActual);
                 if(fragment != null) {
                     FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
                     fragmentTransaction.hide(fragment);
-                    fragmentTransaction.commit();
+                    fragmentTransaction.commitAllowingStateLoss();
+                }
+            }
+        }
                      add = true;
                      fragment = new SigninFragment();
+                 }
                 break;
-            case Constants.IDX_WELCOME_APP :
-                getSupportActionBar().hide();
-                if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
-                    fragment = fragmentHashMap.get(fragmentKeyNuevo);
-                } else {
-                    add = true;
-                    fragment = new WelcomeFragment();
-                }
-                break;
             case Constants.IDX_FRAGMENT_TOPICS :
         if(add) {
             fragmentHashMap.put(fragmentKeyNuevo, fragment);
             FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
             fragmentTransaction.add(R.id.fragment_container, fragment, fragmentKeyNuevo);
-            fragmentTransaction.commit();
+            fragmentTransaction.commitAllowingStateLoss();
+        }
         if(fragment != null) {
             FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
             fragmentTransaction.show(fragment);
-            fragmentTransaction.commit();
+            fragmentTransaction.commitAllowingStateLoss();
+        }
+    }
     @Override
     public void changeTopicActive(String topicUuid)
+    {
         Log.d(TAG, "changeTopicActive : " + topicUuid);
-        Log.e("Guardo", "Topico en Main");
+       // Log.e("Guardo", "Topico en Main");
         preference.setTopicUuidActive(topicUuid);
-        preference.setCapsuleUuidActive(capsuleUuid);
-        preference.setSlideUuidActive("");
         preference.setCapsuleUuidActive(capsuleUuid);
         preference.setSlideUuidActive("");
-        preference.save(this);
+        preference.save();
         invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
+    }
     @Override
     public void changeCompanyActive(String companyUuid)
+    {
         Log.d(TAG, "changeCompanyActive : " + companyUuid);
         if(!preference.getSlideUuidActive().equals(slideUuid) && type.equals(Constants.SLIDE_TYPE_IMAGE)) {
             Log.d(TAG, "registerOnPageChangeCallback - createProgressAndSyncRecord");
             createProgressAndSyncRecord(slideUuid, true, false, false);
-        }
+        }
         preference.setSlideUuidActive(slideUuid);
-        preference.save(this);
+        preference.save();
+        if(showGallery) {
+            invokeFragment(Constants.IDX_FRAGMENT_GALLERY);
+            Log.e("Aqui","Es donde cambio el capsule");
+            SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
-        if(showGallery) {
+            slideRefreshUIViewData.setCambioSlide(true);
-            invokeFragment(Constants.IDX_FRAGMENT_GALLERY);
+            mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
             Log.e("Aqui","Es donde cambio el capsule");
-            DatabaseHelper.CambioSlide="SI";
+            //DatabaseHelper.CambioSlide="SI";
+        }
             progressSlide.setUpdatedOn(dateOn);
             progressDao.update(progressSlide);
+        }
                     Log.d(TAG, "Capsule NEW returningAfterCompleted = " + returningAfterCompleted);
                     progressCapsule.setReturningAfterCompleted(returningAfterCompleted);
+                }
                 preference.setLastCapsuleUuidActive(capsule.getUuid());
-                preference.save(this);
+                preference.save();
                 Log.d(TAG, "Progress Capsule : setLastCapsuleActive : " + preference.getLastCapsuleUuidActive());
     @Override
     public void launchVideoViewer(String videoAudioUrl)
     {
-        Intent intent = new Intent(this, VideoAudioActivity.class);
+        Intent intent = new Intent(getApplicationContext(), VideoAudioActivity.class);
         intent.putExtra("videoAudioUrl",videoAudioUrl);
         intent.putExtra("deviceId", preference.getDeviceUuid());
     @Override
     public void launchAudioViewer(String videoAudioUrl)
     {
-        Intent intent = new Intent(this, VideoAudioActivity.class);
+        Intent intent = new Intent(getApplicationContext(), VideoAudioActivity.class);
         intent.putExtra("videoAudioUrl",videoAudioUrl);
         intent.putExtra("deviceId", preference.getDeviceUuid());
+    }
     @Override
     public void launchTextViewer(String description)
     {
-        Intent intent = new Intent(this,TextActivity.class);
+        Intent intent = new Intent(getApplicationContext(),TextActivity.class);
         intent.putExtra("description",description);
     @Override
     public void launchDocumentViewer(String file)
     {
-        Intent intent = new Intent(this,PdfActivity.class);
+        Intent intent = new Intent(getApplicationContext(),PdfActivity.class);
         intent.putExtra("documentUrl",file);
         intent.putExtra("deviceId", preference.getDeviceUuid());
             List<Answer> answers;
             AnswerDao answerDao = mAppDatabase.getAnswerDao();
-            Intent intent = new Intent(this, QuizActivity.class);
+            Intent intent = new Intent(getApplicationContext(), QuizActivity.class);
            // intent.putExtra("companyUuid", topic.getCompanyUuid());
            // intent.putExtra("topicUuid", topic.getUuid());
     public Preference getPreference() {
         return preference;
+    }
-    @Override
-    public Preference reloadPreference()
-    {
-        preference = new Preference(this);
-        return preference;
-    }
     @Override
     public void reloadNavHeader() {
         Log.d(TAG, "User Image = " + preference.getImage());
         navHeaderUserName.setText((preference.getFirstName() + " " + preference.getLastName()).trim());
                     .build());
             RequestOptions options = new RequestOptions()
                     .diskCacheStrategy(DiskCacheStrategy.ALL);
-            Glide.with(this).load(url)
+            Glide.with(getApplicationContext()).load(url)
                     .thumbnail()
                     .apply(options)
                     .into(navHeaderUserImage);
+            }
             preference.setLastDataRefresh(addedOn);
             preference.setCompanyCount(companySize);
-            preference.save(this);
+            preference.save();
         } catch (JSONException e) {
             if(success) {
                 Calendar calendar = Calendar.getInstance();
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat(Constants.FORMAT_DATETIME_SERVICE);
                 preference.setLastDataRefresh(simpleDateFormat.format(calendar.getTime()));
-                preference.save(this);
+                preference.save();
                 String max_date_changes = "";

Proyectos de Subversion Android Microlearning - Nuevo Interface

(root)/app/src/main/java/com/cesams/twogetskills/activity/MainActivity.java – Rev 2 → 3