diff --git a/app/build.gradle b/app/build.gradle index f6cd147..831b56e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ dependencies { 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' + 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' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dee705b..15286cc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ 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..a9b6174 100644 --- a/app/src/main/java/com/nd/frt/recentconversation/MainActivity.java +++ b/app/src/main/java/com/nd/frt/recentconversation/MainActivity.java @@ -1,28 +1,65 @@ 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.activity.DetailActivity; import com.nd.frt.recentconversation.adapter.UserAdapter; import com.nd.frt.recentconversation.model.UserInfo; import com.nd.frt.recentconversation.service.UserInfoService; +import java.util.ArrayList; import java.util.List; public class MainActivity extends AppCompatActivity { - @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 rvUsers = (RecyclerView) findViewById(R.id.rvUsers); + rvUsers.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + UserAdapter mUserAdapter = new UserAdapter(userInfos); + rvUsers.setAdapter(mUserAdapter); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_main,menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if(item.getItemId() == R.id.menu_add){ + UserInfo userInfo = new UserInfo(); + userInfo.userName = "chenxuling"; + userInfo.content = "1051106490@qq.com"; + userInfo.avatarUrl = "https://randomuser.me/api/portraits/women/64.jpg"; + ArrayList mUserAdapter = null; + 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); + UserAdapter mUserAdapter = null; + mUserAdapter.edit(index,userInfo); + } + } + } } 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..f0e96c0 --- /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.annotation.SuppressLint; +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +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" ; + 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); + } + + @SuppressLint("RestrictedApi") + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_detail); + ActionBar supportActionBar = getSupportActionBar(); + assert supportActionBar != null; + supportActionBar.setDefaultDisplayHomeAsUpEnabled(true); + final Intent intent = getIntent(); + final UserInfo mUserInfo = ((UserInfo) intent.getSerializableExtra(PARAM_USER_INFO)); + final int 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 index f644c4e..83e3b5d 100644 --- a/app/src/main/java/com/nd/frt/recentconversation/adapter/UserAdapter.java +++ b/app/src/main/java/com/nd/frt/recentconversation/adapter/UserAdapter.java @@ -1,5 +1,6 @@ package com.nd.frt.recentconversation.adapter; +import android.app.Activity; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; import android.util.Log; @@ -10,6 +11,7 @@ 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; @@ -18,6 +20,7 @@ public class UserAdapter extends RecyclerView.Adapter { public static final String TAG = UserAdapter.class.getSimpleName(); + private static final int REQUEST_EDIT_USER_INFO = 0*1001; private List mUserInfos; @@ -35,7 +38,7 @@ public UserViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { } @Override - public void onBindViewHolder(@NonNull UserViewHolder userViewHolder, int position) { + public void onBindViewHolder(@NonNull UserViewHolder userViewHolder, final int position) { Log.d(TAG, "onBindViewHolder"); final UserInfo userInfo = mUserInfos.get(position); Glide.with(userViewHolder.mIvAvatar).load(userInfo.avatarUrl).into(userViewHolder.mIvAvatar); @@ -47,10 +50,24 @@ public void onClick(View v) { Toast.makeText(v.getContext(), v.getContext().getString(R.string.hello), Toast.LENGTH_LONG).show(); } }); + 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/res/drawable-anydpi/ic_action_add.xml b/app/src/main/res/drawable-anydpi/ic_action_add.xml new file mode 100644 index 0000000..89208a9 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_action_add.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-hdpi/ic_action_add.png b/app/src/main/res/drawable-hdpi/ic_action_add.png new file mode 100644 index 0000000..d702a21 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_add.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_add.png b/app/src/main/res/drawable-mdpi/ic_action_add.png new file mode 100644 index 0000000..b2d14f3 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_add.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_add.png b/app/src/main/res/drawable-xhdpi/ic_action_add.png new file mode 100644 index 0000000..bcd24f2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_add.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_add.png b/app/src/main/res/drawable-xxhdpi/ic_action_add.png new file mode 100644 index 0000000..9478911 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_add.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..03381c8 --- /dev/null +++ b/app/src/main/res/layout/activity_detail.xml @@ -0,0 +1,32 @@ + + + + + + + +