diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..ba388bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dee705b..eea6a8b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,14 +10,6 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> - - - - - - - - + android:theme="@style/AppTheme"> \ No newline at end of file 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..8a58999 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.Useradapter; import com.nd.frt.recentconversation.model.UserInfo; import com.nd.frt.recentconversation.service.UserInfoService; @@ -13,16 +18,51 @@ public class MainActivity extends AppCompatActivity { + private Useradapter 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 rvUsers = findViewById(R.id.rvUsers); + rvUsers.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL,false)); + mUserAdapter = new Useradapter(userInfos); + rvUsers.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 = "zouweiqiang"; + userInfo.content = "1070911992@qq.com"; + userInfo.avatarUrl = "https://randomuser.me/api/portraits/women/94.jpg"; + mUserAdapter.add(userInfo); + return super.onOptionsItemSelected(item); + } + + return super.onOptionsItemSelected(item); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == 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); + } + } + } +} \ No newline at end of file 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..3508332 --- /dev/null +++ b/app/src/main/java/com/nd/frt/recentconversation/activity/DetailActivity.java @@ -0,0 +1,68 @@ +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"; + private 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); + 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 view) { + 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); + } + }); + } + + @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/Useradapter.java b/app/src/main/java/com/nd/frt/recentconversation/adapter/Useradapter.java new file mode 100644 index 0000000..66c7554 --- /dev/null +++ b/app/src/main/java/com/nd/frt/recentconversation/adapter/Useradapter.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.UserViewHoldere; + +import java.util.List; + +public class Useradapter extends RecyclerView.Adapter { + + + private static final int REQUEST_EDIT_USER_INFO = 0x1001; + private List mUserinfos; + + public Useradapter(ListuserInfos) { + mUserinfos = userInfos; + } + + @NonNull + @Override + public UserViewHoldere onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { + LayoutInflater layoutInflater = LayoutInflater.from(viewGroup.getContext()); + View itemView = layoutInflater.inflate(R.layout.item_user, viewGroup, false); + return new UserViewHoldere(itemView); + } + + @Override + public void onBindViewHolder(@NonNull UserViewHoldere userViewHoldere, final int position) { + final UserInfo userInfo = mUserinfos.get(position); + Glide.with(userViewHoldere.itemView.getContext()) + .load(userInfo.avatarUrl) + .into(userViewHoldere.mIvAvatar); + userViewHoldere.mTvUserName.setText(userInfo.userName); + userViewHoldere.mTvEmail.setText(userInfo.content); + userViewHoldere.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + DetailActivity.start((Activity) view.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/UserViewHoldere.java similarity index 60% rename from app/src/main/java/com/nd/frt/recentconversation/viewholder/UserViewHolder.java rename to app/src/main/java/com/nd/frt/recentconversation/viewholder/UserViewHoldere.java index c39e1b1..550dff9 100644 --- a/app/src/main/java/com/nd/frt/recentconversation/viewholder/UserViewHolder.java +++ b/app/src/main/java/com/nd/frt/recentconversation/viewholder/UserViewHoldere.java @@ -4,19 +4,18 @@ import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; -import android.widget.TextView; import com.nd.frt.recentconversation.R; -public class UserViewHolder extends RecyclerView.ViewHolder { +public class UserViewHoldere extends RecyclerView.ViewHolder { public final ImageView mIvAvatar; - public final TextView mTvUserName; - public final TextView mTvEmail; + public final ImageView mTvUserName; + public final ImageView mTvEmail; - public UserViewHolder(@NonNull View itemView) { + public UserViewHoldere(@NonNull View itemView) { super(itemView); - mIvAvatar = itemView.findViewById(R.id.ivAvatar); + mIvAvatar = itemView.findViewById(R.id.ivAvtar); mTvUserName = itemView.findViewById(R.id.tvUserName); mTvEmail = itemView.findViewById(R.id.tvEmail); } 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..f8268d8 --- /dev/null +++ b/app/src/main/res/layout/activity_detail.xml @@ -0,0 +1,31 @@ + + + + +