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

 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
 import android.content.DialogInterface;
-import android.graphics.drawable.AnimationDrawable;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
     private HashMap<String, Fragment> fragmentHashMap;
     private TextView textViewMessageNotConnection;
-    BottomNavigationView mNavigationView;
     BottomNavigationView mNavigationView;
     private Preference preference;
     private boolean connected = false;
     private ConnectivityReceiver mConnectivityReceiver;
                 sync = new Sync(Constants.SYNC_ADAPTER_TYPE_FCM, preference.getDeviceToken());
                 mAppDatabase.getSyncDao().insert(sync);
+            }
+        }
         /**** CANAL DE NOTIFICACIONES **/
+        createNotificationChannel();
+       // badgenotification= findViewById(R.id.cart_badge);
         createNotificationChannel();
         /*** CUENTAS DE SINCRONIZACION **/
         fragmentHashMap = new HashMap<>();
         mProgressBar = findViewById(R.id.progressBar);
         mToolbar = findViewById(R.id.toolbar);
-        mToolbar.setOverflowIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.notifications));
+        mToolbar.setOverflowIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.toolbarnotifi));
         setSupportActionBar(findViewById(R.id.toolbar));
                 FirebaseMessaging.getInstance().setAutoInitEnabled(true);
+            }
         }, 10000);
+        if (getIntent().getExtras() != null) {
+            for (String key : getIntent().getExtras().keySet()) {
+                Object value = getIntent().getExtras().get(key);
+                if(value.toString().equals("content-refresh"))
-        if (getIntent().getExtras() != null) {
+                    {
-            //Vengo de notificacion, pero el app estaba cerrada, asi que muestro el cartel de content-refresh
+                        //Vengo de notificacion, pero el app estaba cerrada, asi que muestro el cartel de content-refresh
-            preference.setRefreshContentRequired(true);
+                        preference.setRefreshContentRequired(true);
+                        Cartelrefreshcontent();
+                    }
+            }
             Cartelrefreshcontent();
+        }
 */
+    }
     public void saveNotificationCenterNew(String title,String url,String message){
     public void saveNotificationCenterNew(String title,String url,String message){
         Calendar calendar = Calendar.getInstance();
         Date date = calendar.getTime();
                 notificacionueva.setId(notificacion.getId());
                 notificacionueva.setViewed("No");
                 notificacionDao.update(notificacionueva);
                 Log.e("Ya existia","la notificacion: "+notificacion.getDescription());
+            }
+        }
         if(!registrada)
+        {
             notificacionDao.insert(notificacionueva);
             Log.e("No existe", "agregando.. "+ notificacionueva.getDescription());
+        }
+    }
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.drawer, menu);
-        return true;
+        // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.drawer, menu);
         return true;
+    }
       //  mDrawerToggle.setDrawerIndicatorEnabled(false);
+        switch(fragmentIdxActiveNuevo) {
+            case Constants.IDX_FRAGMENT_SIGNIN :
-        switch(fragmentIdxActiveNuevo) {
+               // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_SIGNIN :
-               // getSupportActionBar().hide();
+                // getSupportActionBar().hide();
                  if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                      fragment = fragmentHashMap.get(fragmentKeyNuevo);
                  } else {
                      add = true;
                      fragment = new SigninFragment();
+                 }
+                break;
                 break;
             case Constants.IDX_FRAGMENT_TOPICS :
-            case Constants.IDX_FRAGMENT_TOPICS :
+              //  badgenotification.setVisibility(View.GONE);
                     fragment = new TopicFragment();
+                }
                 break;
+            case Constants.IDX_FRAGMENT_NOTIFICATION:
-            case Constants.IDX_FRAGMENT_NOTIFICATION:
+               // badgenotification.setVisibility(View.VISIBLE);
                 // getSupportActionBar().show();
                 //   mDrawerToggle.setDrawerIndicatorEnabled(true);
+                }
                 break;
+            case Constants.IDX_FRAGMENT_CAPSULES :
+              //  badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_CAPSULES :
-              //  getSupportActionBar().show();
+                //  getSupportActionBar().show();
               //  getSupportActionBar().setDisplayHomeAsUpEnabled(true);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
                     add = true;
                     fragment = new CapsuleFragment();
+                }
+                break;
-                break;
+            case Constants.IDX_FRAGMENT_SLIDES :
                // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_SLIDES :
-             //   getSupportActionBar().show();
+                //   getSupportActionBar().show();
              //   getSupportActionBar().setDisplayHomeAsUpEnabled(true);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
                     add = true;
                     fragment = new SlideFragment();
+                }
+                break;
-                }
-                break;
+            case Constants.IDX_FRAGMENT_GALLERY :
                // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_GALLERY :
-             //   getSupportActionBar().show();
+                //   getSupportActionBar().show();
              //   getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+                }
                 break;
+            case Constants.IDX_FRAGMENT_FINISH_CAPSULE :
+               // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_FINISH_CAPSULE :
-              //  getSupportActionBar().hide();
+                //  getSupportActionBar().hide();
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
                     add = true;
                     fragment = new FinishCapsuleFragment();
+                }
+                break;
-                break;
+            case Constants.IDX_FRAGMENT_FINISH_TOPIC :
                // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_FINISH_TOPIC :
-              //  getSupportActionBar().hide();
+                //  getSupportActionBar().hide();
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
                     add = true;
                     fragment = new FinishTopicFragment();
+                }
+                break;
-                }
-                break;
+            case Constants.IDX_FRAGMENT_TIMELINE :
                // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_TIMELINE :
-              //  getSupportActionBar().show();
+                //  getSupportActionBar().show();
               //  mDrawerToggle.setDrawerIndicatorEnabled(true);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
                     add = true;
+                    fragment = new TimelineFragment();
+                }
-                    fragment = new TimelineFragment();
+                break;
-                break;
+            case Constants.IDX_FRAGMENT_COMPANIES:
                // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_COMPANIES:
-              //  getSupportActionBar().show();
+                //  getSupportActionBar().show();
               //  mDrawerToggle.setDrawerIndicatorEnabled(true);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
+                    add = true;
+                    fragment = new CompanyFragment();
-                    add = true;
+                }
-                    fragment = new CompanyFragment();
+                break;
-                break;
+            case Constants.IDX_FRAGMENT_PROGRESS :
                // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_PROGRESS :
-               // getSupportActionBar().show();
+                // getSupportActionBar().show();
               //  mDrawerToggle.setDrawerIndicatorEnabled(true);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
+                } else {
+                    add = true;
-                } else {
+                    fragment = new ProgressFragment();
                     add = true;
-                    fragment = new ProgressFragment();
+                break;
-                break;
+            case Constants.IDX_FRAGMENT_USER_PROFILE:
                // badgenotification.setVisibility(View.GONE);
             case Constants.IDX_FRAGMENT_USER_PROFILE:
-               // getSupportActionBar().show();
+                // getSupportActionBar().show();
               //  mDrawerToggle.setDrawerIndicatorEnabled(true);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
+                    fragment = fragmentHashMap.get(fragmentKeyNuevo);
-                    fragment = fragmentHashMap.get(fragmentKeyNuevo);
+                } else {
-                } else {
+                    add = true;
-                    add = true;
+                    fragment = new UserProfileFragment();
                     fragment = new UserProfileFragment();
                 break;
+                }
                 break;
             default :
+               // getSupportActionBar().hide();
-               // getSupportActionBar().hide();
+               // badgenotification.setVisibility(View.GONE);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
                     add = true;

Proyectos de Subversion Android Microlearning - Nuevo Interface

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