diff --git a/README.md b/README.md deleted file mode 100644 index ba56e31..0000000 --- a/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# 作业要求 - -* 修改github工程使其具备以下功能： -* 通过菜单动态添加用户 -* 点击用户行跳转二级界面 -* 二级界面可通过标题栏返回上级界面 -* 二级界面展示标题（用户名），子标题（邮箱），头像 -* 二级界面可修改用户名 -* 二级界面具备点击按钮，点击确定按钮后返回一级界面 -* 修改用户名后返回一级界面更新一级界面列表信息 diff --git a/app/build.gradle b/app/build.gradle index f6cd147..c7f6ec7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,12 +21,13 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.github.bumptech.glide:glide:4.8.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.github.bumptech.glide:glide:4.5.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'com.android.support:design:28.0.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dee705b..df8f72b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + + + diff --git a/app/src/main/java/com/nd/frt/recentconversation/MainActivity.java b/app/src/main/java/com/nd/frt/recentconversation/MainActivity.java index 92c3b81..d9fdb52 100644 --- a/app/src/main/java/com/nd/frt/recentconversation/MainActivity.java +++ b/app/src/main/java/com/nd/frt/recentconversation/MainActivity.java @@ -1,11 +1,16 @@ package com.nd.frt.recentconversation; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.view.Menu; +import android.view.MenuItem; -import com.nd.frt.recentconversation.adapter.UserAdapter; +import com.nd.frt.recentconversation.activity.DetailActivity; +import com.nd.frt.recentconversation.adapter.UsersAdapter; import com.nd.frt.recentconversation.model.UserInfo; import com.nd.frt.recentconversation.service.UserInfoService; @@ -13,16 +18,52 @@ public class MainActivity extends AppCompatActivity { + private RecyclerView.Adapter userAdapter; + private UsersAdapter mUserAdapter; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); UserInfoService userInfoService = new UserInfoService(); List userInfos = userInfoService.getUserInfos(this); - UserAdapter userAdapter = new UserAdapter(userInfos); - RecyclerView recyclerView = (RecyclerView) findViewById(R.id.rvRecyclerView); - recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); - recyclerView.setAdapter(userAdapter); + RecyclerView recy_list = findViewById(R.id.recy_list); + recy_list.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL,false)); + mUserAdapter = new UsersAdapter(userInfos); + recy_list.setAdapter(mUserAdapter); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId()==R.id.menu_add){ + UserInfo userInfo = new UserInfo(); + userInfo.userName = "wushimian"; + userInfo.content = "767441080@qq.com"; + userInfo.avatarUrl = "https://randomuser.me/api/portraits/men/18.jpg"; + mUserAdapter.add(userInfo); + return true; + } + return super.onOptionsItemSelected(item); } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK){ + if (data != null) { + UserInfo userInfo = (UserInfo) data.getSerializableExtra(DetailActivity.PARAM_USER_INFO); + int index = data.getIntExtra(DetailActivity.PARAM_USER_INDEX,0); + mUserAdapter.edit(index,userInfo); + } + } + } } + + diff --git a/app/src/main/java/com/nd/frt/recentconversation/activity/Actvity.java b/app/src/main/java/com/nd/frt/recentconversation/activity/Actvity.java new file mode 100644 index 0000000..4cad7cf --- /dev/null +++ b/app/src/main/java/com/nd/frt/recentconversation/activity/Actvity.java @@ -0,0 +1,4 @@ +package com.nd.frt.recentconversation.activity; + +class Actvity { +} diff --git a/app/src/main/java/com/nd/frt/recentconversation/activity/DetailActivity.java b/app/src/main/java/com/nd/frt/recentconversation/activity/DetailActivity.java new file mode 100644 index 0000000..baa8e57 --- /dev/null +++ b/app/src/main/java/com/nd/frt/recentconversation/activity/DetailActivity.java @@ -0,0 +1,70 @@ +package com.nd.frt.recentconversation.activity; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; +import android.view.View; +import android.widget.EditText; +import android.widget.ImageView; + +import com.bumptech.glide.Glide; +import com.nd.frt.recentconversation.R; +import com.nd.frt.recentconversation.model.UserInfo; + +public class DetailActivity extends AppCompatActivity { + public static final String PARAM_USER_INFO = " user_info"; + public static final String PARAM_USER_INDEX = "user_index"; + public UserInfo mUserInfo; + private int mUserIndex; + + public static void start(Activity context, int index, UserInfo userInfo,int requestCode) { + Intent starter = new Intent(context, DetailActivity.class); + starter.putExtra(PARAM_USER_INFO,userInfo); + starter.putExtra(PARAM_USER_INDEX,index); + context.startActivityForResult(starter,requestCode); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_detail); + ActionBar supportActionBar = getSupportActionBar(); + assert supportActionBar != null; + supportActionBar.setDisplayHomeAsUpEnabled(true); + final Intent intent = getIntent(); + mUserInfo = ((UserInfo) intent.getSerializableExtra(PARAM_USER_INFO)); + mUserIndex = intent.getIntExtra(PARAM_USER_INDEX,0); + + supportActionBar.setTitle(mUserInfo.userName); + supportActionBar.setSubtitle(mUserInfo.content); + final EditText etUserName = findViewById(R.id.etUserName); + ImageView ivAvatar = findViewById(R.id.ivAvatar); + Glide.with(this) + .load(mUserInfo.avatarUrl) + .into(ivAvatar); + findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mUserInfo.userName = etUserName.getText().toString(); + Intent intentResult = new Intent(); + intentResult.putExtra(PARAM_USER_INFO, mUserInfo); + intentResult.putExtra(PARAM_USER_INDEX, mUserIndex ); + setResult(RESULT_OK,intentResult); + finish(); + } + }); + + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId()==android.R.id.home){ + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } +} diff --git a/app/src/main/java/com/nd/frt/recentconversation/adapter/UserAdapter.java b/app/src/main/java/com/nd/frt/recentconversation/adapter/UserAdapter.java deleted file mode 100644 index f644c4e..0000000 --- a/app/src/main/java/com/nd/frt/recentconversation/adapter/UserAdapter.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.nd.frt.recentconversation.adapter; - -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Toast; - -import com.bumptech.glide.Glide; -import com.nd.frt.recentconversation.R; -import com.nd.frt.recentconversation.model.UserInfo; -import com.nd.frt.recentconversation.viewholder.UserViewHolder; - -import java.util.List; - -public class UserAdapter extends RecyclerView.Adapter { - - public static final String TAG = UserAdapter.class.getSimpleName(); - - private List mUserInfos; - - public UserAdapter(List userInfos) { - mUserInfos = userInfos; - } - - @NonNull - @Override - public UserViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { - LayoutInflater layoutInflater = LayoutInflater.from(viewGroup.getContext()); - View inflate = layoutInflater.inflate(R.layout.item_user, viewGroup, false); - Log.d(TAG, "onCreateViewHolder"); - return new UserViewHolder(inflate); - } - - @Override - public void onBindViewHolder(@NonNull UserViewHolder userViewHolder, int position) { - Log.d(TAG, "onBindViewHolder"); - final UserInfo userInfo = mUserInfos.get(position); - Glide.with(userViewHolder.mIvAvatar).load(userInfo.avatarUrl).into(userViewHolder.mIvAvatar); - userViewHolder.mTvUserName.setText(userInfo.userName); - userViewHolder.mTvEmail.setText(userInfo.content); - userViewHolder.mIvAvatar.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Toast.makeText(v.getContext(), v.getContext().getString(R.string.hello), Toast.LENGTH_LONG).show(); - } - }); - } - - @Override - public int getItemCount() { - return mUserInfos.size(); - } -} diff --git a/app/src/main/java/com/nd/frt/recentconversation/adapter/UsersAdapter.java b/app/src/main/java/com/nd/frt/recentconversation/adapter/UsersAdapter.java new file mode 100644 index 0000000..8e94483 --- /dev/null +++ b/app/src/main/java/com/nd/frt/recentconversation/adapter/UsersAdapter.java @@ -0,0 +1,66 @@ +package com.nd.frt.recentconversation.adapter; + +import android.app.Activity; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.bumptech.glide.Glide; +import com.nd.frt.recentconversation.R; +import com.nd.frt.recentconversation.activity.DetailActivity; +import com.nd.frt.recentconversation.model.UserInfo; +import com.nd.frt.recentconversation.viewholder.UserViewHolder; + +import java.util.List; + +public class UsersAdapter extends RecyclerView.Adapter { + + private List mUserInfos; + private int REQUEST_EDIT_USER_INFO = 0x1001; + + public UsersAdapter(ListuserInfos) { + mUserInfos = userInfos; + } + + @NonNull + @Override + public UserViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { + LayoutInflater layoutInflater = LayoutInflater.from(viewGroup.getContext()); + View itemView = layoutInflater.inflate(R.layout.item_user, viewGroup, false); + return new UserViewHolder(itemView); + } + + @Override + public void onBindViewHolder(@NonNull UserViewHolder userViewHolder, final int position) { + final UserInfo userInfo = mUserInfos.get(position); + Glide.with(userViewHolder.itemView.getContext()) + .load(userInfo.avatarUrl) + .into(userViewHolder.mIvatar); + userViewHolder.mtvUserName.setText(userInfo.userName); + userViewHolder.mtvEmail.setText(userInfo.content); + userViewHolder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + DetailActivity.start((Activity) v.getContext(),position,userInfo,REQUEST_EDIT_USER_INFO); + } + }); + + } + + @Override + public int getItemCount() { + return mUserInfos.size(); + } + + public void add(UserInfo userInfo){ + mUserInfos.add(userInfo); + notifyDataSetChanged(); + } + + public void edit(int index,UserInfo userInfo){ + mUserInfos.set(index,userInfo); + notifyDataSetChanged(); + } +} diff --git a/app/src/main/java/com/nd/frt/recentconversation/model/UserInfo.java b/app/src/main/java/com/nd/frt/recentconversation/model/UserInfo.java index e70191b..d7612af 100644 --- a/app/src/main/java/com/nd/frt/recentconversation/model/UserInfo.java +++ b/app/src/main/java/com/nd/frt/recentconversation/model/UserInfo.java @@ -1,6 +1,8 @@ package com.nd.frt.recentconversation.model; -public class UserInfo { +import java.io.Serializable; + +public class UserInfo implements Serializable { public String avatarUrl; public String userName; diff --git a/app/src/main/java/com/nd/frt/recentconversation/viewholder/UserViewHolder.java b/app/src/main/java/com/nd/frt/recentconversation/viewholder/UserViewHolder.java index c39e1b1..23b758a 100644 --- a/app/src/main/java/com/nd/frt/recentconversation/viewholder/UserViewHolder.java +++ b/app/src/main/java/com/nd/frt/recentconversation/viewholder/UserViewHolder.java @@ -10,14 +10,16 @@ public class UserViewHolder extends RecyclerView.ViewHolder { - public final ImageView mIvAvatar; - public final TextView mTvUserName; - public final TextView mTvEmail; + public final ImageView mIvatar; + public final TextView mtvUserName; + public final TextView mtvEmail; public UserViewHolder(@NonNull View itemView) { super(itemView); - mIvAvatar = itemView.findViewById(R.id.ivAvatar); - mTvUserName = itemView.findViewById(R.id.tvUserName); - mTvEmail = itemView.findViewById(R.id.tvEmail); + mIvatar = itemView.findViewById(R.id.ivAvatar); + mtvUserName = itemView.findViewById(R.id.tvUserName); + mtvEmail = itemView.findViewById(R.id.tvEmail); + } + } diff --git a/app/src/main/res/drawable-anydpi/ic_add_name.xml b/app/src/main/res/drawable-anydpi/ic_add_name.xml new file mode 100644 index 0000000..89208a9 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_add_name.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-hdpi/ic_add_name.png b/app/src/main/res/drawable-hdpi/ic_add_name.png new file mode 100644 index 0000000..d702a21 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_add_name.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_add_name.png b/app/src/main/res/drawable-mdpi/ic_add_name.png new file mode 100644 index 0000000..b2d14f3 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_add_name.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_add_name.png b/app/src/main/res/drawable-xhdpi/ic_add_name.png new file mode 100644 index 0000000..bcd24f2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_add_name.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_name.png b/app/src/main/res/drawable-xxhdpi/ic_add_name.png new file mode 100644 index 0000000..9478911 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_add_name.png differ diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml new file mode 100644 index 0000000..e528028 --- /dev/null +++ b/app/src/main/res/layout/activity_detail.xml @@ -0,0 +1,30 @@ + + + + + + + +