Commit c3c66a25 by 段启岩

优化登录界面弹出动画

parent 445c007d
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
</activity> </activity>
<activity android:name=".MainActivity" /> <activity android:name=".MainActivity" />
<activity android:name=".ui.login.LoginActivity" /> <activity android:name=".ui.login.LoginActivity" />
<activity android:name=".ui.blog.BlogDetailActivity" />
</application> </application>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
......
...@@ -35,12 +35,6 @@ import cn.yunliyunwai.beyondclouds.viewmodel.MainActivityViewModel; ...@@ -35,12 +35,6 @@ import cn.yunliyunwai.beyondclouds.viewmodel.MainActivityViewModel;
public class MainActivity extends BaseActivity<MainActivityViewModel, ActivityMainBinding> implements BeyondBottomNavigationView.OnNavigationItemReselectedListener, BeyondBottomNavigationView.OnNavigationItemSelectedListener { public class MainActivity extends BaseActivity<MainActivityViewModel, ActivityMainBinding> implements BeyondBottomNavigationView.OnNavigationItemReselectedListener, BeyondBottomNavigationView.OnNavigationItemSelectedListener {
public static final String ARG_HAS_NEW_VERSION = "HAS_NEW_VERSION";
public static final String ARG_NEW_VERSION_NAME = "NEW_VERSION_NAME";
public static final String ARG_NEW_VERSION_DOWNLOAD_URL = "NEW_VERSION_DOWNLOAD_URL";
private static final String MAIN_NAV_FRAGMENT_TAG_PREFIX = "main_nav_fragment:"; private static final String MAIN_NAV_FRAGMENT_TAG_PREFIX = "main_nav_fragment:";
private static final String TAG = MainActivity.class.getCanonicalName(); private static final String TAG = MainActivity.class.getCanonicalName();
private List<Fragment> fragments; private List<Fragment> fragments;
......
...@@ -13,6 +13,8 @@ import cn.yunliyunwai.beyondclouds.viewmodel.BlogDetailViewModel; ...@@ -13,6 +13,8 @@ import cn.yunliyunwai.beyondclouds.viewmodel.BlogDetailViewModel;
public class BlogDetailActivity extends BaseActivity<BlogDetailViewModel, ActivityBlogDetailBinding> { public class BlogDetailActivity extends BaseActivity<BlogDetailViewModel, ActivityBlogDetailBinding> {
public static final String ARG_BLOG_ID = "BLOG_ID";
@Inject @Inject
ViewModelProvider.Factory factory; ViewModelProvider.Factory factory;
......
package cn.yunliyunwai.beyondclouds.ui.handler; package cn.yunliyunwai.beyondclouds.ui.handler;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.view.View; import android.view.View;
import android.widget.Toast; import android.widget.Toast;
...@@ -9,7 +10,8 @@ import cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel; ...@@ -9,7 +10,8 @@ import cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel;
public class NavHandlers { public class NavHandlers {
public static void toLogin(View view) { public static void toLogin(View view) {
view.getContext().startActivity(new Intent(view.getContext(), LoginActivity.class)); Context context = view.getContext();
context.startActivity(new Intent(view.getContext(), LoginActivity.class));
} }
/** /**
......
...@@ -29,9 +29,9 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit ...@@ -29,9 +29,9 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
StatusBarUtils.setWindowStatusBarColor(this, R.color.colorStatusBar);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
overridePendingTransition(R.anim.bottom_enter, R.anim.bottom_exit);
StatusBarUtils.setWindowStatusBarColor(this, R.color.colorStatusBar);
initEventListener(); initEventListener();
} }
......
package cn.yunliyunwai.beyondclouds.ui.main; package cn.yunliyunwai.beyondclouds.ui.main;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.InputType; import android.text.InputType;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -23,6 +25,7 @@ import cn.yunliyunwai.beyondclouds.adapter.BlogListRecyclerViewAdapter; ...@@ -23,6 +25,7 @@ import cn.yunliyunwai.beyondclouds.adapter.BlogListRecyclerViewAdapter;
import cn.yunliyunwai.beyondclouds.base.BaseFragment; import cn.yunliyunwai.beyondclouds.base.BaseFragment;
import cn.yunliyunwai.beyondclouds.data.model.Blog; import cn.yunliyunwai.beyondclouds.data.model.Blog;
import cn.yunliyunwai.beyondclouds.databinding.FragmentHomeBinding; import cn.yunliyunwai.beyondclouds.databinding.FragmentHomeBinding;
import cn.yunliyunwai.beyondclouds.ui.blog.BlogDetailActivity;
import cn.yunliyunwai.beyondclouds.ui.common.FragmentFactory; import cn.yunliyunwai.beyondclouds.ui.common.FragmentFactory;
import cn.yunliyunwai.beyondclouds.ui.common.RefreshableFragment; import cn.yunliyunwai.beyondclouds.ui.common.RefreshableFragment;
import cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedListener; import cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedListener;
...@@ -34,6 +37,8 @@ import cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel; ...@@ -34,6 +37,8 @@ import cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.BlogListFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.BlogListFragmentViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.HomeFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.HomeFragmentViewModel;
import static cn.yunliyunwai.beyondclouds.ui.blog.BlogDetailActivity.ARG_BLOG_ID;
public class HomeFragment extends BaseFragment<HomeFragmentViewModel, FragmentHomeBinding> implements OnNavigationReselectedListener { public class HomeFragment extends BaseFragment<HomeFragmentViewModel, FragmentHomeBinding> implements OnNavigationReselectedListener {
@Inject @Inject
...@@ -114,7 +119,18 @@ public class HomeFragment extends BaseFragment<HomeFragmentViewModel, FragmentHo ...@@ -114,7 +119,18 @@ public class HomeFragment extends BaseFragment<HomeFragmentViewModel, FragmentHo
@Override @Override
protected BaseQuickAdapter<Blog, BaseViewHolder> createAdapter() { protected BaseQuickAdapter<Blog, BaseViewHolder> createAdapter() {
return new BlogListRecyclerViewAdapter(R.layout.blog_item); BlogListRecyclerViewAdapter adapter = new BlogListRecyclerViewAdapter(R.layout.blog_item);
adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
String blogId = adapter.getData().get(i).getBlogId();
Context context = requireActivity();
Intent intent = new Intent(context, BlogDetailActivity.class);
intent.putExtra(ARG_BLOG_ID, blogId);
context.startActivity(intent);
}
});
return adapter;
} }
} }
} }
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:fromYDelta="100%p"
android:toYDelta="0"
android:duration="400"
/>
</set>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:fromYDelta="25"
android:toYDelta="100%p"
android:duration="400"
/>
</set>
\ No newline at end of file
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_white_touchable" android:background="@drawable/background_white_touchable"
android:clickable="true"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingLeft="12dp" android:paddingLeft="12dp"
android:paddingTop="16dp" android:paddingTop="16dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment