From a89d6d8d25d504527afc6016219098d9bfd9ab13 Mon Sep 17 00:00:00 2001 From: Tamas Kozmer Date: Tue, 28 Jun 2022 11:41:28 +0200 Subject: [PATCH 1/3] Updated version --- apps/teacher/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/teacher/build.gradle b/apps/teacher/build.gradle index 905873291d..b3baa306d5 100644 --- a/apps/teacher/build.gradle +++ b/apps/teacher/build.gradle @@ -39,8 +39,8 @@ android { defaultConfig { minSdkVersion Versions.MIN_SDK targetSdkVersion Versions.TARGET_SDK - versionCode = 50 - versionName = '1.18.2' + versionCode = 51 + versionName = '1.18.3' vectorDrawables.useSupportLibrary = true multiDexEnabled true testInstrumentationRunner 'com.instructure.teacher.ui.espresso.TeacherHiltTestRunner' From f876f6c6766917f7c5ddfd7178ddca859da9d4fd Mon Sep 17 00:00:00 2001 From: Tamas Kozmer Date: Tue, 28 Jun 2022 11:56:47 +0200 Subject: [PATCH 2/3] Fixed discussion list crash on tablets. --- .../teacher/fragments/DiscussionsListFragment.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt index e2b7a853e6..f909a0066a 100644 --- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt +++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt @@ -16,14 +16,15 @@ */ package com.instructure.teacher.fragments -import android.graphics.Color import android.view.View import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.instructure.canvasapi2.managers.UserManager import com.instructure.canvasapi2.models.CanvasContext import com.instructure.canvasapi2.models.DiscussionTopicHeader import com.instructure.canvasapi2.utils.ApiPrefs +import com.instructure.canvasapi2.utils.RemoteConfigUtils import com.instructure.interactions.router.Route import com.instructure.pandautils.analytics.SCREEN_VIEW_DISCUSSION_LIST import com.instructure.pandautils.analytics.ScreenView @@ -39,15 +40,12 @@ import com.instructure.teacher.router.RouteMatcher import com.instructure.teacher.utils.RecyclerViewUtils import com.instructure.teacher.utils.setupBackButton import com.instructure.teacher.viewinterface.DiscussionListView -import dagger.hilt.android.AndroidEntryPoint import kotlinx.android.synthetic.main.fragment_discussion_list.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -import javax.inject.Inject @ScreenView(SCREEN_VIEW_DISCUSSION_LIST) -@AndroidEntryPoint open class DiscussionsListFragment : BaseExpandableSyncFragment< String, DiscussionTopicHeader, @@ -56,8 +54,7 @@ open class DiscussionsListFragment : BaseExpandableSyncFragment< RecyclerView.ViewHolder, DiscussionListAdapter>(), DiscussionListView { - @Inject - lateinit var featureFlagProvider: FeatureFlagProvider + val featureFlagProvider: FeatureFlagProvider = FeatureFlagProvider(UserManager, RemoteConfigUtils, ApiPrefs) protected var mCanvasContext: CanvasContext by ParcelableArg(default = CanvasContext.getGenericContext(CanvasContext.Type.COURSE, -1L, "")) From b5e335caf05971e08b115a213779a466bf6978d4 Mon Sep 17 00:00:00 2001 From: Tamas Kozmer Date: Tue, 28 Jun 2022 15:04:04 +0200 Subject: [PATCH 3/3] Added AndroidEntryPoint to MasterDetailActivity.kt to fix push notification settings crash. --- .../com/instructure/teacher/activities/MasterDetailActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/teacher/src/main/java/com/instructure/teacher/activities/MasterDetailActivity.kt b/apps/teacher/src/main/java/com/instructure/teacher/activities/MasterDetailActivity.kt index 854e02aaf9..5353ea353d 100644 --- a/apps/teacher/src/main/java/com/instructure/teacher/activities/MasterDetailActivity.kt +++ b/apps/teacher/src/main/java/com/instructure/teacher/activities/MasterDetailActivity.kt @@ -42,9 +42,11 @@ import com.instructure.interactions.Identity import com.instructure.interactions.router.Route import com.instructure.teacher.router.RouteMatcher import com.instructure.teacher.router.RouteResolver +import dagger.hilt.android.AndroidEntryPoint import kotlinx.android.synthetic.main.activity_master_detail.* import retrofit2.Response +@AndroidEntryPoint class MasterDetailActivity : BaseAppCompatActivity(), MasterDetailInteractions { private var mRoute: Route? = null