sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Settings refactor (#166)

Browse Source
This commit is contained in:
Rafał Borcz
2018-10-22 22:47:54 +02:00
committed by Mikołaj Pich
parent b680cc4366
commit 837bce7286
51 changed files with 679 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt Normal file
View File

@ -0,0 +1,16 @@
package io.github.wulkanowy.data.repositories
import android.content.SharedPreferences
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class PreferencesRepository @Inject constructor(private val sharedPref: SharedPreferences) {
val startMenuIndex: Int
get() = sharedPref.getString("start_menu", "0")?.toInt() ?: 0
val showPresent: Boolean
get() = sharedPref.getBoolean("attendance_present", true)
}

5
app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.kt
View File

@ -24,6 +24,9 @@ class LoginActivity : BaseActivity(), LoginView, LoginSwitchListener {
fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
}
override val currentViewIndex: Int
get() = loginViewpager.currentItem
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_login)
@ -63,8 +66,6 @@ class LoginActivity : BaseActivity(), LoginView, LoginSwitchListener {
(loginAdapter.getItem(index) as LoginOptionsFragment).loadData()
}
override fun currentViewPosition() = loginViewpager.currentItem
public override fun onDestroy() {
presenter.onDetachView()
super.onDestroy()

2
app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.kt
View File

@ -25,7 +25,7 @@ class LoginPresenter @Inject constructor(errorHandler: ErrorHandler)
fun onBackPressed(default: () -> Unit) {
view?.run {
if (currentViewPosition() == 1) {
if (currentViewIndex == 1) {
switchView(0)
hideActionBar()
} else default()

4
app/src/main/java/io/github/wulkanowy/ui/login/LoginView.kt
View File

@ -4,6 +4,8 @@ import io.github.wulkanowy.ui.base.BaseView
interface LoginView : BaseView {
val currentViewIndex: Int
fun initAdapter()
fun loadOptionsView(index: Int)
@ -11,6 +13,4 @@ interface LoginView : BaseView {
fun switchView(position: Int)
fun hideActionBar()
fun currentViewPosition(): Int
}

60
app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.kt
View File

@ -4,10 +4,11 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.core.content.ContextCompat
import com.aurelhubert.ahbottomnavigation.AHBottomNavigation
import androidx.fragment.app.Fragment
import com.aurelhubert.ahbottomnavigation.AHBottomNavigation.TitleState.ALWAYS_SHOW
import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
import com.ncapdevi.fragnav.FragNavController
import com.ncapdevi.fragnav.FragNavController.Companion.DETACH_ON_NAVIGATE_HIDE_ON_SWITCH
import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
import io.github.wulkanowy.R
import io.github.wulkanowy.ui.base.BaseActivity
import io.github.wulkanowy.ui.main.attendance.AttendanceFragment
@ -15,7 +16,8 @@ import io.github.wulkanowy.ui.main.exam.ExamFragment
import io.github.wulkanowy.ui.main.grade.GradeFragment
import io.github.wulkanowy.ui.main.more.MoreFragment
import io.github.wulkanowy.ui.main.timetable.TimetableFragment
import io.github.wulkanowy.utils.setOnTabTransactionListener
import io.github.wulkanowy.utils.safelyPopFragment
import io.github.wulkanowy.utils.setOnViewChangeListener
import kotlinx.android.synthetic.main.activity_main.*
import javax.inject.Inject
@ -28,11 +30,20 @@ class MainActivity : BaseActivity(), MainView {
lateinit var navController: FragNavController
companion object {
const val DEFAULT_TAB = 2
fun getStartIntent(context: Context) = Intent(context, MainActivity::class.java)
}
override val isRootView: Boolean
get() = navController.isRootFragment
override val currentViewTitle: String?
get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
override val currentStackSize: Int?
get() = navController.currentStack?.size
override var startMenuIndex = 0
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
@ -40,12 +51,16 @@ class MainActivity : BaseActivity(), MainView {
messageContainer = mainFragmentContainer
presenter.onAttachView(this)
navController.initialize(DEFAULT_TAB, savedInstanceState)
navController.initialize(startMenuIndex, savedInstanceState)
}
override fun onStart() {
super.onStart()
presenter.onStartView()
presenter.onViewStart()
}
override fun onSupportNavigateUp(): Boolean {
return presenter.onUpNavigate()
}
override fun initView() {
@ -59,19 +74,18 @@ class MainActivity : BaseActivity(), MainView {
))
accentColor = ContextCompat.getColor(context, R.color.colorPrimary)
inactiveColor = ContextCompat.getColor(context, android.R.color.black)
titleState = AHBottomNavigation.TitleState.ALWAYS_SHOW
currentItem = DEFAULT_TAB
titleState = ALWAYS_SHOW
currentItem = startMenuIndex
isBehaviorTranslationEnabled = false
setTitleTextSizeInSp(10f, 10f)
setOnTabSelectedListener { position, wasSelected ->
presenter.onTabSelected(position, wasSelected)
}
}
navController.run {
setOnTabTransactionListener { presenter.onMenuViewChange(it) }
fragmentHideStrategy = DETACH_ON_NAVIGATE_HIDE_ON_SWITCH
setOnViewChangeListener { presenter.onViewStart() }
fragmentHideStrategy = HIDE
rootFragments = listOf(
GradeFragment.newInstance(),
AttendanceFragment.newInstance(),
@ -90,22 +104,24 @@ class MainActivity : BaseActivity(), MainView {
supportActionBar?.title = title
}
override fun viewTitle(index: Int): String {
return getString(listOf(R.string.grade_title,
R.string.attendance_title,
R.string.exam_title,
R.string.timetable_title,
R.string.more_title)[index])
override fun showHomeArrow(show: Boolean) {
supportActionBar?.setDisplayHomeAsUpEnabled(show)
}
override fun currentMenuIndex() = navController.currentStackIndex
override fun notifyMenuViewReselected() {
(navController.currentFrag as? MainView.MenuFragmentView)?.onFragmentReselected()
(navController.currentStack?.get(0) as? MainView.MainChildView)?.onFragmentReselected()
}
fun pushView(fragment: Fragment) {
navController.pushFragment(fragment)
}
override fun popView() {
navController.safelyPopFragment()
}
override fun onBackPressed() {
navController.apply { if (isRootFragment) super.onBackPressed() else popFragment() }
presenter.onBackPressed { super.onBackPressed() }
}
override fun onSaveInstanceState(outState: Bundle?) {

6
app/src/main/java/io/github/wulkanowy/ui/main/MainModule.kt
View File

@ -7,6 +7,8 @@ import dagger.android.ContributesAndroidInjector
import io.github.wulkanowy.R
import io.github.wulkanowy.di.scopes.PerActivity
import io.github.wulkanowy.di.scopes.PerFragment
import io.github.wulkanowy.ui.main.about.AboutFragment
import io.github.wulkanowy.ui.main.about.AboutModule
import io.github.wulkanowy.ui.main.attendance.AttendanceFragment
import io.github.wulkanowy.ui.main.exam.ExamFragment
import io.github.wulkanowy.ui.main.grade.GradeFragment
@ -47,4 +49,8 @@ abstract class MainModule {
@PerFragment
@ContributesAndroidInjector
abstract fun bindTimetableFragment(): TimetableFragment
@PerFragment
@ContributesAndroidInjector(modules = [AboutModule::class])
abstract fun bindAboutFragment(): AboutFragment
}

33
app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.kt
View File

@ -1,23 +1,44 @@
package io.github.wulkanowy.ui.main
import io.github.wulkanowy.data.ErrorHandler
import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.ui.base.BasePresenter
import javax.inject.Inject
class MainPresenter @Inject constructor(errorHandler: ErrorHandler)
class MainPresenter @Inject constructor(
errorHandler: ErrorHandler,
private val prefRepository: PreferencesRepository)
: BasePresenter<MainView>(errorHandler) {
override fun onAttachView(view: MainView) {
super.onAttachView(view)
view.initView()
view.run {
startMenuIndex = prefRepository.startMenuIndex
initView()
}
}
fun onStartView() {
view?.run { setViewTitle(viewTitle(currentMenuIndex())) }
fun onViewStart() {
view?.apply {
currentViewTitle?.let { setViewTitle(it) }
currentStackSize?.let {
if (it > 1) showHomeArrow(true)
else showHomeArrow(false)
}
}
}
fun onMenuViewChange(index: Int) {
view?.run { setViewTitle(viewTitle(index)) }
fun onUpNavigate(): Boolean {
view?.popView()
return true
}
fun onBackPressed(default: () -> Unit) {
view?.run {
if (isRootView) default()
else popView()
}
}
fun onTabSelected(index: Int, wasSelected: Boolean): Boolean {

25
app/src/main/java/io/github/wulkanowy/ui/main/MainView.kt
View File

@ -4,20 +4,33 @@ import io.github.wulkanowy.ui.base.BaseView
interface MainView : BaseView {
var startMenuIndex: Int
val isRootView: Boolean
val currentViewTitle: String?
val currentStackSize: Int?
fun initView()
fun switchMenuView(position: Int)
fun setViewTitle(title: String)
fun viewTitle(index: Int): String
fun currentMenuIndex(): Int
fun showHomeArrow(show: Boolean)
fun notifyMenuViewReselected()
interface MenuFragmentView {
fun setViewTitle(title: String)
fun popView()
interface MainChildView {
fun onFragmentReselected()
}
interface TitledView {
val titleStringId: Int
}
}

68
app/src/main/java/io/github/wulkanowy/ui/main/about/AboutFragment.kt Normal file
View File

@ -0,0 +1,68 @@
package io.github.wulkanowy.ui.main.about
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.mikepenz.aboutlibraries.LibsBuilder
import com.mikepenz.aboutlibraries.LibsFragmentCompat
import io.github.wulkanowy.R
import io.github.wulkanowy.ui.base.BaseFragment
import io.github.wulkanowy.ui.main.MainView
import io.github.wulkanowy.utils.withOnExtraListener
import javax.inject.Inject
class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
@Inject
lateinit var presenter: AboutPresenter
@Inject
lateinit var fragmentCompat: LibsFragmentCompat
companion object {
fun newInstance() = AboutFragment()
}
override val titleStringId: Int
get() = R.string.about_title
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
presenter.onAttachView(this)
return Bundle().apply {
putSerializable("data", LibsBuilder()
.withAboutAppName(getString(R.string.app_name))
.withAboutVersionShown(true)
.withAboutIconShown(true)
.withLicenseShown(true)
.withAboutSpecial1(getString(R.string.about_source_code))
.withAboutSpecial2(getString(R.string.about_feedback))
.withCheckCachedDetection(false)
.withExcludedLibraries("fastadapter", "AndroidIconics", "gson",
"Jsoup", "Retrofit", "okio", "OkHttp")
.withOnExtraListener { presenter.onExtraSelect(it) })
}.let {
fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
}
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
fragmentCompat.onViewCreated(view, savedInstanceState)
}
override fun openSourceWebView() {
startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy", 0))
}
override fun openIssuesWebView() {
startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy/issues", 0))
}
override fun onDestroyView() {
fragmentCompat.onDestroyView()
presenter.onDetachView()
super.onDestroyView()
}
}

15
app/src/main/java/io/github/wulkanowy/ui/main/about/AboutModule.kt Normal file
View File

@ -0,0 +1,15 @@
package io.github.wulkanowy.ui.main.about
import com.mikepenz.aboutlibraries.LibsFragmentCompat
import dagger.Module
import dagger.Provides
import io.github.wulkanowy.di.scopes.PerFragment
@Module
class AboutModule {
@PerFragment
@Provides
fun provideLibsFragmentCompat() = LibsFragmentCompat()
}

21
app/src/main/java/io/github/wulkanowy/ui/main/about/AboutPresenter.kt Normal file
View File

@ -0,0 +1,21 @@
package io.github.wulkanowy.ui.main.about
import com.mikepenz.aboutlibraries.Libs
import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL1
import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL2
import io.github.wulkanowy.data.ErrorHandler
import io.github.wulkanowy.ui.base.BasePresenter
import javax.inject.Inject
class AboutPresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresenter<AboutView>(errorHandler) {
fun onExtraSelect(type: Libs.SpecialButton?) {
view?.run {
when (type) {
SPECIAL1 -> openSourceWebView()
SPECIAL2 -> openIssuesWebView()
else -> TODO()
}
}
}
}

10
app/src/main/java/io/github/wulkanowy/ui/main/about/AboutView.kt Normal file
View File

@ -0,0 +1,10 @@
package io.github.wulkanowy.ui.main.about
import io.github.wulkanowy.ui.base.BaseView
interface AboutView : BaseView {
fun openSourceWebView()
fun openIssuesWebView()
}

11
app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.kt
View File

@ -15,7 +15,7 @@ import io.github.wulkanowy.utils.setOnItemClickListener
import kotlinx.android.synthetic.main.fragment_attendance.*
import javax.inject.Inject
class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MenuFragmentView {
class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView, MainView.TitledView {
@Inject
lateinit var presenter: AttendancePresenter
@ -29,6 +29,12 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MenuFragment
fun newInstance() = AttendanceFragment()
}
override val titleStringId: Int
get() = R.string.attendance_title
override val isViewEmpty: Boolean
get() = attendanceAdapter.isEmpty
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_attendance, container, false)
}
@ -65,8 +71,6 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MenuFragment
attendanceAdapter.clear()
}
override fun isViewEmpty() = attendanceAdapter.isEmpty
override fun onFragmentReselected() {
presenter.onViewReselected()
}
@ -109,4 +113,3 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MenuFragment
super.onDestroyView()
}
}

10
app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.kt
View File

@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.main.attendance
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import io.github.wulkanowy.data.ErrorHandler
import io.github.wulkanowy.data.repositories.AttendanceRepository
import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.data.repositories.SessionRepository
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.utils.*
@ -17,7 +18,8 @@ class AttendancePresenter @Inject constructor(
private val errorHandler: ErrorHandler,
private val schedulers: SchedulersManager,
private val attendanceRepository: AttendanceRepository,
private val sessionRepository: SessionRepository
private val sessionRepository: SessionRepository,
private val prefRepository: PreferencesRepository
) : BasePresenter<AttendanceView>(errorHandler) {
lateinit var currentDate: LocalDate
@ -61,6 +63,10 @@ class AttendancePresenter @Inject constructor(
.delay(200, MILLISECONDS)
.map { it.single { semester -> semester.current } }
.flatMap { attendanceRepository.getAttendance(it, date, date, forceRefresh) }
.map { list ->
if (prefRepository.showPresent) list
else list.filter { !it.presence }
}
.map { items -> items.map { AttendanceItem(it) } }
.subscribeOn(schedulers.backgroundThread())
.observeOn(schedulers.mainThread())
@ -77,7 +83,7 @@ class AttendancePresenter @Inject constructor(
showContent(it.isNotEmpty())
}
}) {
view?.run { showEmpty(isViewEmpty()) }
view?.run { showEmpty(isViewEmpty) }
errorHandler.proceed(it)
}
)

4
app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceView.kt
View File

@ -5,6 +5,8 @@ import io.github.wulkanowy.ui.base.BaseView
interface AttendanceView : BaseView {
val isViewEmpty: Boolean
fun initView()
fun updateData(data: List<AttendanceItem>)
@ -13,8 +15,6 @@ interface AttendanceView : BaseView {
fun clearData()
fun isViewEmpty(): Boolean
fun hideRefresh()
fun showEmpty(show: Boolean)

11
app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamFragment.kt
View File

@ -16,7 +16,7 @@ import io.github.wulkanowy.utils.setOnItemClickListener
import kotlinx.android.synthetic.main.fragment_exam.*
import javax.inject.Inject
class ExamFragment : BaseFragment(), ExamView, MainView.MenuFragmentView {
class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.TitledView {
@Inject
lateinit var presenter: ExamPresenter
@ -26,9 +26,16 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MenuFragmentView {
companion object {
private const val SAVED_DATE_KEY = "CURRENT_DATE"
fun newInstance() = ExamFragment()
}
override val titleStringId: Int
get() = R.string.exam_title
override val isViewEmpty: Boolean
get() = examAdapter.isEmpty
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_exam, container, false)
}
@ -68,8 +75,6 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MenuFragmentView {
examAdapter.clear()
}
override fun isViewEmpty() = examAdapter.isEmpty
override fun onFragmentReselected() {
presenter.onViewReselected()
}

2
app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamPresenter.kt
View File

@ -80,7 +80,7 @@ class ExamPresenter @Inject constructor(
showContent(it.isNotEmpty())
}
}) {
view?.run { showEmpty(isViewEmpty()) }
view?.run { showEmpty(isViewEmpty) }
errorHandler.proceed(it)
})
}

4
app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamView.kt
View File

@ -5,6 +5,8 @@ import io.github.wulkanowy.ui.base.BaseView
interface ExamView : BaseView {
val isViewEmpty: Boolean
fun initView()
fun updateData(data: List<ExamItem>)
@ -13,8 +15,6 @@ interface ExamView : BaseView {
fun clearData()
fun isViewEmpty(): Boolean
fun hideRefresh()
fun showEmpty(show: Boolean)

12
app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt
View File

@ -15,7 +15,7 @@ import io.github.wulkanowy.utils.setOnSelectPageListener
import kotlinx.android.synthetic.main.fragment_grade.*
import javax.inject.Inject
class GradeFragment : BaseFragment(), GradeView, MainView.MenuFragmentView {
class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainView.TitledView {
@Inject
lateinit var presenter: GradePresenter
@ -29,6 +29,12 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MenuFragmentView {
fun newInstance() = GradeFragment()
}
override val titleStringId: Int
get() = R.string.grade_title
override val currentPageIndex: Int
get() = gradeViewPager.currentItem
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setHasOptionsMenu(true)
@ -93,8 +99,6 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MenuFragmentView {
}
}
override fun currentPageIndex() = gradeViewPager.currentItem
fun onChildRefresh() {
presenter.onChildViewRefresh()
}
@ -124,4 +128,4 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MenuFragmentView {
super.onDestroyView()
presenter.onDetachView()
}
}
}

10
app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt
View File

@ -32,7 +32,7 @@ class GradePresenter @Inject constructor(
}
fun onViewReselected() {
view?.run { notifyChildParentReselected(currentPageIndex()) }
view?.run { notifyChildParentReselected(currentPageIndex) }
}
fun onSemesterSwitch(): Boolean {
@ -46,20 +46,20 @@ class GradePresenter @Inject constructor(
loadedSemesterId.clear()
view?.let {
notifyChildrenSemesterChange()
loadChild(it.currentPageIndex())
loadChild(it.currentPageIndex)
}
}
}
fun onChildViewRefresh() {
view?.let { loadChild(it.currentPageIndex(), forceRefresh = true) }
view?.let { loadChild(it.currentPageIndex, forceRefresh = true) }
}
fun onChildViewLoaded(semesterId: Int) {
view?.apply {
showContent(true)
showProgress(false)
loadedSemesterId[currentPageIndex()] = semesterId
loadedSemesterId[currentPageIndex] = semesterId
}
}
@ -78,7 +78,7 @@ class GradePresenter @Inject constructor(
.subscribeOn(schedulers.backgroundThread())
.observeOn(schedulers.mainThread())
.subscribe({ _ ->
view?.let { loadChild(it.currentPageIndex()) }
view?.let { loadChild(it.currentPageIndex) }
}) { errorHandler.proceed(it) })
}

4
app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt
View File

@ -4,9 +4,9 @@ import io.github.wulkanowy.ui.base.BaseView
interface GradeView : BaseView {
fun initView()
val currentPageIndex: Int
fun currentPageIndex(): Int
fun initView()
fun showContent(show: Boolean)

24
app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt
View File

@ -31,6 +31,18 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
fun newInstance() = GradeDetailsFragment()
}
override val emptyAverageString: String
get() = getString(R.string.grade_no_average)
override val averageString: String
get() = getString(R.string.grade_average)
override val weightString: String
get() = getString(R.string.grade_weight)
override val isViewEmpty
get() = gradeDetailsAdapter.isEmpty
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_grade_details, container, false)
}
@ -80,7 +92,9 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
return gradeDetailsAdapter.getExpandableOf(item)
}
override fun isViewEmpty() = gradeDetailsAdapter.isEmpty
override fun getGradeNumberString(number: Int): String {
return resources.getQuantityString(R.plurals.grade_number_item, number, number)
}
override fun showProgress(show: Boolean) {
gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
@ -122,14 +136,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
(parentFragment as? GradeFragment)?.onChildRefresh()
}
override fun emptyAverageString(): String = getString(R.string.grade_no_average)
override fun averageString(): String = getString(R.string.grade_average)
override fun gradeNumberString(number: Int): String = resources.getQuantityString(R.plurals.grade_number_item, number, number)
override fun weightString(): String = getString(R.string.grade_weight)
override fun onDestroyView() {
super.onDestroyView()
presenter.onDetachView()

12
app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt
View File

@ -42,7 +42,7 @@ class GradeDetailsPresenter @Inject constructor(
updateData(it)
}
}) {
view?.run { showEmpty(isViewEmpty()) }
view?.run { showEmpty(isViewEmpty) }
errorHandler.proceed(it)
})
}
@ -72,7 +72,7 @@ class GradeDetailsPresenter @Inject constructor(
fun onParentViewReselected() {
view?.run {
if (!isViewEmpty()) resetView()
if (!isViewEmpty) resetView()
}
}
@ -93,13 +93,13 @@ class GradeDetailsPresenter @Inject constructor(
GradeDetailsHeader(
subject = it.key,
average = formatAverage(average),
number = view?.gradeNumberString(it.value.size).orEmpty(),
number = view?.getGradeNumberString(it.value.size).orEmpty(),
newGrades = it.value.filter { grade -> grade.isNew }.size
).apply {
subItems = it.value.map { item ->
GradeDetailsItem(
grade = item,
weightString = view?.weightString().orEmpty(),
weightString = view?.weightString.orEmpty(),
valueColor = item.valueColor
)
}
@ -110,8 +110,8 @@ class GradeDetailsPresenter @Inject constructor(
private fun formatAverage(average: Double): String {
return view?.run {
if (average == 0.0) emptyAverageString()
else averageString().format(average)
if (average == 0.0) emptyAverageString
else averageString.format(average)
}.orEmpty()
}

24
app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt
View File

@ -8,20 +8,24 @@ import io.github.wulkanowy.ui.base.BaseView
interface GradeDetailsView : BaseView {
val isViewEmpty: Boolean
val emptyAverageString: String
val averageString: String
val weightString: String
fun initView()
fun updateData(data: List<GradeDetailsHeader>)
fun updateItem(item: AbstractFlexibleItem<*>)
fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?
fun resetView()
fun clearView()
fun isViewEmpty(): Boolean
fun showGradeDialog(grade: Grade)
fun showContent(show: Boolean)
@ -32,15 +36,11 @@ interface GradeDetailsView : BaseView {
fun showRefresh(show: Boolean)
fun emptyAverageString(): String
fun averageString(): String
fun gradeNumberString(number: Int): String
fun weightString(): String
fun notifyParentDataLoaded(semesterId: Int)
fun notifyParentRefresh()
fun getGradeNumberString(number: Int): String
fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?
}

15
app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt
View File

@ -27,6 +27,15 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
fun newInstance() = GradeSummaryFragment()
}
override val isViewEmpty
get() = gradeSummaryAdapter.isEmpty
override val predictedString
get() = getString(R.string.grade_summary_predicted_grade)
override val finalString
get() = getString(R.string.grade_summary_final_grade)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_grade_summary, container, false)
}
@ -63,8 +72,6 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
gradeSummaryAdapter.smoothScrollToPosition(0)
}
override fun isViewEmpty() = gradeSummaryAdapter.isEmpty
override fun showContent(show: Boolean) {
gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
}
@ -101,10 +108,6 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
(parentFragment as? GradeFragment)?.onChildRefresh()
}
override fun predictedString() = getString(R.string.grade_summary_predicted_grade)
override fun finalString() = getString(R.string.grade_summary_final_grade)
override fun onDestroyView() {
super.onDestroyView()
presenter.onDetachView()

8
app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt
View File

@ -61,7 +61,7 @@ class GradeSummaryPresenter @Inject constructor(
updateDataSet(it.first, it.second)
}
}) {
view?.run { showEmpty(isViewEmpty()) }
view?.run { showEmpty(isViewEmpty) }
errorHandler.proceed(it)
})
}
@ -72,7 +72,7 @@ class GradeSummaryPresenter @Inject constructor(
fun onParentViewReselected() {
view?.run {
if (!isViewEmpty()) resetView()
if (!isViewEmpty) resetView()
}
}
@ -97,11 +97,11 @@ class GradeSummaryPresenter @Inject constructor(
).let {
listOf(GradeSummaryItem(
header = it,
title = view?.predictedString().orEmpty(),
title = view?.predictedString.orEmpty(),
grade = gradeSummary.predictedGrade
), GradeSummaryItem(
header = it,
title = view?.finalString().orEmpty(),
title = view?.finalString.orEmpty(),
grade = gradeSummary.finalGrade
))
}

12
app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt
View File

@ -4,6 +4,12 @@ import io.github.wulkanowy.ui.base.BaseView
interface GradeSummaryView : BaseView {
val isViewEmpty: Boolean
val predictedString: String
val finalString: String
fun initView()
fun updateDataSet(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader)
@ -12,8 +18,6 @@ interface GradeSummaryView : BaseView {
fun clearView()
fun isViewEmpty(): Boolean
fun showProgress(show: Boolean)
fun showRefresh(show: Boolean)
@ -22,10 +26,6 @@ interface GradeSummaryView : BaseView {
fun showEmpty(show: Boolean)
fun predictedString(): String
fun finalString(): String
fun notifyParentDataLoaded(semesterId: Int)
fun notifyParentRefresh()

81
app/src/main/java/io/github/wulkanowy/ui/main/more/MoreFragment.kt
View File

@ -1,20 +1,95 @@
package io.github.wulkanowy.ui.main.more
import android.graphics.drawable.Drawable
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import io.github.wulkanowy.R
import io.github.wulkanowy.ui.base.BaseFragment
import io.github.wulkanowy.ui.main.MainActivity
import io.github.wulkanowy.ui.main.MainView
import io.github.wulkanowy.ui.main.about.AboutFragment
import io.github.wulkanowy.ui.main.settings.SettingsFragment
import io.github.wulkanowy.utils.setOnItemClickListener
import kotlinx.android.synthetic.main.fragment_more.*
import javax.inject.Inject
class MoreFragment : BaseFragment() {
class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.MainChildView {
@Inject
lateinit var presenter: MorePresenter
@Inject
lateinit var moreAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
companion object {
fun newInstance() = MoreFragment()
}
override val titleStringId: Int
get() = R.string.more_title
override val settingsRes: Pair<String, Drawable?>?
get() {
return context?.run {
getString(R.string.settings_title) to
ContextCompat.getDrawable(this, R.drawable.ic_more_settings_24dp)
}
}
override val aboutRes: Pair<String, Drawable?>?
get() {
return context?.run {
getString(R.string.about_title) to
ContextCompat.getDrawable(this, R.drawable.ic_more_about_24dp)
}
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_attendance, container, false)
return inflater.inflate(R.layout.fragment_more, container, false)
}
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
presenter.onAttachView(this)
}
override fun initView() {
moreAdapter.run { setOnItemClickListener { presenter.onItemSelected(getItem(it)) } }
moreRecycler.apply {
layoutManager = SmoothScrollLinearLayoutManager(context)
adapter = moreAdapter
}
}
override fun onFragmentReselected() {
presenter.onViewReselected()
}
override fun updateData(data: List<MoreItem>) {
moreAdapter.updateDataSet(data)
}
override fun openSettingsView() {
(activity as? MainActivity)?.pushView(SettingsFragment.newInstance())
}
override fun openAboutView() {
(activity as? MainActivity)?.pushView(AboutFragment.newInstance())
}
override fun popView() {
(activity as? MainActivity)?.popView()
}
override fun onDestroyView() {
presenter.onDetachView()
super.onDestroyView()
}
}

51
app/src/main/java/io/github/wulkanowy/ui/main/more/MoreItem.kt Normal file
View File

@ -0,0 +1,51 @@
package io.github.wulkanowy.ui.main.more
import android.graphics.drawable.Drawable
import android.view.View
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import eu.davidea.flexibleadapter.items.IFlexible
import eu.davidea.viewholders.FlexibleViewHolder
import io.github.wulkanowy.R
import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.item_more.*
class MoreItem(val title: String, private val drawable: Drawable?)
: AbstractFlexibleItem<MoreItem.ViewHolder>() {
override fun getLayoutRes() = R.layout.item_more
override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
return ViewHolder(view, adapter)
}
override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?,
position: Int, payloads: MutableList<Any>?) {
holder?.apply {
moreItemTitle.text = title
moreItemImage.setImageDrawable(drawable)
}
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as MoreItem
if (title != other.title) return false
return true
}
override fun hashCode(): Int {
return title.hashCode()
}
class ViewHolder(view: View?, adapter: FlexibleAdapter<*>?)
: FlexibleViewHolder(view, adapter), LayoutContainer {
override val containerView: View?
get() = contentView
}
}

39
app/src/main/java/io/github/wulkanowy/ui/main/more/MorePresenter.kt Normal file
View File

@ -0,0 +1,39 @@
package io.github.wulkanowy.ui.main.more
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import io.github.wulkanowy.data.ErrorHandler
import io.github.wulkanowy.ui.base.BasePresenter
import javax.inject.Inject
class MorePresenter @Inject constructor(errorHandler: ErrorHandler)
: BasePresenter<MoreView>(errorHandler) {
override fun onAttachView(view: MoreView) {
super.onAttachView(view)
view.initView()
loadData()
}
fun onItemSelected(item: AbstractFlexibleItem<*>?) {
if (item is MoreItem) {
view?.run {
when (item.title) {
settingsRes?.first -> openSettingsView()
aboutRes?.first -> openAboutView()
}
}
}
}
fun onViewReselected() {
view?.popView()
}
private fun loadData() {
view?.run {
updateData(listOfNotNull(
settingsRes?.let { MoreItem(it.first, it.second) },
aboutRes?.let { MoreItem(it.first, it.second) }))
}
}
}

21
app/src/main/java/io/github/wulkanowy/ui/main/more/MoreView.kt Normal file
View File

@ -0,0 +1,21 @@
package io.github.wulkanowy.ui.main.more
import android.graphics.drawable.Drawable
import io.github.wulkanowy.ui.base.BaseView
interface MoreView : BaseView {
val settingsRes: Pair<String, Drawable?>?
val aboutRes: Pair<String, Drawable?>?
fun initView()
fun updateData(data: List<MoreItem>)
fun openSettingsView()
fun openAboutView()
fun popView()
}

20
app/src/main/java/io/github/wulkanowy/ui/main/settings/SettingsFragment.kt Normal file
View File

@ -0,0 +1,20 @@
package io.github.wulkanowy.ui.main.settings
import android.os.Bundle
import com.takisoft.preferencex.PreferenceFragmentCompat
import io.github.wulkanowy.R
import io.github.wulkanowy.ui.main.MainView
class SettingsFragment : PreferenceFragmentCompat(), MainView.TitledView {
companion object {
fun newInstance() = SettingsFragment()
}
override val titleStringId: Int
get() = R.string.settings_title
override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.scheme_preferences)
}
}

