diff --git a/app/build.gradle b/app/build.gradle index 9895554..7670081 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,6 +25,7 @@ android { repositories { maven { url 'https://jitpack.io' } + jcenter() } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) @@ -57,5 +58,8 @@ dependencies { implementation 'com.github.yalantis:jellytoolbar:v1.0' //个人中心页面设计 implementation 'com.github.yalantis:Side-Menu.Android:1.0.1' + implementation 'com.mxn.soul:flowingdrawer-core:2.1.0' + implementation 'com.nineoldandroids:library:2.4.0' + implementation 'com.squareup.picasso:picasso:2.5.0' } diff --git a/app/src/main/java/com/example/HomeContent/HomeAdapter.java b/app/src/main/java/com/example/HomeContent/HomeAdapter.java new file mode 100644 index 0000000..09d1831 --- /dev/null +++ b/app/src/main/java/com/example/HomeContent/HomeAdapter.java @@ -0,0 +1,90 @@ +//package com.example.HomeContent; +// +//import android.content.Context; +//import android.view.LayoutInflater; +//import android.view.View; +//import android.view.ViewGroup; +//import android.widget.FrameLayout; +//import android.widget.ImageButton; +//import android.widget.ImageView; +//import android.widget.TextSwitcher; +// +//import androidx.annotation.NonNull; +//import androidx.recyclerview.widget.RecyclerView; +// +//import com.example.PersonalCenter.FeedAdapter; +//import com.example.cmknowledgegraph.R; +// +//public class HomeAdapter extends RecyclerView.Adapter { +// private Context context; +// private int itemsCount = 0; +// +// public HomeAdapter(Context context){this.context = context;} +// +// +// @NonNull +// @Override +// public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { +// final View view = LayoutInflater.from(context).inflate(R.layout.item_feed, parent, false); +// +// return new HomeAdapter.CellFeedViewHolder(view); +// } +// +// @Override +// public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { +// final FeedAdapter.CellFeedViewHolder holder = (FeedAdapter.CellFeedViewHolder) viewHolder; +// bindDefaultFeedItem(position, holder); +// } +// private void bindDefaultFeedItem(int position, FeedAdapter.CellFeedViewHolder holder) { +// if (position % 2 == 0) { +// holder.ivFeedCenter.setImageResource(R.drawable.img_feed_center_1); +// holder.ivFeedBottom.setImageResource(R.drawable.img_feed_bottom_1); +// } else { +// holder.ivFeedCenter.setImageResource(R.drawable.img_feed_center_2); +// holder.ivFeedBottom.setImageResource(R.drawable.img_feed_bottom_2); +// } +// +// holder.btnComments.setTag(position); +// holder.btnMore.setTag(position); +// holder.ivFeedCenter.setTag(holder); +// holder.btnLike.setTag(holder); +// +// } +// public void updateItems() { +// itemsCount = 10; +// notifyDataSetChanged(); +// } +// @Override +// public int getItemCount() { +// return itemsCount; +// } +// +// @Override +// public int getItemViewType(int position) { +// return 1; +// } +//// 在这里构建一个cell的内容 +// private static class CellFeedViewHolder extends RecyclerView.ViewHolder { +// ImageView ivFeedCenter; +// ImageView ivFeedBottom; +// ImageButton btnComments; +// ImageButton btnLike; +// ImageButton btnMore; +// TextSwitcher tsLikesCounter; +// ImageView ivUserProfile; +// FrameLayout vImageRoot; +// +// CellFeedViewHolder(View view) { +// super(view); +// +// ivFeedCenter = (ImageView) view.findViewById(R.id.ivFeedCenter); +// ivFeedBottom = (ImageView) view.findViewById(R.id.ivFeedBottom); +// btnComments = (ImageButton) view.findViewById(R.id.btnComments); +// btnLike = (ImageButton) view.findViewById(R.id.btnLike); +// btnMore = (ImageButton) view.findViewById(R.id.btnMore); +// tsLikesCounter = (TextSwitcher) view.findViewById(R.id.tsLikesCounter); +// ivUserProfile = (ImageView) view.findViewById(R.id.ivUserProfile); +// vImageRoot = (FrameLayout) view.findViewById(R.id.vImageRoot); +// } +// } +//} diff --git a/app/src/main/java/com/example/PersonalCenter/CircleTransformation.java b/app/src/main/java/com/example/PersonalCenter/CircleTransformation.java new file mode 100755 index 0000000..94a9e77 --- /dev/null +++ b/app/src/main/java/com/example/PersonalCenter/CircleTransformation.java @@ -0,0 +1,56 @@ +package com.example.PersonalCenter; + + + +import android.graphics.Bitmap; +import android.graphics.BitmapShader; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; + +import com.squareup.picasso.Transformation; + + +class CircleTransformation implements Transformation { + + private static final int STROKE_WIDTH = 6; + + @Override + public Bitmap transform(Bitmap source) { + int size = Math.min(source.getWidth(), source.getHeight()); + + int x = (source.getWidth() - size) / 2; + int y = (source.getHeight() - size) / 2; + + Bitmap squaredBitmap = Bitmap.createBitmap(source, x, y, size, size); + if (squaredBitmap != source) { + source.recycle(); + } + + Bitmap bitmap = Bitmap.createBitmap(size, size, source.getConfig()); + + Canvas canvas = new Canvas(bitmap); + + Paint avatarPaint = new Paint(); + BitmapShader shader = new BitmapShader(squaredBitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP); + avatarPaint.setShader(shader); + + Paint outlinePaint = new Paint(); + outlinePaint.setColor(Color.WHITE); + outlinePaint.setStyle(Paint.Style.STROKE); + outlinePaint.setStrokeWidth(STROKE_WIDTH); + outlinePaint.setAntiAlias(true); + + float r = size / 2f; + canvas.drawCircle(r, r, r, avatarPaint); + canvas.drawCircle(r, r, r - STROKE_WIDTH / 2, outlinePaint); + + squaredBitmap.recycle(); + return bitmap; + } + + @Override + public String key() { + return "circleTransformation()"; + } +} diff --git a/app/src/main/java/com/example/PersonalCenter/FeedAdapter.java b/app/src/main/java/com/example/PersonalCenter/FeedAdapter.java new file mode 100755 index 0000000..a251562 --- /dev/null +++ b/app/src/main/java/com/example/PersonalCenter/FeedAdapter.java @@ -0,0 +1,97 @@ +package com.example.PersonalCenter; + +import android.content.Context; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.TextSwitcher; + +import androidx.recyclerview.widget.RecyclerView; + +import com.example.cmknowledgegraph.R; + + +public class FeedAdapter extends RecyclerView.Adapter { + + private Context context; + private int itemsCount = 0; + + public FeedAdapter(Context context) { + this.context = context; + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + final View view = LayoutInflater.from(context).inflate(R.layout.item_feed, parent, false); + + return new CellFeedViewHolder(view); + } + + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { + final CellFeedViewHolder holder = (CellFeedViewHolder) viewHolder; + bindDefaultFeedItem(position, holder); + } + + private void bindDefaultFeedItem(int position, CellFeedViewHolder holder) { + if (position % 2 == 0) { + holder.ivFeedCenter.setImageResource(R.drawable.img_feed_center_1); + holder.ivFeedBottom.setImageResource(R.drawable.img_feed_bottom_1); + } else { + holder.ivFeedCenter.setImageResource(R.drawable.img_feed_center_2); + holder.ivFeedBottom.setImageResource(R.drawable.img_feed_bottom_2); + } + + holder.btnComments.setTag(position); + holder.btnMore.setTag(position); + holder.ivFeedCenter.setTag(holder); + holder.btnLike.setTag(holder); + + } + + public void updateItems() { + itemsCount = 10; + notifyDataSetChanged(); + } + + @Override + public int getItemViewType(int position) { + return 1; + } + + @Override + public int getItemCount() { + return itemsCount; + } + + private static class CellFeedViewHolder extends RecyclerView.ViewHolder { + ImageView ivFeedCenter; + ImageView ivFeedBottom; + ImageButton btnComments; + ImageButton btnLike; + ImageButton btnMore; + TextSwitcher tsLikesCounter; + ImageView ivUserProfile; + FrameLayout vImageRoot; + + CellFeedViewHolder(View view) { + super(view); + + ivFeedCenter = (ImageView) view.findViewById(R.id.ivFeedCenter); + ivFeedBottom = (ImageView) view.findViewById(R.id.ivFeedBottom); + btnComments = (ImageButton) view.findViewById(R.id.btnComments); + btnLike = (ImageButton) view.findViewById(R.id.btnLike); + btnMore = (ImageButton) view.findViewById(R.id.btnMore); + tsLikesCounter = (TextSwitcher) view.findViewById(R.id.tsLikesCounter); + ivUserProfile = (ImageView) view.findViewById(R.id.ivUserProfile); + vImageRoot = (FrameLayout) view.findViewById(R.id.vImageRoot); + } + } + + +} diff --git a/app/src/main/java/com/example/PersonalCenter/MenuListFragment.java b/app/src/main/java/com/example/PersonalCenter/MenuListFragment.java new file mode 100644 index 0000000..3c2b042 --- /dev/null +++ b/app/src/main/java/com/example/PersonalCenter/MenuListFragment.java @@ -0,0 +1,76 @@ + +package com.example.PersonalCenter; + +import com.example.cmknowledgegraph.R; +import com.google.android.material.navigation.NavigationView; +import com.squareup.picasso.Picasso; + +import android.os.Bundle; + +import android.util.Log; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.Toast; + +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +/** + * Created by mxn on 2016/12/13. + * MenuListFragment + */ + +public class MenuListFragment extends Fragment { + + private ImageView ivMenuUserProfilePhoto; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_menu, container, + false); + Log.i("view==","=="+view.toString()+"=="); + NavigationView linearLayout = view.findViewById(R.id.vNavigation); + View frameLayout = linearLayout.inflateHeaderView(R.layout.view_global_menu_header); + ivMenuUserProfilePhoto = (ImageView) frameLayout.findViewById(R.id.ivMenuUserProfilePhoto); + Log.i("ismenu---===","====)"+ivMenuUserProfilePhoto.toString()); + NavigationView vNavigation = (NavigationView) view.findViewById(R.id.vNavigation); + vNavigation.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() { + @Override + public boolean onNavigationItemSelected(MenuItem menuItem) { + Toast.makeText(getActivity(),menuItem.getTitle(),Toast.LENGTH_SHORT).show(); + return false; + } + }) ; + setupHeader(); + return view ; + } + + private void setupHeader() { + int avatarSize = getResources().getDimensionPixelSize(R.dimen.global_menu_avatar_size); + String profilePhoto = getResources().getString(R.string.user_profile_photo); + //在这里加载对应的图片信息 +// Picasso.with(getActivity()) +// .load(R.drawable.draw1) +// .placeholder(R.drawable.img_circle_placeholder) +// .resize(avatarSize, avatarSize) +// .centerCrop() +// .transform(new CircleTransformation()) +// .into(ivMenuUserProfilePhoto); + Picasso.with(getActivity()) + .load(R.drawable.draw1) + .placeholder(R.drawable.img_circle_placeholder) + .into(ivMenuUserProfilePhoto); + } + +} diff --git a/app/src/main/java/com/example/PersonalCenter/SquaredFrameLayout.java b/app/src/main/java/com/example/PersonalCenter/SquaredFrameLayout.java new file mode 100755 index 0000000..b51cd3c --- /dev/null +++ b/app/src/main/java/com/example/PersonalCenter/SquaredFrameLayout.java @@ -0,0 +1,32 @@ +package com.example.PersonalCenter; + +import android.annotation.TargetApi; +import android.content.Context; +import android.os.Build; +import android.util.AttributeSet; +import android.widget.FrameLayout; + + +public class SquaredFrameLayout extends FrameLayout { + public SquaredFrameLayout(Context context) { + super(context); + } + + public SquaredFrameLayout(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public SquaredFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + public SquaredFrameLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, widthMeasureSpec); + } +} diff --git a/app/src/main/java/com/example/cmknowledgegraph/MainContent.java b/app/src/main/java/com/example/cmknowledgegraph/MainContent.java index 6d317fc..c7da3f9 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/MainContent.java +++ b/app/src/main/java/com/example/cmknowledgegraph/MainContent.java @@ -5,10 +5,25 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; public class MainContent extends Fragment { + protected int res; + private RecyclerView rvFeed; + + AppCompatActivity appCompatActivity; + + public AppCompatActivity getAppCompatActivity() { + return appCompatActivity; + } + + public void setAppCompatActivity(AppCompatActivity appCompatActivity) { + this.appCompatActivity = appCompatActivity; + } //创建视图 @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -16,4 +31,9 @@ public class MainContent extends Fragment { // Inflate the layout for this fragment return inflater.inflate( R.layout.activity_home, container, false ); //要加载的layout文件 } + + @Override + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + } } diff --git a/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java b/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java index 0fcc8cb..acc6d27 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java +++ b/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java @@ -1,6 +1,7 @@ package com.example.cmknowledgegraph; import android.app.Person; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -12,9 +13,19 @@ import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.PersonalCenter.FeedAdapter; +import com.example.PersonalCenter.MenuListFragment; +import com.mxn.soul.flowingdrawer_core.ElasticDrawer; +import com.mxn.soul.flowingdrawer_core.FlowingDrawer; import yalantis.com.sidemenu.interfaces.Resourceble; import yalantis.com.sidemenu.interfaces.ScreenShotable; @@ -25,8 +36,13 @@ public class PersonContent extends Fragment { protected int res; - - + private RecyclerView rvFeed; + private FlowingDrawer mDrawer; + @Override + public void onAttach(@NonNull Context context) { + super.onAttach(context); + MainActivity mainActivity = (MainActivity) context; + } AppCompatActivity appCompatActivity; @@ -40,26 +56,92 @@ public class PersonContent extends Fragment { - public View onCreateView(LayoutInflater inflater, ViewGroup container, + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment return inflater.inflate( R.layout.activity_personality_center, container, false ); //要加载的layout文件 } - public void onActivityCreated(Bundle savedInstanceState) { - // TODO Auto-generated method stub + @Override + public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - - Button login_pc_btn = (Button) getActivity().findViewById(R.id.login_pc_button); - login_pc_btn.setOnClickListener(new View.OnClickListener() { + rvFeed = (RecyclerView) appCompatActivity.findViewById(R.id.rvFeed); + mDrawer = (FlowingDrawer) appCompatActivity.findViewById(R.id.drawerlayout); + mDrawer.setTouchMode(ElasticDrawer.TOUCH_MODE_BEZEL); + //设置工具栏 + setupToolbar(); + //设置直接页面 + setupFeed(); + //设置侧滑菜单 + setupMenu(); + } + protected void setupToolbar() { + Toolbar toolbar = (Toolbar) appCompatActivity.findViewById(R.id.toolbar); + appCompatActivity.setSupportActionBar(toolbar); + //这里是图片，可以将其动态加载用户图片，如果没有登录就改成别的。 + toolbar.setNavigationIcon(R.drawable.ic_menu_white); + //点击了就开始侧滑 + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override public void onClick(View v) { - - Intent intent=new Intent(); - intent.setClass(getActivity(),LoginActivity.class); - startActivity(intent); + mDrawer.toggleMenu(); } }); } + //设置没有侧滑之前的状态页面 + //在这里将东西其改成几个按钮 + private void setupFeed() { + LinearLayoutManager linearLayoutManager = new LinearLayoutManager(appCompatActivity) { + @Override + protected int getExtraLayoutSpace(RecyclerView.State state) { + return 300; + } + }; + rvFeed.setLayoutManager(linearLayoutManager); + FeedAdapter feedAdapter = new FeedAdapter(appCompatActivity); + rvFeed.setAdapter(feedAdapter); + feedAdapter.updateItems(); + } + + //设置菜单 + private void setupMenu() { + FragmentManager fm = appCompatActivity.getSupportFragmentManager();//获取Fragment管理器 + MenuListFragment mMenuFragment = (MenuListFragment) fm.findFragmentById(R.id.id_container_menu); + if (mMenuFragment == null) { + mMenuFragment = new MenuListFragment(); + fm.beginTransaction().add(R.id.id_container_menu, mMenuFragment).commit(); + //向activity添加一个布局 + } + +// mDrawer.setOnDrawerStateChangeListener(new ElasticDrawer.OnDrawerStateChangeListener() { +// @Override +// public void onDrawerStateChange(int oldState, int newState) { +// if (newState == ElasticDrawer.STATE_CLOSED) { +// Log.i("MainActivity", "Drawer STATE_CLOSED"); +// } +// } +// +// @Override +// public void onDrawerSlide(float openRatio, int offsetPixels) { +// Log.i("MainActivity", "openRatio=" + openRatio + " ,offsetPixels=" + offsetPixels); +// } +// }); + } + // +// public void onActivityCreated(Bundle savedInstanceState) { +// // TODO Auto-generated method stub +// super.onActivityCreated(savedInstanceState); +// +// Button login_pc_btn = (Button) getActivity().findViewById(R.id.login_pc_button); +// login_pc_btn.setOnClickListener(new View.OnClickListener() { +// public void onClick(View v) { +// +// Intent intent=new Intent(); +// intent.setClass(getActivity(),LoginActivity.class); +// startActivity(intent); +// } +// }); +// } // @Override // public void onResume() { diff --git a/app/src/main/res/anim/slide_in_likes_counter.xml b/app/src/main/res/anim/slide_in_likes_counter.xml new file mode 100755 index 0000000..c02d0bb --- /dev/null +++ b/app/src/main/res/anim/slide_in_likes_counter.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_out_likes_counter.xml b/app/src/main/res/anim/slide_out_likes_counter.xml new file mode 100755 index 0000000..974308b --- /dev/null +++ b/app/src/main/res/anim/slide_out_likes_counter.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg.9.png b/app/src/main/res/drawable/bg.9.png new file mode 100755 index 0000000..d49a35f Binary files /dev/null and b/app/src/main/res/drawable/bg.9.png differ diff --git a/app/src/main/res/drawable/btn_feed_action.xml b/app/src/main/res/drawable/btn_feed_action.xml new file mode 100755 index 0000000..e2456bf --- /dev/null +++ b/app/src/main/res/drawable/btn_feed_action.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/card_background.9.png b/app/src/main/res/drawable/card_background.9.png new file mode 100755 index 0000000..ee2eb86 Binary files /dev/null and b/app/src/main/res/drawable/card_background.9.png differ diff --git a/app/src/main/res/drawable/ic_comment_outline_grey.png b/app/src/main/res/drawable/ic_comment_outline_grey.png new file mode 100755 index 0000000..75e80db Binary files /dev/null and b/app/src/main/res/drawable/ic_comment_outline_grey.png differ diff --git a/app/src/main/res/drawable/ic_feed_top.png b/app/src/main/res/drawable/ic_feed_top.png new file mode 100755 index 0000000..7397892 Binary files /dev/null and b/app/src/main/res/drawable/ic_feed_top.png differ diff --git a/app/src/main/res/drawable/ic_global_menu_direct.png b/app/src/main/res/drawable/ic_global_menu_direct.png new file mode 100755 index 0000000..fee47a1 Binary files /dev/null and b/app/src/main/res/drawable/ic_global_menu_direct.png differ diff --git a/app/src/main/res/drawable/ic_global_menu_feed.png b/app/src/main/res/drawable/ic_global_menu_feed.png new file mode 100755 index 0000000..ccedde1 Binary files /dev/null and b/app/src/main/res/drawable/ic_global_menu_feed.png differ diff --git a/app/src/main/res/drawable/ic_global_menu_likes.png b/app/src/main/res/drawable/ic_global_menu_likes.png new file mode 100755 index 0000000..4409173 Binary files /dev/null and b/app/src/main/res/drawable/ic_global_menu_likes.png differ diff --git a/app/src/main/res/drawable/ic_global_menu_nearby.png b/app/src/main/res/drawable/ic_global_menu_nearby.png new file mode 100755 index 0000000..7c1c84d Binary files /dev/null and b/app/src/main/res/drawable/ic_global_menu_nearby.png differ diff --git a/app/src/main/res/drawable/ic_global_menu_news.png b/app/src/main/res/drawable/ic_global_menu_news.png new file mode 100755 index 0000000..c50ea84 Binary files /dev/null and b/app/src/main/res/drawable/ic_global_menu_news.png differ diff --git a/app/src/main/res/drawable/ic_global_menu_popular.png b/app/src/main/res/drawable/ic_global_menu_popular.png new file mode 100755 index 0000000..ff32d2f Binary files /dev/null and b/app/src/main/res/drawable/ic_global_menu_popular.png differ diff --git a/app/src/main/res/drawable/ic_global_menu_search.png b/app/src/main/res/drawable/ic_global_menu_search.png new file mode 100755 index 0000000..9424ae9 Binary files /dev/null and b/app/src/main/res/drawable/ic_global_menu_search.png differ diff --git a/app/src/main/res/drawable/ic_heart_outline_grey.png b/app/src/main/res/drawable/ic_heart_outline_grey.png new file mode 100755 index 0000000..0c98740 Binary files /dev/null and b/app/src/main/res/drawable/ic_heart_outline_grey.png differ diff --git a/app/src/main/res/drawable/ic_heart_small_blue.png b/app/src/main/res/drawable/ic_heart_small_blue.png new file mode 100755 index 0000000..0dcb85b Binary files /dev/null and b/app/src/main/res/drawable/ic_heart_small_blue.png differ diff --git a/app/src/main/res/drawable/ic_menu_white.png b/app/src/main/res/drawable/ic_menu_white.png new file mode 100755 index 0000000..22c82ea Binary files /dev/null and b/app/src/main/res/drawable/ic_menu_white.png differ diff --git a/app/src/main/res/drawable/ic_more_grey.png b/app/src/main/res/drawable/ic_more_grey.png new file mode 100755 index 0000000..44012b8 Binary files /dev/null and b/app/src/main/res/drawable/ic_more_grey.png differ diff --git a/app/src/main/res/drawable/img_circle_placeholder.xml b/app/src/main/res/drawable/img_circle_placeholder.xml new file mode 100755 index 0000000..3cc7235 --- /dev/null +++ b/app/src/main/res/drawable/img_circle_placeholder.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/img_feed_bottom_1.png b/app/src/main/res/drawable/img_feed_bottom_1.png new file mode 100755 index 0000000..bebbd8f Binary files /dev/null and b/app/src/main/res/drawable/img_feed_bottom_1.png differ diff --git a/app/src/main/res/drawable/img_feed_bottom_2.png b/app/src/main/res/drawable/img_feed_bottom_2.png new file mode 100755 index 0000000..4fba8a8 Binary files /dev/null and b/app/src/main/res/drawable/img_feed_bottom_2.png differ diff --git a/app/src/main/res/drawable/img_feed_center_1.png b/app/src/main/res/drawable/img_feed_center_1.png new file mode 100755 index 0000000..46b4c55 Binary files /dev/null and b/app/src/main/res/drawable/img_feed_center_1.png differ diff --git a/app/src/main/res/drawable/img_feed_center_2.png b/app/src/main/res/drawable/img_feed_center_2.png new file mode 100755 index 0000000..0752503 Binary files /dev/null and b/app/src/main/res/drawable/img_feed_center_2.png differ diff --git a/app/src/main/res/layout/activity_personality_center.xml b/app/src/main/res/layout/activity_personality_center.xml index 7dfa9f3..40ebfc3 100644 --- a/app/src/main/res/layout/activity_personality_center.xml +++ b/app/src/main/res/layout/activity_personality_center.xml @@ -1,213 +1,270 @@ - - - - - -