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

 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.bottomnavigation.BottomNavigationView;
+import com.google.android.material.navigation.NavigationBarView;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.navigation.NavigationView;
 import androidx.drawerlayout.widget.DrawerLayout;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-public class MainActivity extends  AppCompatActivity implements ITwoGetSkills,NavigationView.OnNavigationItemSelectedListener {
+public class MainActivity extends  AppCompatActivity implements ITwoGetSkills {
     private boolean isSyncDevice = false;
     private boolean isSyncToken = false;
     private boolean isSyncBatch = false;
     private boolean isForeground = false;
     private final static String PREFIX_FRAG = "FRAG";
     private final static String TAG = "C2GS - MainActivity";
     private DrawerLayout mDrawer;
-    private ActionBarDrawerToggle mDrawerToggle;
-    private HashMap<String, Fragment> fragmentHashMap;
     private ActionBarDrawerToggle mDrawerToggle;
-    private ImageView navHeaderUserImage;
     private ImageView navHeaderUserImage;
     private TextView navHeaderUserName;
+    private TextView navHeaderUserEmail;
-    private TextView navHeaderUserEmail;
+    private HashMap<String, Fragment> fragmentHashMap;
+    private TextView textViewMessageNotConnection;
     private TextView textViewMessageNotConnection;
     BottomNavigationView mNavigationView;
     private Preference preference;
-    private boolean connected = false;
+    private boolean connected = false;
     private ConnectivityReceiver mConnectivityReceiver;
     private InternalReceiver mInternalReceiver;
     private ProgressBar mProgressBar;
+        }
         fragmentHashMap = new HashMap<>();
         mProgressBar = findViewById(R.id.progressBar);
-        Toolbar mToolbar = findViewById(R.id.toolbar);
+        mToolbar = findViewById(R.id.toolbar);
+        mToolbar.setOverflowIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.notifications));
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+        getSupportActionBar().setIcon(R.mipmap.ic_launcher_round);
+        mNavigationView = findViewById(R.id.bottomNavigationView);
+        mNavigationView.setOnItemSelectedListener(new NavigationBarView.OnItemSelectedListener() {
+            @Override
+            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+                Log.e("Titulo",""+item.getTitle());
+              if(item.getTitle().equals("Inicio")){
+                  setTitleActionBar(getString(R.string.app_name));
+                  invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
+                  mNavigationView.getMenu().getItem(0).setChecked(true);
+              }
+                if(item.getTitle().equals("Tópicos")){
+                    setTitleActionBar(getString(R.string.menu_topics));
+                    invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
+                    mNavigationView.getMenu().getItem(1).setChecked(true);
+                }
+                if(item.getTitle().equals("Progreso")){
+                    setTitleActionBar(getString(R.string.progress_title));
+                    invokeFragment(Constants.IDX_FRAGMENT_PROGRESS);
+                    mNavigationView.getMenu().getItem(2).setChecked(true);
+                }
+                if(item.getTitle().equals("Ver más")){
+                    setTitleActionBar(getString(R.string.menu_user_profile));
+                    invokeFragment(Constants.IDX_FRAGMENT_USER_PROFILE);
+                    mNavigationView.getMenu().getItem(3).setChecked(true);
+                }
+                /*switch (item.getItemId()) {
+                    case R.id.action_home:
+                        setTitleActionBar(getString(R.string.app_name));
+                        invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
+                        break;
+                    case R.id.action_topicos:
+                        setTitleActionBar(getString(R.string.menu_topics));
+                        invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
+                        break;
+                    case R.id.nav_progress:
+                        if(preference.getCompanyCount() > 1) {
+                            invokeFragment(Constants.IDX_FRAGMENT_COMPANIES);
+                        }  else {
+                            setTitleActionBar(getString(R.string.menu_progress));
+                            invokeFragment(Constants.IDX_FRAGMENT_PROGRESS);
+                        }
+                        break;
+                    case R.id.nav_userprofile:
+                        setTitleActionBar(getString(R.string.menu_user_profile));
+                        invokeFragment(Constants.IDX_FRAGMENT_USER_PROFILE);
+                        break;
+                    case R.id.nav_exit_app:
+                        setTitleActionBar(getString(R.string.menu_exit));
+                        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+                        builder.setTitle(R.string.alter_dialog_close_app_title);
+                        builder.setMessage(R.string.alter_dialog_close_app_message);
+                        builder.setNegativeButton(R.string.alter_dialog_button_no, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                            }
+                        });
+                        builder.setPositiveButton(R.string.alter_dialog_button_yes, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                signout();
+                            }
+                        });
+                        AlertDialog dialog = builder.create();
+                        dialog.show();
+                        break;
+                    default:
+                        throw new IllegalArgumentException("menu option not implemented!!");
+                } */
+                return false;
+            }
+        });
         mToolbar.setOverflowIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.notifications));
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
       //  mDrawer = findViewById(R.id.drawer_layout);
         preference.save();
