From 5e8769e4dd580657e5da6637256d4cc1293cf8bb Mon Sep 17 00:00:00 2001 From: fangshicai <1312964935@qq.com> Date: Wed, 22 Jun 2022 09:55:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=95=86=E5=93=81=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E5=95=86=E5=93=81=E8=AF=A6=E7=BB=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/render.experimental.xml | 6 + app/src/main/AndroidManifest.xml | 41 +++-- .../activity/GoodsDetailsActivity.java | 46 ++++++ .../android/activity/HomePageActivity.java | 6 +- .../com/android/activity/LoginActivity.java | 14 +- .../activity/adapter/GoodsAdapter.java | 1 - .../activity/adapter/StaggerAdapter.java | 51 ++++-- .../activity/fragment/GoodsTypeFragment.java | 48 +++--- .../activity/fragment/HomePageFragment.java | 28 +++- .../activity/fragment/MyPageFragment.java | 50 +++++- app/src/main/java/com/android/bean/User.java | 10 +- .../model/goods/GoodsHttp_interface.java | 10 +- .../android/model/goods/GoodsModelimpl.java | 15 +- .../android/model/login/LoginModelImpl.java | 3 +- .../res/drawable/add_shopping_cart_24.xml | 4 +- .../res/layout/activity_goods_details.xml | 16 ++ .../main/res/layout/activity_home_page.xml | 1 + app/src/main/res/layout/activity_login.xml | 3 +- app/src/main/res/layout/fragment_my_page.xml | 1 + app/src/main/res/layout/goods_show_item.xml | 67 +++++--- app/src/main/res/layout/item_stagger.xml | 151 +++++++++++------- app/src/main/res/values/strings.xml | 1 + 22 files changed, 419 insertions(+), 154 deletions(-) create mode 100644 .idea/render.experimental.xml create mode 100644 app/src/main/java/com/android/activity/GoodsDetailsActivity.java create mode 100644 app/src/main/res/layout/activity_goods_details.xml diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml new file mode 100644 index 0000000..8ec256a --- /dev/null +++ b/.idea/render.experimental.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b8b102..a150842 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,21 +5,13 @@ - - - - - - - - - - - - - - - + + + + + + + + + android:launchMode="singleTask" + android:exported="true"> @@ -45,15 +42,15 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/android/activity/GoodsDetailsActivity.java b/app/src/main/java/com/android/activity/GoodsDetailsActivity.java new file mode 100644 index 0000000..7307fe9 --- /dev/null +++ b/app/src/main/java/com/android/activity/GoodsDetailsActivity.java @@ -0,0 +1,46 @@ +package com.android.activity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; +import android.util.Log; + +import com.android.R; +import com.android.bean.Good; + +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +public class GoodsDetailsActivity extends AppCompatActivity { + private Good good; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_goods_details); + //注册EventBus + EventBus.getDefault().register(this); + } + + //拿取数据 + @Subscribe(threadMode = ThreadMode.MAIN,sticky = true) + public void getGoods(Good data){ + if(data != null){ + this.good = data; + Log.e("GoodsDetailsActivity",good.getContent()); + }else { + Log.e("GoodsDetailsActivity","获取失败"); + + } + } + + + + + @Override + protected void onDestroy() { + EventBus.getDefault().unregister(this); + super.onDestroy(); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/android/activity/HomePageActivity.java b/app/src/main/java/com/android/activity/HomePageActivity.java index 97aa188..e669fa4 100644 --- a/app/src/main/java/com/android/activity/HomePageActivity.java +++ b/app/src/main/java/com/android/activity/HomePageActivity.java @@ -19,6 +19,7 @@ import com.google.android.material.navigation.NavigationBarView; import com.google.android.material.navigation.NavigationView; import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; public class HomePageActivity extends AppCompatActivity implements BottomNavigationView.OnNavigationItemSelectedListener{ @@ -32,6 +33,7 @@ public class HomePageActivity extends AppCompatActivity implements BottomNavigat super.onCreate(savedInstanceState); setContentView(R.layout.activity_home_page); +// EventBus.getDefault().register(this); navigation = findViewById(R.id.bottom_navigation); navigation.setLabelVisibilityMode(NavigationBarView.LABEL_VISIBILITY_LABELED); @@ -66,6 +68,7 @@ public class HomePageActivity extends AppCompatActivity implements BottomNavigat case R.id.item_my: fragmentTransaction.replace(R.id.fragment_container, new MyPageFragment()); fragmentTransaction.commit(); + break; case R.id.item_shop: fragmentTransaction.replace(R.id.fragment_container, new ShopCarPageFragment()); @@ -79,9 +82,10 @@ public class HomePageActivity extends AppCompatActivity implements BottomNavigat return true; } + @Override protected void onDestroy() { - +// EventBus.getDefault().unregister(this); super.onDestroy(); } } \ No newline at end of file diff --git a/app/src/main/java/com/android/activity/LoginActivity.java b/app/src/main/java/com/android/activity/LoginActivity.java index b6fbef2..a34c17d 100644 --- a/app/src/main/java/com/android/activity/LoginActivity.java +++ b/app/src/main/java/com/android/activity/LoginActivity.java @@ -17,10 +17,14 @@ import com.android.model.login.LoginModel; import com.android.model.login.LoginModelImpl; import com.android.utils.watcher.MyWatcher; +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + public class LoginActivity extends AppCompatActivity implements LoginListener, View.OnClickListener { private static final String TAG ="LoginActivity"; - private ResponseData responseData; + private ResponseData responseData; private EditText etPwd; private EditText etAccount; private Button LoginButton; @@ -82,14 +86,12 @@ public class LoginActivity extends AppCompatActivity implements LoginListener, V this.responseData = responseData; login(); - Log.e("responseData",String.valueOf(responseData.getData().getId())); + } @Override public void onGetCodeSuccess(ResponseData responseData) { - Log.e(TAG,"onGetCodeSuccess"+responseData.getCode()); - } @Override @@ -106,9 +108,13 @@ public class LoginActivity extends AppCompatActivity implements LoginListener, V private void login() { if(responseData.getCode() == 200){ Intent intent = new Intent(LoginActivity.this,HomePageActivity.class); + EventBus.getDefault().postSticky(responseData); startActivity(intent); }else { Log.e("login",responseData.getMsg()); } } + + + } \ No newline at end of file diff --git a/app/src/main/java/com/android/activity/adapter/GoodsAdapter.java b/app/src/main/java/com/android/activity/adapter/GoodsAdapter.java index 61b0a79..543fc57 100644 --- a/app/src/main/java/com/android/activity/adapter/GoodsAdapter.java +++ b/app/src/main/java/com/android/activity/adapter/GoodsAdapter.java @@ -48,7 +48,6 @@ public class GoodsAdapter extends RecyclerView.Adapter strTvTitle = goodArrayList.get(position).getContent(); strTvCount = goodArrayList.get(position).getPrice().toString(); imageUrl = (String) goodArrayList.get(position).getImageUrlList().get(0); - Log.e("imageUrl", (String) goodArrayList.get(position).getImageUrlList().get(0)); holder.getTvTitle().setText(strTvTitle); holder.getTvCount().setText(strTvCount); diff --git a/app/src/main/java/com/android/activity/adapter/StaggerAdapter.java b/app/src/main/java/com/android/activity/adapter/StaggerAdapter.java index 8b274f8..728e82f 100644 --- a/app/src/main/java/com/android/activity/adapter/StaggerAdapter.java +++ b/app/src/main/java/com/android/activity/adapter/StaggerAdapter.java @@ -2,6 +2,7 @@ package com.android.activity.adapter; import static android.content.ContentValues.TAG; +import android.annotation.SuppressLint; import android.content.Context; import android.util.Log; import android.view.View; @@ -29,6 +30,9 @@ public class StaggerAdapter extends RecyclerView.Adapter mData; private RecyclerView mList; Context context; + private OnItemClickListener mOnItemClickListener; + + public StaggerAdapter(ArrayList mData, Context context) { Log.d("TAG", "StaggerAdapter: "); @@ -44,7 +48,6 @@ public class StaggerAdapter extends RecyclerView.Adapter goodArrayList; - private EventMsg eventMsg; private ArrayList typeGoodList; private RecyclerView recyclerView; - private StaggerAdapter goodsAdapter; -// private GoodsAdapter goodsAdapter; + private StaggerAdapter staggerAdapter; + private User user; View rootView; @@ -100,11 +104,7 @@ public class GoodsTypeFragment extends Fragment { recyclerView = rootView.findViewById(R.id.rl_goods_show); if (goodArrayList != null){ - Log.d("TAG", "initView"); - goodsAdapter = new StaggerAdapter(typeGoodList,getContext()); -// goodsAdapter = new GoodsAdapter(typeGoodList,getContext()); -// recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); -// recyclerView.setAdapter(goodsAdapter); + staggerAdapter = new StaggerAdapter(typeGoodList,getContext()); //准备布局管理器 StaggeredGridLayoutManager layoutManager = new StaggeredGridLayoutManager(2,StaggeredGridLayoutManager.VERTICAL); //设置布局管理器的方向 @@ -112,18 +112,35 @@ public class GoodsTypeFragment extends Fragment { //设置布局管理器到RecyclerView中 recyclerView.setLayoutManager(layoutManager); //设置适配器 - recyclerView.setAdapter(goodsAdapter); + recyclerView.setAdapter(staggerAdapter); + //设置监听事件 + initListener(); } -// TextView view = rootView.findViewById(R.id.tv_goods); -// view.setText(goodArrayList.get(1).getUsername()); } + private void initListener() { + staggerAdapter.setOnItemClickListener(new StaggerAdapter.OnItemClickListener() { + @Override + public void onItemClick(int position) { + //监听的各种操作写在这里 + Toast.makeText(getActivity(), "我点击了第"+position+"item", Toast.LENGTH_SHORT).show(); + + Good goods = typeGoodList.get(position); + //Eventbus发生事件 + EventBus.getDefault().postSticky(goods); + //intent跳转 + Intent intent = new Intent(getActivity(), GoodsDetailsActivity.class); + startActivity(intent); + + } + }); + } @Override public void onStart() { - EventBus.getDefault().register(this); + super.onStart(); @@ -143,11 +160,4 @@ public class GoodsTypeFragment extends Fragment { super.onDestroy(); } - @Subscribe(sticky = true,threadMode = ThreadMode.MAIN) - public void onReceiveMsg(EventMsg eventMsg){ - this.eventMsg = eventMsg; -// TextView view = rootView.findViewById(R.id.tv_goods); -// view.setText(eventMsg.getMsg()); - } - } \ No newline at end of file diff --git a/app/src/main/java/com/android/activity/fragment/HomePageFragment.java b/app/src/main/java/com/android/activity/fragment/HomePageFragment.java index b9f8afb..51e3386 100644 --- a/app/src/main/java/com/android/activity/fragment/HomePageFragment.java +++ b/app/src/main/java/com/android/activity/fragment/HomePageFragment.java @@ -21,6 +21,7 @@ import com.android.bean.Good; import com.android.bean.GoodRecords; import com.android.bean.GoodsType; import com.android.bean.ResponseData; +import com.android.bean.User; import com.android.model.goods.GoodsListener; import com.android.model.goods.GoodsModelimpl; import com.android.utils.eventBus.EventMsg; @@ -28,6 +29,8 @@ import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; @@ -45,6 +48,7 @@ public class HomePageFragment extends Fragment implements View.OnClickListener, private List goodList; private View rootView; private GoodsTypeFSAdapter goodsTypeFSAdapter; + private User user; private ViewPager2 viewPager; @@ -59,10 +63,16 @@ public class HomePageFragment extends Fragment implements View.OnClickListener, @Override public void onCreate(Bundle savedInstanceState) { + EventBus.getDefault().register(this); + super.onCreate(savedInstanceState); } - + @Override + public void onStop() { + EventBus.getDefault().unregister(this); + super.onStop(); + } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -76,7 +86,12 @@ public class HomePageFragment extends Fragment implements View.OnClickListener, } private void initGoodsTypeData() { - goodsModelimpl = new GoodsModelimpl(); + if (user != null){ + goodsModelimpl = new GoodsModelimpl(user); + }else { + goodsModelimpl = new GoodsModelimpl(); + + } goodsModelimpl.getAllGood(this); goodsModelimpl.getAllGoodsType(this); new Handler().postDelayed(new Runnable() { @@ -113,8 +128,6 @@ public class HomePageFragment extends Fragment implements View.OnClickListener, fragments.add(GoodsTypeFragment.newInstance(goodsTypeList.get(i).getId(), goodList)); - //EventBus发布消息 -// EventBus.getDefault().postSticky(new EventMsg<>(goodsTypeList.get(i).getType(),200,goodList)); } goodsTypeFSAdapter = new GoodsTypeFSAdapter(getActivity().getSupportFragmentManager(), getLifecycle(),fragments); @@ -126,8 +139,15 @@ public class HomePageFragment extends Fragment implements View.OnClickListener, } + + @Override public void onClick(View v) { } + + @Subscribe(threadMode = ThreadMode.POSTING,sticky = true) + public void getLoginUser(ResponseData responseData){ + this.user = responseData.getData(); + } } \ No newline at end of file diff --git a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java index ff87668..1b3cad7 100644 --- a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java +++ b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java @@ -4,11 +4,19 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; import com.android.R; +import com.android.bean.ResponseData; +import com.android.bean.User; + +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; /** * A simple {@link Fragment} subclass. @@ -16,6 +24,9 @@ import com.android.R; * create an instance of this fragment. */ public class MyPageFragment extends Fragment { + private View rootView; + private TextView textView; + private ResponseData userResponseData; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -30,6 +41,20 @@ public class MyPageFragment extends Fragment { // Required empty public constructor } + @Override + public void onStart() { + super.onStart(); + + + } + + @Override + public void onStop() { + super.onStop(); + + + } + /** * Use this factory method to create a new instance of * this fragment using the provided parameters. @@ -48,9 +73,22 @@ public class MyPageFragment extends Fragment { return fragment; } + + @Override + public void onDestroy() { + if (!EventBus.getDefault().isRegistered(this)) { + EventBus.getDefault().register(this); + } + super.onDestroy(); + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (!EventBus.getDefault().isRegistered(this)) { + EventBus.getDefault().register(this); + } + if (getArguments() != null) { mParam1 = getArguments().getString(ARG_PARAM1); mParam2 = getArguments().getString(ARG_PARAM2); @@ -61,6 +99,16 @@ public class MyPageFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_my_page, container, false); + + rootView = inflater.inflate(R.layout.fragment_my_page, container, false); + textView = rootView.findViewById(R.id.tv_my); + + return rootView; } + + @Subscribe(threadMode = ThreadMode.POSTING,sticky = true) + public void getLoginUser(ResponseData responseData){ + this.userResponseData = responseData; + } + } \ No newline at end of file diff --git a/app/src/main/java/com/android/bean/User.java b/app/src/main/java/com/android/bean/User.java index 8df9335..f830690 100644 --- a/app/src/main/java/com/android/bean/User.java +++ b/app/src/main/java/com/android/bean/User.java @@ -13,19 +13,23 @@ import lombok.NoArgsConstructor; public class User implements Serializable { @SerializedName("id") - private Integer id; + private Long id; + @SerializedName("username") private String userName; private String code; private String phone; + @SerializedName("avatar") private String avatar; + @SerializedName("appKey") private String appKey; + @SerializedName("money") private Integer money; - public Integer getId() { + public Long getId() { return id; } - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } diff --git a/app/src/main/java/com/android/model/goods/GoodsHttp_interface.java b/app/src/main/java/com/android/model/goods/GoodsHttp_interface.java index 644cd8e..022de25 100644 --- a/app/src/main/java/com/android/model/goods/GoodsHttp_interface.java +++ b/app/src/main/java/com/android/model/goods/GoodsHttp_interface.java @@ -17,14 +17,14 @@ import retrofit2.http.QueryMap; public interface GoodsHttp_interface { @GET("tran/goods/type") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable>> sendGetAllGoodsType(); @GET("tran/goods/all") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) - Observable> sendGetAllGood(@Query("userId") Integer userId, + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) + Observable> sendGetAllGood(@Query("userId") Long userId, @QueryMap Map map ); diff --git a/app/src/main/java/com/android/model/goods/GoodsModelimpl.java b/app/src/main/java/com/android/model/goods/GoodsModelimpl.java index 773eb63..7431dd1 100644 --- a/app/src/main/java/com/android/model/goods/GoodsModelimpl.java +++ b/app/src/main/java/com/android/model/goods/GoodsModelimpl.java @@ -1,5 +1,6 @@ package com.android.model.goods; +import android.net.Uri; import android.util.ArrayMap; import android.util.Log; @@ -7,6 +8,7 @@ import com.android.bean.Good; import com.android.bean.GoodRecords; import com.android.bean.GoodsType; import com.android.bean.ResponseData; +import com.android.bean.User; import com.android.model.login.LoginListener; import java.util.List; @@ -23,9 +25,16 @@ import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; import retrofit2.converter.gson.GsonConverterFactory; public class GoodsModelimpl implements GoodsModel{ + + private User user; private String TAG ="GoodsModelimpl"; + public GoodsModelimpl(User user) { + this.user = user; + } + public GoodsModelimpl() { + } @Override public void getAllGoodsType(GoodsListener goodsListener) { @@ -50,7 +59,6 @@ public class GoodsModelimpl implements GoodsModel{ @Override public void onNext(@NonNull ResponseData> listResponseData) { - Log.e(TAG,listResponseData.getMsg()); goodsListener.onGetAllGoodsType(listResponseData); } @@ -77,8 +85,10 @@ public class GoodsModelimpl implements GoodsModel{ retrofit.create(GoodsHttp_interface.class); Map map = new ArrayMap<>(); + + Observable> observable - = httpInterface.sendGetAllGood(17, map); + = httpInterface.sendGetAllGood(6l, map); observable.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -91,7 +101,6 @@ public class GoodsModelimpl implements GoodsModel{ @Override public void onNext(@NonNull ResponseData listResponseData) { goodsListener.onGetAllGoodSuccess(listResponseData); - Log.e("1111",listResponseData.getData().getRecords().get(1).getUsername()); } @Override diff --git a/app/src/main/java/com/android/model/login/LoginModelImpl.java b/app/src/main/java/com/android/model/login/LoginModelImpl.java index 18a65ce..cc3c4c3 100644 --- a/app/src/main/java/com/android/model/login/LoginModelImpl.java +++ b/app/src/main/java/com/android/model/login/LoginModelImpl.java @@ -37,8 +37,6 @@ public class LoginModelImpl implements LoginModel{ User user = new User(); user.setCode(phoneCode); user.setPhone(account); - Log.e("TAG",phoneCode); - Log.e("TAG",account); Observable> observable = request.login(user); observable @@ -53,6 +51,7 @@ public class LoginModelImpl implements LoginModel{ @Override public void onNext(@NonNull ResponseData userResponseData) { loginListener.onLoginSuccess(userResponseData); + Log.e("login",userResponseData.getMsg()); } @Override diff --git a/app/src/main/res/drawable/add_shopping_cart_24.xml b/app/src/main/res/drawable/add_shopping_cart_24.xml index 2f8406c..33ff074 100644 --- a/app/src/main/res/drawable/add_shopping_cart_24.xml +++ b/app/src/main/res/drawable/add_shopping_cart_24.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_goods_details.xml b/app/src/main/res/layout/activity_goods_details.xml new file mode 100644 index 0000000..5b698e5 --- /dev/null +++ b/app/src/main/res/layout/activity_goods_details.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home_page.xml b/app/src/main/res/layout/activity_home_page.xml index cc8fb18..f0e5056 100644 --- a/app/src/main/res/layout/activity_home_page.xml +++ b/app/src/main/res/layout/activity_home_page.xml @@ -12,6 +12,7 @@ android:id="@+id/fragment_container" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginBottom="50dp" app:layout_constraintBottom_toTopOf="@id/bottom_navigation" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 060c2c0..4570e1e 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -43,7 +43,8 @@ + android:layout_height="wrap_content" + android:text="14777361004"/> diff --git a/app/src/main/res/layout/goods_show_item.xml b/app/src/main/res/layout/goods_show_item.xml index 90be38e..43b5ff8 100644 --- a/app/src/main/res/layout/goods_show_item.xml +++ b/app/src/main/res/layout/goods_show_item.xml @@ -1,39 +1,64 @@ + android:layout_height="wrap_content" + android:padding="8dp" + app:cardCornerRadius="8dp" + app:cardUseCompatPadding="true" + + > + android:layout_height="wrap_content" + android:background="#68E3CC9F" + > + > + + + - + android:textSize="15dp"> - - - - + diff --git a/app/src/main/res/layout/item_stagger.xml b/app/src/main/res/layout/item_stagger.xml index f83fd7c..38dea76 100644 --- a/app/src/main/res/layout/item_stagger.xml +++ b/app/src/main/res/layout/item_stagger.xml @@ -1,61 +1,100 @@ - - - - - + + + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + android:background="@color/white"> + + + + + + + + + + + +