Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
门心叼龙
android-mvvm-architecture
提交
4d6f0fe7
A
android-mvvm-architecture
项目概览
门心叼龙
/
android-mvvm-architecture
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
android-mvvm-architecture
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4d6f0fe7
编写于
7月 08, 2017
作者:
A
amitshekhariitbhu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add Dummy Login for fb and google
上级
1dc4394b
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
99 addition
and
14 deletion
+99
-14
app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginActivity.java
...a/com/mindorks/framework/mvvm/ui/login/LoginActivity.java
+13
-2
app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginCallback.java
...a/com/mindorks/framework/mvvm/ui/login/LoginCallback.java
+3
-0
app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginViewModel.java
.../com/mindorks/framework/mvvm/ui/login/LoginViewModel.java
+68
-0
app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivity.java
...ava/com/mindorks/framework/mvvm/ui/main/MainActivity.java
+1
-1
app/src/main/java/com/mindorks/framework/mvvm/ui/splash/SplashActivity.java
...com/mindorks/framework/mvvm/ui/splash/SplashActivity.java
+1
-1
app/src/main/res/layout/activity_login.xml
app/src/main/res/layout/activity_login.xml
+10
-7
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/activity_main.xml
+2
-2
app/src/main/res/layout/activity_splash.xml
app/src/main/res/layout/activity_splash.xml
+1
-1
未找到文件。
app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginActivity.java
浏览文件 @
4d6f0fe7
...
...
@@ -24,6 +24,7 @@ import android.os.Bundle;
import
com.mindorks.framework.mvvm.R
;
import
com.mindorks.framework.mvvm.databinding.ActivityLoginBinding
;
import
com.mindorks.framework.mvvm.ui.base.BaseActivity
;
import
com.mindorks.framework.mvvm.ui.main.MainActivity
;
import
javax.inject.Inject
;
...
...
@@ -38,6 +39,8 @@ public class LoginActivity extends BaseActivity implements LoginCallback {
@Inject
LoginViewModel
mLoginViewModel
;
private
ActivityLoginBinding
binding
;
public
static
Intent
getStartIntent
(
Context
context
)
{
Intent
intent
=
new
Intent
(
context
,
LoginActivity
.
class
);
return
intent
;
...
...
@@ -47,15 +50,16 @@ public class LoginActivity extends BaseActivity implements LoginCallback {
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
ActivityLoginBinding
binding
=
DataBindingUtil
.
setContentView
(
this
,
R
.
layout
.
activity_login
);
binding
=
DataBindingUtil
.
setContentView
(
this
,
R
.
layout
.
activity_login
);
getActivityComponent
().
inject
(
this
);
setUnBinder
(
ButterKnife
.
bind
(
this
));
binding
.
setView
m
odel
(
mLoginViewModel
);
binding
.
setView
M
odel
(
mLoginViewModel
);
mLoginViewModel
.
setCallback
(
this
);
}
@Override
...
...
@@ -63,4 +67,11 @@ public class LoginActivity extends BaseActivity implements LoginCallback {
super
.
onDestroy
();
mLoginViewModel
.
onDestroy
();
}
@Override
public
void
openMainActivity
()
{
Intent
intent
=
MainActivity
.
getStartIntent
(
LoginActivity
.
this
);
startActivity
(
intent
);
finish
();
}
}
app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginCallback.java
浏览文件 @
4d6f0fe7
...
...
@@ -21,4 +21,7 @@ package com.mindorks.framework.mvvm.ui.login;
*/
public
interface
LoginCallback
{
void
openMainActivity
();
}
app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginViewModel.java
浏览文件 @
4d6f0fe7
...
...
@@ -16,11 +16,15 @@
package
com.mindorks.framework.mvvm.ui.login
;
import
com.androidnetworking.error.ANError
;
import
com.mindorks.framework.mvvm.data.DataManager
;
import
com.mindorks.framework.mvvm.data.network.model.LoginRequest
;
import
com.mindorks.framework.mvvm.data.network.model.LoginResponse
;
import
com.mindorks.framework.mvvm.ui.base.BaseViewModel
;
import
com.mindorks.framework.mvvm.utils.rx.SchedulerProvider
;
import
io.reactivex.disposables.CompositeDisposable
;
import
io.reactivex.functions.Consumer
;
/**
* Created by amitshekhar on 08/07/17.
...
...
@@ -33,4 +37,68 @@ public class LoginViewModel extends BaseViewModel<LoginCallback> {
CompositeDisposable
compositeDisposable
)
{
super
(
dataManager
,
schedulerProvider
,
compositeDisposable
);
}
public
void
onServerLoginClick
()
{
}
public
void
onGoogleLoginClick
()
{
getCompositeDisposable
().
add
(
getDataManager
()
.
doGoogleLoginApiCall
(
new
LoginRequest
.
GoogleLoginRequest
(
"test1"
,
"test1"
))
.
subscribeOn
(
getSchedulerProvider
().
io
())
.
observeOn
(
getSchedulerProvider
().
ui
())
.
subscribe
(
new
Consumer
<
LoginResponse
>()
{
@Override
public
void
accept
(
LoginResponse
response
)
throws
Exception
{
getDataManager
().
updateUserInfo
(
response
.
getAccessToken
(),
response
.
getUserId
(),
DataManager
.
LoggedInMode
.
LOGGED_IN_MODE_GOOGLE
,
response
.
getUserName
(),
response
.
getUserEmail
(),
response
.
getGoogleProfilePicUrl
());
getCallback
().
openMainActivity
();
}
},
new
Consumer
<
Throwable
>()
{
@Override
public
void
accept
(
Throwable
throwable
)
throws
Exception
{
// handle the login error here
if
(
throwable
instanceof
ANError
)
{
ANError
anError
=
(
ANError
)
throwable
;
}
}
}));
}
public
void
onFbLoginClick
()
{
getCompositeDisposable
().
add
(
getDataManager
()
.
doFacebookLoginApiCall
(
new
LoginRequest
.
FacebookLoginRequest
(
"test3"
,
"test4"
))
.
subscribeOn
(
getSchedulerProvider
().
io
())
.
observeOn
(
getSchedulerProvider
().
ui
())
.
subscribe
(
new
Consumer
<
LoginResponse
>()
{
@Override
public
void
accept
(
LoginResponse
response
)
throws
Exception
{
getDataManager
().
updateUserInfo
(
response
.
getAccessToken
(),
response
.
getUserId
(),
DataManager
.
LoggedInMode
.
LOGGED_IN_MODE_FB
,
response
.
getUserName
(),
response
.
getUserEmail
(),
response
.
getGoogleProfilePicUrl
());
getCallback
().
openMainActivity
();
}
},
new
Consumer
<
Throwable
>()
{
@Override
public
void
accept
(
Throwable
throwable
)
throws
Exception
{
// handle the login error here
if
(
throwable
instanceof
ANError
)
{
ANError
anError
=
(
ANError
)
throwable
;
}
}
}));
}
}
app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivity.java
浏览文件 @
4d6f0fe7
...
...
@@ -49,7 +49,7 @@ public class MainActivity extends BaseActivity {
setUnBinder
(
ButterKnife
.
bind
(
this
));
binding
.
setView
m
odel
(
mMainViewModel
);
binding
.
setView
M
odel
(
mMainViewModel
);
}
...
...
app/src/main/java/com/mindorks/framework/mvvm/ui/splash/SplashActivity.java
浏览文件 @
4d6f0fe7
...
...
@@ -56,7 +56,7 @@ public class SplashActivity extends BaseActivity implements SplashCallback {
setUnBinder
(
ButterKnife
.
bind
(
this
));
binding
.
setView
m
odel
(
mSplashViewModel
);
binding
.
setView
M
odel
(
mSplashViewModel
);
mSplashViewModel
.
setCallback
(
this
);
...
...
app/src/main/res/layout/activity_login.xml
浏览文件 @
4d6f0fe7
...
...
@@ -28,14 +28,14 @@
type=
"com.mindorks.framework.mvvm.ui.login.LoginActivity"
/>
<variable
name=
"view
m
odel"
name=
"view
M
odel"
type=
"com.mindorks.framework.mvvm.ui.login.LoginViewModel"
/>
</data>
<RelativeLayout
android:id=
"@+id/activity
_m
ain"
android:id=
"@+id/activity
M
ain"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@drawable/bg_design"
>
...
...
@@ -74,7 +74,7 @@
app:hintTextAppearance=
"@style/TextAppearence.App.TextInputLayout"
>
<android.support.design.widget.TextInputEditText
android:id=
"@+id/et
_e
mail"
android:id=
"@+id/et
E
mail"
style=
"@style/TextStyle"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -101,7 +101,7 @@
app:passwordToggleEnabled=
"true"
>
<android.support.design.widget.TextInputEditText
android:id=
"@+id/et
_p
assword"
android:id=
"@+id/et
P
assword"
style=
"@style/TextStyle"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -120,13 +120,14 @@
</android.support.design.widget.TextInputLayout>
<Button
android:id=
"@+id/btn
_server_l
ogin"
android:id=
"@+id/btn
ServerL
ogin"
style=
"@style/Button.Primary"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_margin=
"15dp"
android:padding=
"10dp"
android:onClick=
"@{() -> viewModel.onServerLoginClick()}"
android:text=
"@string/login"
android:textSize=
"18dp"
/>
</LinearLayout>
...
...
@@ -139,20 +140,22 @@
android:orientation=
"horizontal"
>
<ImageButton
android:id=
"@+id/ib
_google_l
ogin"
android:id=
"@+id/ib
GoogleL
ogin"
android:layout_width=
"40dp"
android:layout_height=
"40dp"
android:background=
"@color/transparent"
android:scaleType=
"centerCrop"
android:onClick=
"@{() -> viewModel.onGoogleLoginClick()}"
app:srcCompat=
"@drawable/ic_google_plus"
/>
<ImageButton
android:id=
"@+id/ib
_fb_l
ogin"
android:id=
"@+id/ib
FbL
ogin"
android:layout_width=
"40dp"
android:layout_height=
"40dp"
android:layout_marginLeft=
"24dp"
android:background=
"@color/transparent"
android:scaleType=
"centerCrop"
android:onClick=
"@{() -> viewModel.onFbLoginClick()}"
app:srcCompat=
"@drawable/ic_facebook"
/>
</LinearLayout>
</android.support.v7.widget.CardView>
...
...
app/src/main/res/layout/activity_main.xml
浏览文件 @
4d6f0fe7
...
...
@@ -26,7 +26,7 @@
type=
"com.mindorks.framework.mvvm.ui.main.MainActivity"
/>
<variable
name=
"view
m
odel"
name=
"view
M
odel"
type=
"com.mindorks.framework.mvvm.ui.main.MainViewModel"
/>
</data>
...
...
@@ -39,7 +39,7 @@
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@{view
m
odel.value}"
/>
android:text=
"@{view
M
odel.value}"
/>
</LinearLayout>
...
...
app/src/main/res/layout/activity_splash.xml
浏览文件 @
4d6f0fe7
...
...
@@ -28,7 +28,7 @@
type=
"com.mindorks.framework.mvvm.ui.splash.SplashActivity"
/>
<variable
name=
"view
m
odel"
name=
"view
M
odel"
type=
"com.mindorks.framework.mvvm.ui.splash.SplashViewModel"
/>
</data>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录