Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.fossasia.openevent.general.di

import org.koin.dsl.module.module

val flavorSpecificModule = module { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package org.fossasia.openevent.general.welcome

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.navigation.Navigation
import kotlinx.android.synthetic.main.fragment_welcome.view.currentLocation
import kotlinx.android.synthetic.main.fragment_welcome.view.pickCityButton
import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.utils.Utils

class WelcomeFragment : Fragment() {
private lateinit var rootView: View

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
rootView = inflater.inflate(R.layout.fragment_welcome, container, false)

(activity as? AppCompatActivity)?.supportActionBar?.hide()

rootView.currentLocation.visibility = View.GONE

rootView.pickCityButton.setOnClickListener {
Navigation.findNavController(rootView).navigate(R.id.searchLocationFragment, null, Utils.getAnimSlide())
}

return rootView
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.jakewharton.threetenabp.AndroidThreeTen
import org.fossasia.openevent.general.di.apiModule
import org.fossasia.openevent.general.di.commonModule
import org.fossasia.openevent.general.di.databaseModule
import org.fossasia.openevent.general.di.flavorSpecificModule
import org.fossasia.openevent.general.di.networkModule
import org.fossasia.openevent.general.di.viewModelModule
import org.koin.android.ext.android.startKoin
Expand All @@ -22,7 +23,9 @@ class OpenEventGeneral : MultiDexApplication() {
override fun onCreate() {
super.onCreate()
appContext = applicationContext
startKoin(this, listOf(commonModule, apiModule, viewModelModule, networkModule, databaseModule))
startKoin(this, listOf(
commonModule, apiModule, viewModelModule, networkModule, databaseModule, flavorSpecificModule
))
Timber.plant(Timber.DebugTree())
AndroidThreeTen.init(applicationContext)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ import org.fossasia.openevent.general.ticket.TicketApi
import org.fossasia.openevent.general.ticket.TicketId
import org.fossasia.openevent.general.ticket.TicketService
import org.fossasia.openevent.general.ticket.TicketsViewModel
import org.fossasia.openevent.general.welcome.WelcomeViewModel
import org.koin.android.ext.koin.androidApplication
import org.koin.android.ext.koin.androidContext
import org.koin.androidx.viewmodel.ext.koin.viewModel
Expand Down Expand Up @@ -148,7 +147,6 @@ val viewModelModule = module {
viewModel { EditProfileViewModel(get(), get()) }
viewModel { GeoLocationViewModel(get()) }
viewModel { SmartAuthViewModel() }
viewModel { WelcomeViewModel(get(), get()) }
}

val networkModule = module {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.fossasia.openevent.general.di

import org.fossasia.openevent.general.welcome.WelcomeViewModel
import org.koin.androidx.viewmodel.ext.koin.viewModel
import org.koin.dsl.module.module

val flavorSpecificModule = module {
viewModel { WelcomeViewModel(get(), get()) }
}