Skip to content

Commit

Permalink
Migrate to view binding in crux.bphc.cms.activities
Browse files Browse the repository at this point in the history
  • Loading branch information
JustAGhost23 committed Feb 24, 2024
1 parent d5436b0 commit daa739d
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 29 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {
}
}
buildFeatures {
viewBinding = true
viewBinding true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
29 changes: 16 additions & 13 deletions app/src/main/java/crux/bphc/cms/activities/CourseDetailActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment
import com.google.gson.Gson
import crux.bphc.cms.R
import crux.bphc.cms.app.Urls
import crux.bphc.cms.databinding.ActivityCourseDetailBinding
import crux.bphc.cms.fragments.CourseContentFragment
import crux.bphc.cms.fragments.CourseEnrolFragment
import crux.bphc.cms.fragments.DiscussionFragment
Expand All @@ -21,23 +22,25 @@ import io.realm.Realm

class CourseDetailActivity : AppCompatActivity() {
private lateinit var realm: Realm

private lateinit var course: Course
private lateinit var binding: ActivityCourseDetailBinding

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

if (UserAccount.isDarkModeEnabled) {
setTheme(R.style.AppTheme_Dark)
}
setContentView(R.layout.activity_course_detail)
binding = ActivityCourseDetailBinding.inflate(layoutInflater)

realm = Realm.getDefaultInstance()

supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setHomeButtonEnabled(true)

resolveIntent()

setContentView(binding.root)
}

private fun resolveIntent() {
Expand Down Expand Up @@ -91,24 +94,24 @@ class CourseDetailActivity : AppCompatActivity() {
val fragmentTransaction = supportFragmentManager.beginTransaction()
val mCourseEnrolFragment = CourseEnrolFragment.newInstance(enrolCourse)
fragmentTransaction.replace(
R.id.course_section_enrol_container,
mCourseEnrolFragment,
COURSE_ENROL_FRAG_TRANSACTION_KEY)
R.id.course_section_enrol_container,
mCourseEnrolFragment,
COURSE_ENROL_FRAG_TRANSACTION_KEY)
fragmentTransaction.commit()
}


private fun setCourseContentFragment(contextUrl: String) {
val fragmentTransaction = supportFragmentManager.beginTransaction()
val courseSectionFragment = CourseContentFragment.newInstance(
UserAccount.token,
course.id,
contextUrl,
UserAccount.token,
course.id,
contextUrl,
)
fragmentTransaction.replace(
R.id.course_section_enrol_container,
courseSectionFragment,
"course_section_frag"
R.id.course_section_enrol_container,
courseSectionFragment,
"course_section_frag"
).commit()
}

Expand All @@ -119,7 +122,7 @@ class CourseDetailActivity : AppCompatActivity() {
val fragmentTransaction = supportFragmentManager.beginTransaction()
val forumFragment: Fragment = ForumFragment.newInstance(course.id, forumId, course.shortName)
fragmentTransaction.addToBackStack(null)
.replace(R.id.course_section_enrol_container, forumFragment, "Announcements")
.replace(R.id.course_section_enrol_container, forumFragment, "Announcements")
fragmentTransaction.commit()
}

Expand All @@ -137,7 +140,7 @@ class CourseDetailActivity : AppCompatActivity() {
course.shortName
)
fragmentTransaction.addToBackStack(null)
.replace(R.id.course_section_enrol_container, discussionFragment, "Discussion")
.replace(R.id.course_section_enrol_container, discussionFragment, "Discussion")
fragmentTransaction.commit()
}

Expand Down
33 changes: 18 additions & 15 deletions app/src/main/java/crux/bphc/cms/activities/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,20 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
import crux.bphc.cms.R
import crux.bphc.cms.background.MigrateDataWorker
import crux.bphc.cms.core.PushNotifRegManager
import crux.bphc.cms.databinding.ActivityMainBinding
import crux.bphc.cms.fragments.*
import crux.bphc.cms.helper.CourseDataHandler
import crux.bphc.cms.models.UserAccount
import crux.bphc.cms.models.course.Course
import crux.bphc.cms.utils.UserUtils
import io.realm.Realm
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.coroutines.launch

class MainActivity : AppCompatActivity() {

private lateinit var _realm: Realm
private lateinit var courseDataHandler: CourseDataHandler
private lateinit var binding: ActivityMainBinding

private val _bottomNavSelectionListener
get() = listener@{ menuItem: MenuItem ->
Expand All @@ -43,12 +44,12 @@ class MainActivity : AppCompatActivity() {
}
R.id.searchCourseFragment -> {
pushView(SearchCourseForEnrolFragment.newInstance(),
"Search Course to Enrol", false)
"Search Course to Enrol", false)
return@listener true
}
R.id.downloadsFragment -> {
pushView(FilesFragment.newInstance(),
getString(R.string.nav_bar_files), false)
getString(R.string.nav_bar_files), false)
return@listener true
}
R.id.forumFragment -> {
Expand All @@ -75,14 +76,14 @@ class MainActivity : AppCompatActivity() {
// image background
if (UserAccount.isDarkModeEnabled) {
setTheme(R.style.AppTheme_NoActionBar_Dark)
} else {
}
else {
setTheme(R.style.AppTheme_NoActionBar)
}
binding = ActivityMainBinding.inflate(layoutInflater)
setSupportActionBar(binding.toolbar)

setContentView(R.layout.activity_main)
setSupportActionBar(toolbar)

bottom_nav.setOnNavigationItemSelectedListener(_bottomNavSelectionListener)
binding.bottomNav.setOnItemSelectedListener(_bottomNavSelectionListener)

_realm = Realm.getDefaultInstance()
courseDataHandler = CourseDataHandler(_realm)
Expand Down Expand Up @@ -111,29 +112,31 @@ class MainActivity : AppCompatActivity() {
if (toastResource != 0) {
val context = this@MainActivity
Toast.makeText(
context,
context.getString(toastResource),
Toast.LENGTH_SHORT,
context,
context.getString(toastResource),
Toast.LENGTH_SHORT,
).show()
}
}

resolveIntent()
resolveModuleLinkShare()

setContentView(binding.root)
}

override fun onBackPressed() {
super.onBackPressed()
bottom_nav.setOnNavigationItemSelectedListener(null) // Remove the listener to prevent an infinite loop
binding.bottomNav.setOnItemSelectedListener(null) // Remove the listener to prevent an infinite loop
val frag = supportFragmentManager.findFragmentById(R.id.content_frame)
bottom_nav.selectedItemId = when (frag) {
binding.bottomNav.selectedItemId = when (frag) {
is MyCoursesFragment -> R.id.myCoursesFragment
is SearchCourseForEnrolFragment -> R.id.searchCourseFragment
is ForumFragment -> R.id.forumFragment
is MoreFragment -> R.id.moreFragment
else -> bottom_nav.selectedItemId
else -> binding.bottomNav.selectedItemId
}
bottom_nav.setOnNavigationItemSelectedListener(_bottomNavSelectionListener)
binding.bottomNav.setOnItemSelectedListener(_bottomNavSelectionListener)
}

override fun onNewIntent(intent: Intent?) {
Expand Down

0 comments on commit daa739d

Please sign in to comment.