diff --git a/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt index 176f5122bb..a2668a52f2 100644 --- a/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt +++ b/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt @@ -254,7 +254,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. R.id.navigationDrawerItem_files -> { ApiPrefs.user?.let { handleRoute(FileListFragment.makeRoute(it)) } } - R.id.navigationDrawerItem_gauge, R.id.navigationDrawerItem_studio, R.id.navigationDrawerItem_mastery -> { + R.id.navigationDrawerItem_gauge, R.id.navigationDrawerItem_studio, R.id.navigationDrawerItem_mastery, R.id.navigationDrawerItem_portfolio -> { val launchDefinition = v.tag as? LaunchDefinition ?: return@weave launchLti(launchDefinition) } @@ -648,6 +648,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. navigationDrawerItemGauge.onClickWithRequireNetwork(mNavigationDrawerItemClickListener) navigationDrawerItemStudio.onClickWithRequireNetwork(mNavigationDrawerItemClickListener) navigationDrawerItemMastery.onClickWithRequireNetwork(mNavigationDrawerItemClickListener) + navigationDrawerItemPortfolio.onClickWithRequireNetwork(mNavigationDrawerItemClickListener) navigationDrawerItemBookmarks.onClickWithRequireNetwork(mNavigationDrawerItemClickListener) navigationDrawerItemChangeUser.setOnClickListener(mNavigationDrawerItemClickListener) navigationDrawerItemHelp.onClickWithRequireNetwork(mNavigationDrawerItemClickListener) @@ -661,6 +662,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. navigationDrawerItemGauge, navigationDrawerItemStudio, navigationDrawerItemMastery, + navigationDrawerItemPortfolio, navigationDrawerItemBookmarks, navigationDrawerItemChangeUser, navigationDrawerItemHelp, @@ -775,6 +777,8 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. navigationDrawerOfflineIndicator.setVisible(isOffline) navigationDrawerItemStudio.alpha = if (isOffline) 0.5f else 1f navigationDrawerItemGauge.alpha = if (isOffline) 0.5f else 1f + navigationDrawerItemMastery.alpha = if (isOffline) 0.5f else 1f + navigationDrawerItemPortfolio.alpha = if (isOffline) 0.5f else 1f navigationDrawerItemHelp.alpha = if (isOffline) 0.5f else 1f navigationDrawerItemBookmarks.alpha = if (isOffline) 0.5f else 1f navigationDrawerItemFiles.alpha = if (isOffline) 0.5f else 1f @@ -1269,6 +1273,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. val studioLaunchDefinition = launchDefinitions?.firstOrNull { it.domain == LaunchDefinition.STUDIO_DOMAIN } val gaugeLaunchDefinition = launchDefinitions?.firstOrNull { it.domain == LaunchDefinition.GAUGE_DOMAIN } val masteryLaunchDefinition = launchDefinitions?.firstOrNull { it.domain == LaunchDefinition.MASTERY_DOMAIN } + val portfolioLaunchDefinition = launchDefinitions?.firstOrNull { it.domain?.contains(LaunchDefinition.PORTFOLIO_DOMAIN) == true } val studio = findViewById(R.id.navigationDrawerItem_studio) studio.visibility = if (studioLaunchDefinition != null) View.VISIBLE else View.GONE @@ -1281,6 +1286,10 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. val mastery = findViewById(R.id.navigationDrawerItem_mastery) mastery.visibility = if (masteryLaunchDefinition != null) View.VISIBLE else View.GONE mastery.tag = masteryLaunchDefinition + + val portfolio = findViewById(R.id.navigationDrawerItem_portfolio) + portfolio.visibility = if (portfolioLaunchDefinition != null) View.VISIBLE else View.GONE + portfolio.tag = portfolioLaunchDefinition } override fun addBookmark() { diff --git a/apps/student/src/main/res/layout/navigation_drawer.xml b/apps/student/src/main/res/layout/navigation_drawer.xml index aca253a719..23f77f15cd 100644 --- a/apps/student/src/main/res/layout/navigation_drawer.xml +++ b/apps/student/src/main/res/layout/navigation_drawer.xml @@ -219,6 +219,26 @@ + + + + + + + + { RouteMatcher.route(this@InitActivity, Route(FileListFragment::class.java, ApiPrefs.user)) } - R.id.navigationDrawerItem_gauge, R.id.navigationDrawerItem_arc, R.id.navigationDrawerItem_mastery -> { + R.id.navigationDrawerItem_gauge, R.id.navigationDrawerItem_arc, R.id.navigationDrawerItem_mastery, R.id.navigationDrawerItem_portfolio -> { val launchDefinition = v.tag as? LaunchDefinition ?: return@weave launchLti(launchDefinition) } @@ -422,6 +422,7 @@ class InitActivity : BasePresenterActivity + + + + + + + + Studio yet const val MASTERY_DOMAIN = "app.masteryconnect.com" + const val PORTFOLIO_DOMAIN = "portfolio.instructure.com" } } diff --git a/libs/pandares/src/main/res/drawable/ic_navigation_portfolio.xml b/libs/pandares/src/main/res/drawable/ic_navigation_portfolio.xml new file mode 100644 index 0000000000..3a0a4f9602 --- /dev/null +++ b/libs/pandares/src/main/res/drawable/ic_navigation_portfolio.xml @@ -0,0 +1,10 @@ + + + diff --git a/libs/pandares/src/main/res/values/strings_not_translatable.xml b/libs/pandares/src/main/res/values/strings_not_translatable.xml index fd4b1177d1..c2299b50fb 100644 --- a/libs/pandares/src/main/res/values/strings_not_translatable.xml +++ b/libs/pandares/src/main/res/values/strings_not_translatable.xml @@ -3,5 +3,6 @@ Canvas Network Studio Mastery + Portfolio This isn\'t right, you shouldn\'t be here. \ No newline at end of file