isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 01:28:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove BaseRootView

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-12-23 13:06:29 -06:00
parent b42ad0dd83
commit a58c60b8ce
5 changed files with 23 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
View File

@@ -60,7 +60,7 @@ class ListHabitsActivity : HabitsActivity() {
setScreen(screen)
component.listHabitsBehavior.onStartup()
setTitle(R.string.main_activity_title)
setContentView(rootView)
}
override fun onPause() {

23
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
View File

@@ -49,7 +49,7 @@ class ListHabitsRootView @Inject constructor(
runner: TaskRunner,
private val listAdapter: HabitCardListAdapter,
habitCardListViewFactory: HabitCardListViewFactory
) : BaseRootView(context), ModelObservable.Listener {
) : FrameLayout(context), ModelObservable.Listener {
val listView: HabitCardListView = habitCardListViewFactory.create()
val llEmpty = EmptyListView(context)
@@ -63,7 +63,7 @@ class ListHabitsRootView @Inject constructor(
val hintList = hintListFactory.create(hints)
hintView = HintView(context, hintList)
addView(RelativeLayout(context).apply {
val rootView = RelativeLayout(context).apply {
background = sres.getDrawable(R.attr.windowBackgroundColor)
addAtTop(tbar)
addBelow(header, tbar)
@@ -73,18 +73,15 @@ class ListHabitsRootView @Inject constructor(
it.topMargin = dp(-6.0f).toInt()
}
addAtBottom(hintView)
if (SDK_INT < LOLLIPOP) {
addBelow(ShadowView(context), tbar)
addBelow(ShadowView(context), header)
}
}, MATCH_PARENT, MATCH_PARENT)
}
rootView.setupToolbar(
toolbar = tbar,
title = resources.getString(R.string.main_activity_title),
color = PaletteColor(17),
displayHomeAsUpEnabled = false,
)
addView(rootView, MATCH_PARENT, MATCH_PARENT)
listAdapter.setListView(listView)
initToolbar()
}
override fun getToolbar(): Toolbar {
return tbar
}
override fun onModelChange() {

24
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
View File

@@ -39,6 +39,7 @@ import org.isoron.uhabits.core.ui.screens.habits.list.*
import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.*
import org.isoron.uhabits.intents.*
import org.isoron.uhabits.tasks.*
import org.isoron.uhabits.utils.*
import java.io.*
import javax.inject.*
@@ -73,10 +74,6 @@ class ListHabitsScreen
ListHabitsMenuBehavior.Screen,
ListHabitsSelectionMenuBehavior.Screen {
init {
setRootView(rootView)
}
fun onAttached() {
commandRunner.addListener(this)
if(activity.intent.action == "android.intent.action.VIEW") {
@@ -94,8 +91,11 @@ class ListHabitsScreen
}
override fun onCommandExecuted(command: Command?, refreshKey: Long?) {
if (command != null)
showMessage(getExecuteString(command))
if (command != null) {
val stringId = getExecuteString(command)
if (stringId != null)
activity.showMessage(stringId)
}
}
override fun onResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -115,7 +115,7 @@ class ListHabitsScreen
inStream.copyTo(tempFile)
onImportData(tempFile) { tempFile.delete() }
} catch (e: IOException) {
showMessage(R.string.could_not_import)
activity.showMessage(R.string.could_not_import)
e.printStackTrace()
}
}
@@ -175,7 +175,7 @@ class ListHabitsScreen
}
override fun showMessage(m: ListHabitsBehavior.Message) {
showMessage(when (m) {
activity.showMessage(when (m) {
COULD_NOT_EXPORT -> R.string.could_not_export
IMPORT_SUCCESSFUL -> R.string.habits_imported
IMPORT_FAILED -> R.string.could_not_import
@@ -232,11 +232,11 @@ class ListHabitsScreen
taskRunner.execute(importTaskFactory.create(file) { result ->
if (result == ImportDataTask.SUCCESS) {
adapter.refresh()
showMessage(R.string.habits_imported)
activity.showMessage(R.string.habits_imported)
} else if (result == ImportDataTask.NOT_RECOGNIZED) {
showMessage(R.string.file_not_recognized)
activity.showMessage(R.string.file_not_recognized)
} else {
showMessage(R.string.could_not_import)
activity.showMessage(R.string.could_not_import)
}
onFinished()
})
@@ -245,7 +245,7 @@ class ListHabitsScreen
private fun onExportDB() {
taskRunner.execute(exportDBFactory.create { filename ->
if (filename != null) showSendFileScreen(filename)
else showMessage(R.string.could_not_export)
else activity.showMessage(R.string.could_not_export)
})
}
}