10
app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.kt
View File

@ -15,7 +15,7 @@ import io.github.wulkanowy.utils.setOnItemClickListener
import kotlinx.android.synthetic.main.fragment_timetable.*
import javax.inject.Inject
class TimetableFragment : BaseFragment(), TimetableView, MainView.MenuFragmentView {
class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView, MainView.TitledView {
@Inject
lateinit var presenter: TimetablePresenter
@ -29,6 +29,12 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MenuFragmentVi
fun newInstance() = TimetableFragment()
}
override val titleStringId: Int
get() = R.string.timetable_title
override val roomString: String
get() = getString(R.string.timetable_room)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_timetable, container, false)
}
@ -99,8 +105,6 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MenuFragmentVi
TimetableDialog.newInstance(lesson).show(fragmentManager, lesson.toString())
}
override fun roomString() = getString(R.string.timetable_room)
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())

2
app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.kt
View File

@ -61,7 +61,7 @@ class TimetablePresenter @Inject constructor(
.delay(200, MILLISECONDS)
.map { it.single { semester -> semester.current } }
.flatMap { timetableRepository.getTimetable(it, currentDate, currentDate, forceRefresh) }
.map { items -> items.map { TimetableItem(it, view?.roomString().orEmpty()) } }
.map { items -> items.map { TimetableItem(it, view?.roomString.orEmpty()) } }
.subscribeOn(schedulers.backgroundThread())
.observeOn(schedulers.mainThread())
.doFinally {

4
app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableView.kt
View File

@ -5,6 +5,8 @@ import io.github.wulkanowy.ui.base.BaseView
interface TimetableView : BaseView {
val roomString: String
fun initView()
fun updateData(data: List<TimetableItem>)
@ -28,6 +30,4 @@ interface TimetableView : BaseView {
fun showNextButton(show: Boolean)
fun showTimetableDialog(lesson: Timetable)
fun roomString(): String
}

15
app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
View File

@ -3,11 +3,18 @@ package io.github.wulkanowy.utils
import androidx.fragment.app.Fragment
import com.ncapdevi.fragnav.FragNavController
inline fun FragNavController.setOnTabTransactionListener(crossinline listener: (index: Int) -> Unit) {
inline fun FragNavController.setOnViewChangeListener(crossinline listener: (fragment: Fragment?) -> Unit) {
transactionListener = object : FragNavController.TransactionListener {
override fun onFragmentTransaction(fragment: Fragment?, transactionType: FragNavController.TransactionType) {}
override fun onFragmentTransaction(fragment: Fragment?, transactionType: FragNavController.TransactionType) {
listener(fragment)
}
override fun onTabTransaction(fragment: Fragment?, index: Int) {
listener(index)
listener(fragment)
}
}
}
}
fun FragNavController.safelyPopFragment() {
if (!isRootFragment) popFragment()
}

16
app/src/main/java/io/github/wulkanowy/utils/LibsBuiderExtension.kt Normal file
View File

@ -0,0 +1,16 @@
package io.github.wulkanowy.utils
import android.view.View
import com.mikepenz.aboutlibraries.Libs
import com.mikepenz.aboutlibraries.LibsBuilder
import com.mikepenz.aboutlibraries.LibsConfiguration
inline fun LibsBuilder.withOnExtraListener(crossinline listener: (Libs.SpecialButton?) -> Unit): LibsBuilder {
withListener(object : LibsConfiguration.LibsListenerImpl() {
override fun onExtraClicked(v: View?, specialButton: Libs.SpecialButton?): Boolean {
listener(specialButton)
return true
}
})
return this
}