diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java index b06432c..c4f0dc5 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java @@ -368,10 +368,9 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< showProgress(false); if (success) { - // TODO: Ma zwracac 666 i cos jeszcze, do tego wpisywac jwt to shared prefs... kurwa + // DONE: returns the role of signed user and return code Intent data = new Intent(); - String txt = "test text to Startup compo"; - data.setData(Uri.parse(txt)); + data.putExtra("is_tutor", isTutor); setResult(RESULT_OK, data); finish(); } else { diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java index a443ed2..4f3aaba 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java @@ -28,7 +28,7 @@ public class MainActivity extends AppCompatActivity { private BottomNavigationView mMainNav; private FrameLayout mMainFrame; - + private boolean isTutor; private MapFragment mapFragment; private NotificationFragment notificationFragment; private ProfileFragment profileFragment; @@ -52,10 +52,13 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); Mapbox.getInstance(this, getString(R.string.access_token)); setContentView(R.layout.activity_main); - - + Bundle extras = getIntent().getExtras(); mMainFrame = (FrameLayout) findViewById(R.id.main_frame); mMainNav = (BottomNavigationView) findViewById(R.id.main_nav); + isTutor = (boolean) extras.get("is_tutor"); + if (!isTutor){ + mMainNav.findViewById(R.id.nav_profile).setVisibility(View.GONE); + } mapFragment = new MapFragment(); notificationFragment = new NotificationFragment(); @@ -65,17 +68,18 @@ public class MainActivity extends AppCompatActivity { setFragment(mapFragment); mMainNav.setSelectedItemId(R.id.nav_map); - mMainNav.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() { + /* code below is resposible for changing colours of tabs in main tab menu */ +/* mMainNav.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() { @Override public boolean onNavigationItemSelected(@NonNull MenuItem item) { switch (item.getItemId()) { case R.id.nav_map: - mMainNav.setItemBackgroundResource(R.color.colorPrimary); + mMainNav.setItemBackgroundResource(R.color.colorPrimaryDark); setFragment(mapFragment); return true; case R.id.nav_notif: - mMainNav.setItemBackgroundResource(R.color.colorAccent); + mMainNav.setItemBackgroundResource(R.color.colorPrimaryDark); setFragment(notificationFragment); return true; case R.id.nav_profile: @@ -86,7 +90,7 @@ public class MainActivity extends AppCompatActivity { return false; } } - }); + });*/ // Logout button diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/StartupActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/StartupActivity.java index 4c7a441..257b01f 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/StartupActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/StartupActivity.java @@ -38,6 +38,7 @@ public class StartupActivity extends AppCompatActivity { if (requestCode == AUTHENTICATION_REQUEST_CODE && resultCode == Activity.RESULT_OK) { Intent startupIntent = new Intent(this, MainActivity.class); startupIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); + startupIntent.putExtra("is_tutor",(boolean) data.getExtras().get("is_tutor")); startActivity(startupIntent); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b1e333b..fa13cde 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,8 +1,8 @@ @@ -12,13 +12,13 @@ android:layout_height="wrap_content"> - - - - - - - + + + + + + + @@ -39,6 +39,7 @@ android:theme="@style/AppTheme.AppBarOverlay"> + @@ -56,13 +57,14 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentStart="true" + android:layout_marginStart="0dp" + android:background="@color/colorPrimaryDark" app:itemBackground="@color/colorPrimaryDark" app:itemIconTint="@color/nav_item_colors" app:itemTextColor="@color/nav_item_colors" app:layout_anchor="@+id/include" app:layout_anchorGravity="bottom|center" - app:menu="@menu/nav_items" - /> + app:menu="@menu/nav_items" /> diff --git a/app/src/main/res/menu/nav_items.xml b/app/src/main/res/menu/nav_items.xml index 8b00a9f..588a4b4 100644 --- a/app/src/main/res/menu/nav_items.xml +++ b/app/src/main/res/menu/nav_items.xml @@ -12,6 +12,6 @@ android:title="@string/nav_map" /> + android:icon="@drawable/mapbox_info_icon_default" + android:title="Active" /> \ No newline at end of file