+    }
+    */
     */
     /*
     @Override
     public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
         int title;
+       // mDrawer.closeDrawers();
+        switch (menuItem.getItemId()) {
+            case R.id.action_home:
-        mDrawer.closeDrawers();
+                setTitleActionBar(getString(R.string.app_name));
                 invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
-        switch (menuItem.getItemId()) {
+                break;
-            case R.id.nav_topics :
-                setTitleActionBar(getString(R.string.menu_topics));
-                invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
-                break;
-            case R.id.nav_timeline:
+            case R.id.action_topicos:
-                setTitleActionBar(getString(R.string.menu_timeline));
+                setTitleActionBar(getString(R.string.menu_topics));
-                invokeFragment(Constants.IDX_FRAGMENT_TIMELINE);
+                invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
         mDrawer.closeDrawer(GravityCompat.START);
         return true;
+    }
 */
     private void createNotificationChannel() {
         // Create the NotificationChannel, but only on API 26+ because
         // the NotificationChannel class is new and not in the support library
         });
+    }
+    @Override
+    public void hideNavigationAndtoolbar() {
+        Log.e("Ocultar"," Navigation and Toolbar");
+        //accessing it from ui-thread
+        runOnUiThread(() -> {
+            mNavigationView.setVisibility(View.GONE);
+            mToolbar.setVisibility(View.GONE);
+        });
+    }
+    @Override
+    public void showNavigationAndToolbar() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mNavigationView.setVisibility(View.VISIBLE);
+                mToolbar.setVisibility(View.VISIBLE);
+            }
         });
+    }
     @Override
     public void invokeFragment(int fragmentIdxActiveNuevo)
+    {
+        Log.e("Invoco fragmento"," "+fragmentIdxActiveNuevo);
         String fragmentKeyActual    = PREFIX_FRAG + preference.getFragmentIdxActive();
         String fragmentKeyNuevo 	= PREFIX_FRAG + fragmentIdxActiveNuevo;
         preference.setFragmentIdxActive(fragmentIdxActiveNuevo);
+            }
+        }
         boolean add = false;
         fragment = null;
-       // getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(false);
       //  mDrawerToggle.setDrawerIndicatorEnabled(false);
+                 }
                 break;
-            case Constants.IDX_FRAGMENT_TOPICS :
             case Constants.IDX_FRAGMENT_TOPICS :
                // getSupportActionBar().show();
              //   mDrawerToggle.setDrawerIndicatorEnabled(true);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
                     add = true;
-                    fragment = new WelcomeFragment();
+                    fragment = new TopicFragment();
+                }
                     add = true;
                     fragment = new UserProfileFragment();
+                }
                 break;
+            case Constants.IDX_FRAGMENT_WELCOME:
+                // getSupportActionBar().show();
+                //  mDrawerToggle.setDrawerIndicatorEnabled(true);
+                if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
+                    fragment = fragmentHashMap.get(fragmentKeyNuevo);
+                } else {
+                    add = true;
+                    fragment = new WelcomeFragment();
+                    Log.e("Vete"," a welcome");
+                }
+                break;
             default :
                // getSupportActionBar().hide();
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
+    }
     @Override
     public void setTitleActionBar(String title)
+    {
         getSupportActionBar().setTitle(title);
+    }
+    }
     @Override
     public void reloadNavHeader() {
         Log.d(TAG, "User Image = " + preference.getImage());
-        navHeaderUserName.setText((preference.getFirstName() + " " + preference.getLastName()).trim());
+//        navHeaderUserName.setText((preference.getFirstName() + " " + preference.getLastName()).trim());
-        navHeaderUserEmail.setText(preference.getEmail());
+  //      navHeaderUserEmail.setText(preference.getEmail());

Proyectos de Subversion Android Microlearning - Nuevo Interface

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