Skip to content

Commit 75e03a8

Browse files
committed
add exception
1 parent abfc843 commit 75e03a8

File tree

5 files changed

+30
-20
lines changed

5 files changed

+30
-20
lines changed
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package com.yjh.project.commitprogress.di.component
22

33
import com.yjh.project.commitprogress.di.app.App
4-
import com.yjh.project.commitprogress.di.module.ActivityModule
54
import com.yjh.project.commitprogress.di.module.AppModule
65
import com.yjh.project.commitprogress.di.module.NetworkModule
76
import com.yjh.project.commitprogress.ui.activity.LoginActivity
7+
import com.yjh.project.commitprogress.ui.activity.MainActivity
8+
import com.yjh.project.commitprogress.ui.activity.OwnerRepositoryDetailActivity
89
import com.yjh.project.commitprogress.ui.fragment.OwnerRepoFragment
910
import dagger.Component
1011
import javax.inject.Singleton
1112

1213
@Singleton
1314
@Component(
14-
modules = [(AppModule::class),(NetworkModule::class),ActivityModule::class]
15+
modules = [(AppModule::class),(NetworkModule::class)]
1516
)
1617
interface AppComponent{
1718

@@ -20,4 +21,8 @@ interface AppComponent{
2021
fun inject(ownerRepoFragment: OwnerRepoFragment)
2122

2223
fun inject(loginActivity: LoginActivity)
24+
25+
fun inject(mainActivity: MainActivity)
26+
27+
fun inject(ownerRepositoryDetailActivity: OwnerRepositoryDetailActivity)
2328
}

app/src/main/java/com/yjh/project/commitprogress/presenter/login/LoginContract.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ interface LoginContract{
1212
interface View : BaseView{
1313
fun moveMainActivity(id : String)
1414
fun moveGithubWebView(httpUrl: HttpUrl)
15+
fun hideProgress()
1516
}
1617

1718
interface UserActionListener {

app/src/main/java/com/yjh/project/commitprogress/presenter/ownerRepo/OwnerRepoPresenter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class OwnerRepoPresenter @Inject constructor(
2020
view?.showRepositories(repo.sortedByDescending { repo -> repo.first.stargazersCount })
2121
},
2222
{
23-
// error
23+
view?.onError()
2424
}
2525
)
2626
)
@@ -37,7 +37,7 @@ class OwnerRepoPresenter @Inject constructor(
3737
view?.showProfile(response)
3838
},
3939
{
40-
//error
40+
view?.onError()
4141
}
4242
)
4343
)

app/src/main/java/com/yjh/project/commitprogress/ui/activity/LoginActivity.kt

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,21 @@ import com.yjh.project.commitprogress.di.app.App
1010
import com.yjh.project.commitprogress.presenter.login.LoginContract
1111
import com.yjh.project.commitprogress.presenter.login.LoginPresenter
1212
import com.yjh.project.commitprogress.ui.base.BaseActivity
13-
import dagger.android.support.DaggerAppCompatActivity
1413
import kotlinx.android.synthetic.main.activity_login.*
1514
import okhttp3.HttpUrl
1615
import javax.inject.Inject
1716

18-
1917
class LoginActivity : BaseActivity() , LoginContract.View{
20-
override fun onActivityInject() {
21-
App.component.inject(this)
22-
}
2318

2419
@Inject
2520
lateinit var presenter: LoginPresenter
2621

2722
private val mAuth: FirebaseAuth by lazy { FirebaseAuth.getInstance() }
2823

24+
override fun onActivityInject() {
25+
App.component.inject(this)
26+
}
27+
2928
override fun onCreate(savedInstanceState: Bundle?) {
3029
super.onCreate(savedInstanceState)
3130
setContentView(R.layout.activity_login)
@@ -41,13 +40,6 @@ class LoginActivity : BaseActivity() , LoginContract.View{
4140
}
4241
}
4342

44-
override fun moveGithubWebView(okHttpUrl: HttpUrl) {
45-
Intent(Intent.ACTION_VIEW, Uri.parse(okHttpUrl.toString())).let {
46-
startActivity(it)
47-
startActivityForResult(it,100)
48-
}
49-
}
50-
5143
override fun onResume() {
5244
super.onResume()
5345

@@ -57,18 +49,30 @@ class LoginActivity : BaseActivity() , LoginContract.View{
5749
if (code != null && state != null) {
5850
Log.d("RedirectedActivity", "code != null && state != null")
5951
presenter.loadGithubToken(
60-
mAuth,
61-
code,
62-
state
52+
mAuth,
53+
code,
54+
state
6355
)
6456
}
6557
}
6658

59+
override fun moveGithubWebView(okHttpUrl: HttpUrl) {
60+
Intent(Intent.ACTION_VIEW, Uri.parse(okHttpUrl.toString())).let {
61+
startActivity(it)
62+
startActivityForResult(it,100)
63+
}
64+
}
65+
6766
override fun moveMainActivity(id : String) {
6867
Intent(applicationContext,MainActivity::class.java).let {
6968
it.putExtra("id",id)
7069
startActivity(it)
7170
finish()
7271
}
7372
}
73+
74+
override fun hideProgress() {
75+
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
76+
}
77+
7478
}

app/src/main/java/com/yjh/project/commitprogress/ui/activity/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class MainActivity : BaseActivity() , MainContract.View{
4646

4747
override fun getPageTitle(position: Int): CharSequence? = fragments[position].first
4848

49-
override fun getItem(position: Int): Fragment = fragments[position].second.value as Fragment
49+
override fun getItem(position: Int): Fragment = fragments[position].second.value
5050

5151
override fun getCount(): Int = fragments.size
5252
}

0 commit comments

Comments
 (0)