Skip to content

Commit

Permalink
#48: add di
Browse files Browse the repository at this point in the history
#56: add filter for projects

#56: add nested scroll view

#56: rename search ui view model
  • Loading branch information
Shiplayer authored and temnik15 committed Feb 16, 2021
1 parent 3ef9d32 commit be9becc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions app/src/main/java/so/codex/hawk/ui/main/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package so.codex.hawk.ui.main

import android.graphics.BitmapFactory
import android.os.Bundle
import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.GravityCompat
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.activity_main.drawer
Expand Down Expand Up @@ -72,7 +71,7 @@ class MainActivity : AppCompatActivity(), WorkspaceAdapter.OnWorkspaceClickListe
*/
private fun handleUiModels(model: UiMainViewModel) {
toolbar.title = model.title
search.update(model.searchUiViewModel)
search.update(model.searchViewModel)
if (model.showLoading) {
// do some staff for showing loading
Timber.i("show loading")
Expand All @@ -96,6 +95,7 @@ class MainActivity : AppCompatActivity(), WorkspaceAdapter.OnWorkspaceClickListe
initDrawer()
}


/**
* init custom toolbar
*/
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/so/codex/hawk/ui/main/MainViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import so.codex.hawk.HawkApp
import so.codex.hawk.R
import so.codex.hawk.custom.views.SquircleDrawable
import so.codex.hawk.custom.views.badge.UiBadgeViewModel
import so.codex.hawk.custom.views.search.HawkSearchUiViewModel
import so.codex.hawk.custom.views.search.HawkSearchViewModel
import so.codex.hawk.domain.FetchProjectsInteractor
import so.codex.hawk.domain.FetchWorkspacesInteractor
import so.codex.hawk.entity.Project
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer"
tools:openDrawer="start"
android:layout_width="match_parent"
android:layout_height="match_parent">

Expand Down

0 comments on commit be9becc

Please sign in to comment.