diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 58d5840..38f6bcc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
+
\ No newline at end of file
diff --git a/app/src/main/java/com/yemamacake/cn/activity/IndexActivity.java b/app/src/main/java/com/yemamacake/cn/activity/IndexActivity.java
new file mode 100644
index 0000000..dd491ad
--- /dev/null
+++ b/app/src/main/java/com/yemamacake/cn/activity/IndexActivity.java
@@ -0,0 +1,121 @@
+package com.yemamacake.cn.activity;
+
+import android.app.Activity;
+import android.app.FragmentTransaction;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+
+import com.yemamacake.cn.R;
+import com.yemamacake.cn.fragment.IndexFragment;
+import com.yemamacake.cn.fragment.PearsonFragment;
+import com.yemamacake.cn.fragment.ProductFragment;
+import com.yemamacake.cn.fragment.ShoppingCartFragment;
+
+public class IndexActivity extends Activity implements View.OnClickListener {
+ private IndexFragment indexFragment;
+ private ProductFragment productFragment;
+ private ShoppingCartFragment shoppingCartFragment;
+ private PearsonFragment pearsonFragment;
+ private LinearLayout indexLine, productLine, shoppingCartLine, pearsonLine;
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ init();
+ initIndexFragment();
+ }
+
+ /**
+ * 组件初始化
+ */
+ private void init() {
+ indexLine = findViewById(R.id.content_index);
+ indexLine.setOnClickListener(this);
+ productLine = findViewById(R.id.content_product);
+ productLine.setOnClickListener(this);
+ shoppingCartLine = findViewById(R.id.content_cart);
+ shoppingCartLine.setOnClickListener(this);
+ pearsonLine = findViewById(R.id.content_pearson);
+ pearsonLine.setOnClickListener(this);
+ }
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.content_index:
+ initIndexFragment();
+ break;
+ case R.id.content_product:
+ initproductFragment();
+ break;
+ case R.id.content_cart:
+ initshoppingCartFragment();
+ break;
+ case R.id.content_pearson:
+ initpearsonFragment();
+ break;
+ }
+ }
+
+ /**
+ * 初始化首页Fragment
+ */
+ private void initIndexFragment() {
+ //开启事务,fragment的控制是由事务来实现的
+ FragmentTransaction transaction = getFragmentManager().beginTransaction();
+ if (indexFragment == null) {
+ indexFragment = new IndexFragment();
+ }
+ transaction.replace(R.id.main_content, indexFragment);
+ transaction.commit();
+ }
+
+ /**
+ * 初始化产品Fragment
+ */
+ private void initproductFragment() {
+ //开启事务,fragment的控制是由事务来实现的
+ FragmentTransaction transaction = getFragmentManager().beginTransaction();
+ if (productFragment == null) {
+ productFragment = new ProductFragment();
+ }
+ transaction.replace(R.id.main_content, productFragment);
+ transaction.commit();
+ }
+
+ /**
+ * 初始化购物车Fragment
+ */
+ private void initshoppingCartFragment() {
+ //开启事务,fragment的控制是由事务来实现的
+ FragmentTransaction transaction = getFragmentManager().beginTransaction();
+ if (shoppingCartFragment == null) {
+ shoppingCartFragment = new ShoppingCartFragment();
+ }
+ transaction.replace(R.id.main_content, shoppingCartFragment);
+ transaction.commit();
+ }
+
+ /**
+ * 初始化个人Fragment
+ */
+ private void initpearsonFragment() {
+ //开启事务,fragment的控制是由事务来实现的
+ FragmentTransaction transaction = getFragmentManager().beginTransaction();
+ if (pearsonFragment == null) {
+ Intent intent = IndexActivity.this.getIntent();
+ Bundle bundle = intent.getExtras();
+ pearsonFragment = new PearsonFragment();
+ pearsonFragment.setArguments(bundle);
+ }
+ transaction.replace(R.id.main_content, pearsonFragment);
+ transaction.commit();
+ }
+
+}
+
diff --git a/app/src/main/java/com/yemamacake/cn/activity/RegisterActivity.java b/app/src/main/java/com/yemamacake/cn/activity/RegisterActivity.java
index 0d67617..64fb97f 100644
--- a/app/src/main/java/com/yemamacake/cn/activity/RegisterActivity.java
+++ b/app/src/main/java/com/yemamacake/cn/activity/RegisterActivity.java
@@ -110,7 +110,6 @@ public class RegisterActivity extends AppCompatActivity implements View.OnCli
* 注册验证
*/
public void validateRegister() {
- Intent intent = new Intent(RegisterActivity.this, UserActivity.class);
String username = usernameEdit.getText().toString();
String password = passwordEdit.getText().toString();
String surePassword = surePasswordEdit.getText().toString();
@@ -128,6 +127,9 @@ public class RegisterActivity extends AppCompatActivity implements View.OnCli
MamacakeUser mamacakeUser = new MamacakeUser(RegisterActivity.this);
SQLiteDatabase sqLiteDatabase = mamacakeUser.getWritableDatabase();
insertData(sqLiteDatabase,bundle);
+ Intent intent = new Intent(RegisterActivity.this, IndexActivity.class);
+ intent.putExtras(bundle);
+ startActivity(intent);
intent.putExtras(bundle);
startActivity(intent);
} else {
diff --git a/app/src/main/java/com/yemamacake/cn/adapter/ProductAdapter.java b/app/src/main/java/com/yemamacake/cn/adapter/ProductAdapter.java
new file mode 100644
index 0000000..d1a184a
--- /dev/null
+++ b/app/src/main/java/com/yemamacake/cn/adapter/ProductAdapter.java
@@ -0,0 +1,69 @@
+package com.yemamacake.cn.adapter;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.yemamacake.cn.R;
+import com.yemamacake.cn.entity.Product;
+
+import java.util.List;
+
+public class ProductAdapter extends BaseAdapter {
+ private List productList;
+ private LayoutInflater layoutInflater;
+
+ public ProductAdapter(Context context, List productList) {
+ this.productList = productList;
+ this.layoutInflater = LayoutInflater.from(context);
+ }
+
+ @Override
+ public int getCount() {
+ return productList.size();
+ }
+
+ @Override
+ public Object getItem(int position) {
+ return productList.get(position);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ ViewHolder viewHolder;
+ if (convertView == null) {
+ Log.i("aa", "getView: "+"aa");
+ convertView = layoutInflater.inflate(R.layout.category_detail_content, null);
+ viewHolder = new ViewHolder();
+ viewHolder.productImage = convertView.findViewById(R.id.category_product_image);
+ viewHolder.productName = convertView.findViewById(R.id.category_product_name);
+ viewHolder.productPrice = convertView.findViewById(R.id.category_product_price);
+ convertView.setTag(viewHolder);
+ } else {
+ viewHolder = (ViewHolder) convertView.getTag();
+ }
+ Product product = productList.get(position);
+ Log.i("product", "getView: "+product.toString());
+ if (product != null) {
+ viewHolder.productImage.setBackgroundResource(product.getImageUrlId());
+ viewHolder.productName.setText(product.getProductName());
+ viewHolder.productPrice.setText(String.valueOf(product.getProductPrice()));
+ }
+ return convertView;
+ }
+
+ class ViewHolder {
+ ImageView productImage;
+ TextView productName, productPrice;
+ }
+}
diff --git a/app/src/main/java/com/yemamacake/cn/fragment/IndexFragment.java b/app/src/main/java/com/yemamacake/cn/fragment/IndexFragment.java
new file mode 100644
index 0000000..2961ef1
--- /dev/null
+++ b/app/src/main/java/com/yemamacake/cn/fragment/IndexFragment.java
@@ -0,0 +1,110 @@
+package com.yemamacake.cn.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.GridView;
+import android.widget.LinearLayout;
+import android.widget.SearchView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yemamacake.cn.R;
+import com.yemamacake.cn.adapter.ProductAdapter;
+import com.yemamacake.cn.entity.Product;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class IndexFragment extends Fragment implements View.OnClickListener {
+ private SearchView searchView;
+ private LinearLayout orangeLine, youziLine, juziLine, xiguaLine, liLine, appleLine, lemonLine, mangguoLine;
+ private GridView gridView;
+ private List productList;
+ private ProductAdapter productAdapter;
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_index, container, false);
+ init(view);
+ return view;
+ }
+
+ /**
+ * 初始化组件
+ */
+ private void init(View view) {
+ searchView = view.findViewById(R.id.searchView);
+ searchView.setOnClickListener(this);
+ orangeLine = view.findViewById(R.id.breakfast);
+ orangeLine.setOnClickListener(this);
+ youziLine = view.findViewById(R.id.下午茶点);
+ youziLine.setOnClickListener(this);
+ juziLine = view.findViewById(R.id.western_cake);
+ juziLine.setOnClickListener(this);
+ xiguaLine = view.findViewById(R.id.chinese_tradional_cake);
+ xiguaLine.setOnClickListener(this);
+ liLine = view.findViewById(R.id.chinese_newcake);
+ liLine.setOnClickListener(this);
+ lemonLine = view.findViewById(R.id.breakbread);
+ lemonLine.setOnClickListener(this);
+ mangguoLine = view.findViewById(R.id.fruit_tea);
+ mangguoLine.setOnClickListener(this);
+ appleLine = view.findViewById(R.id.birthcake);
+ appleLine.setOnClickListener(this);
+ gridView = view.findViewById(R.id.index_famous_gridview);
+ initData();
+ productAdapter = new ProductAdapter(getActivity(), productList);
+ gridView.setAdapter(productAdapter);
+ }
+
+
+ @Override
+ public void onClick(View v) {
+
+ }
+
+ /**
+ * 初始化商品数据
+ */
+ private void initData() {
+ productList = new ArrayList<>();
+ Product product = new Product();
+ product.setImageUrlId(R.drawable.strawberrybread);
+ product.setProductName("草莓蛋糕");
+ product.setProductPrice(new BigDecimal("29.9"));
+ Product product1 = new Product();
+ product1.setImageUrlId(R.drawable.sweet);
+ product1.setProductName("马卡龙");
+ product1.setProductPrice(new BigDecimal("39.9"));
+ Product product2 = new Product();
+ product2.setImageUrlId(R.drawable.hongdoubread);
+ product2.setProductName("红的吐司");
+ product2.setProductPrice(new BigDecimal("9.9"));
+ Product product3 = new Product();
+ product3.setImageUrlId(R.drawable.mochabread);
+ product3.setProductName("抹茶吐司");
+ product3.setProductPrice(new BigDecimal("12.9"));
+ Product product4 = new Product();
+ product4.setImageUrlId(R.drawable.rousongbread);
+ product4.setProductName("肉松小贝");
+ product4.setProductPrice(new BigDecimal("49.9"));
+ Product product5 = new Product();
+ product5.setImageUrlId(R.drawable.user_cake);
+ product5.setProductName("慕斯卷");
+ product5.setProductPrice(new BigDecimal("9.9"));
+ productList.add(product);
+ productList.add(product1);
+ productList.add(product2);
+ productList.add(product3);
+ productList.add(product4);
+ productList.add(product5);
+
+ }
+}
+
diff --git a/app/src/main/java/com/yemamacake/cn/fragment/PearsonFragment.java b/app/src/main/java/com/yemamacake/cn/fragment/PearsonFragment.java
new file mode 100644
index 0000000..9b62968
--- /dev/null
+++ b/app/src/main/java/com/yemamacake/cn/fragment/PearsonFragment.java
@@ -0,0 +1,64 @@
+package com.yemamacake.cn.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yemamacake.cn.R;
+
+public class PearsonFragment extends Fragment implements View.OnClickListener {
+ private ImageView userIconImage;
+ private TextView usernameText, userSexText, userCityText;
+ private LinearLayout usernameLine, userSexline, userCityLine, userPayLine, userSettingLine, userGeneralLine;
+
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_user, container, false);
+ init(view);
+ return view;
+ }
+
+ /**
+ * 组件初始化
+ */
+ private void init(View view) {
+ userIconImage = view.findViewById(R.id.user_icon);
+ usernameText = view.findViewById(R.id.user_username);
+ userSexText = view.findViewById(R.id.user_sex);
+ userCityText = view.findViewById(R.id.user_city);
+ usernameLine = view.findViewById(R.id.user_username_line);
+ userSexline = view.findViewById(R.id.user_sex_line);
+ userCityLine = view.findViewById(R.id.user_city_line);
+ userPayLine = view.findViewById(R.id.user_pay);
+ userSettingLine = view.findViewById(R.id.user_setting);
+ userGeneralLine = view.findViewById(R.id.user_general);
+ setData();
+ }
+
+ /**
+ * 组件赋值
+ */
+ private void setData() {
+ Bundle bundle = getArguments();
+ usernameText.setText(String.format("用户名:%s", bundle.getString("username")));
+ userSexText.setText(String.format("性别:%s", bundle.getString("sex")));
+ userCityText.setText(String.format("城市:%s", bundle.getString("city")));
+ }
+
+ @Override
+ public void onClick(View v) {
+
+ }
+
+
+}
diff --git a/app/src/main/java/com/yemamacake/cn/fragment/ProductFragment.java b/app/src/main/java/com/yemamacake/cn/fragment/ProductFragment.java
new file mode 100644
index 0000000..32b68a3
--- /dev/null
+++ b/app/src/main/java/com/yemamacake/cn/fragment/ProductFragment.java
@@ -0,0 +1,21 @@
+package com.yemamacake.cn.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yemamacake.cn.R;
+
+public class ProductFragment extends Fragment {
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_product, container, false);
+ return view;
+ }
+}
diff --git a/app/src/main/java/com/yemamacake/cn/fragment/SetDetailFragment.java b/app/src/main/java/com/yemamacake/cn/fragment/SetDetailFragment.java
index 937da62..3217ec8 100644
--- a/app/src/main/java/com/yemamacake/cn/fragment/SetDetailFragment.java
+++ b/app/src/main/java/com/yemamacake/cn/fragment/SetDetailFragment.java
@@ -50,7 +50,6 @@ public class SetDetailFragment extends Fragment {
imageView = view.findViewById(R.id.category_product_image);
nameText = view.findViewById(R.id.category_product_name);
priceText = view.findViewById(R.id.category_product_price);
- produceText= view.findViewById(R.id.category_product_introduce);
}
}
diff --git a/app/src/main/java/com/yemamacake/cn/fragment/ShoppingCartFragment.java b/app/src/main/java/com/yemamacake/cn/fragment/ShoppingCartFragment.java
new file mode 100644
index 0000000..1fdcb41
--- /dev/null
+++ b/app/src/main/java/com/yemamacake/cn/fragment/ShoppingCartFragment.java
@@ -0,0 +1,21 @@
+package com.yemamacake.cn.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yemamacake.cn.R;
+
+public class ShoppingCartFragment extends Fragment {
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_shopping, container, false);
+ return view;
+ }
+}
diff --git a/app/src/main/res/drawable-v24/xiawu.png b/app/src/main/res/drawable-v24/xiawu.png
new file mode 100644
index 0000000..a197f63
Binary files /dev/null and b/app/src/main/res/drawable-v24/xiawu.png differ
diff --git a/app/src/main/res/drawable/birthcake.png b/app/src/main/res/drawable/birthcake.png
new file mode 100644
index 0000000..da26c22
Binary files /dev/null and b/app/src/main/res/drawable/birthcake.png differ
diff --git a/app/src/main/res/drawable/breakfast.png b/app/src/main/res/drawable/breakfast.png
new file mode 100644
index 0000000..10da0dd
Binary files /dev/null and b/app/src/main/res/drawable/breakfast.png differ
diff --git a/app/src/main/res/drawable/famous_cake.jpeg b/app/src/main/res/drawable/famous_cake.jpeg
new file mode 100644
index 0000000..72b7a32
Binary files /dev/null and b/app/src/main/res/drawable/famous_cake.jpeg differ
diff --git a/app/src/main/res/drawable/hongdoubread.png b/app/src/main/res/drawable/hongdoubread.png
new file mode 100644
index 0000000..ff1a448
Binary files /dev/null and b/app/src/main/res/drawable/hongdoubread.png differ
diff --git a/app/src/main/res/drawable/img_11.png b/app/src/main/res/drawable/img_11.png
new file mode 100644
index 0000000..10da0dd
Binary files /dev/null and b/app/src/main/res/drawable/img_11.png differ
diff --git a/app/src/main/res/drawable/img_9.png b/app/src/main/res/drawable/img_9.png
new file mode 100644
index 0000000..10da0dd
Binary files /dev/null and b/app/src/main/res/drawable/img_9.png differ
diff --git a/app/src/main/res/drawable/index.jpg b/app/src/main/res/drawable/index.jpg
new file mode 100644
index 0000000..3003c79
Binary files /dev/null and b/app/src/main/res/drawable/index.jpg differ
diff --git a/app/src/main/res/drawable/index_menu.xml b/app/src/main/res/drawable/index_menu.xml
new file mode 100644
index 0000000..14636dd
--- /dev/null
+++ b/app/src/main/res/drawable/index_menu.xml
@@ -0,0 +1,16 @@
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/lvdou.jpg b/app/src/main/res/drawable/lvdou.jpg
new file mode 100644
index 0000000..da33605
Binary files /dev/null and b/app/src/main/res/drawable/lvdou.jpg differ
diff --git a/app/src/main/res/drawable/mochabread.jpg b/app/src/main/res/drawable/mochabread.jpg
new file mode 100644
index 0000000..f710f2a
Binary files /dev/null and b/app/src/main/res/drawable/mochabread.jpg differ
diff --git a/app/src/main/res/drawable/naiyoubread.png b/app/src/main/res/drawable/naiyoubread.png
new file mode 100644
index 0000000..2e57ace
Binary files /dev/null and b/app/src/main/res/drawable/naiyoubread.png differ
diff --git a/app/src/main/res/drawable/paofu.jpg b/app/src/main/res/drawable/paofu.jpg
new file mode 100644
index 0000000..5b6fb19
Binary files /dev/null and b/app/src/main/res/drawable/paofu.jpg differ
diff --git a/app/src/main/res/drawable/peachtea.jpg b/app/src/main/res/drawable/peachtea.jpg
new file mode 100644
index 0000000..df901f1
Binary files /dev/null and b/app/src/main/res/drawable/peachtea.jpg differ
diff --git a/app/src/main/res/drawable/pearson.png b/app/src/main/res/drawable/pearson.png
new file mode 100644
index 0000000..90cf0eb
Binary files /dev/null and b/app/src/main/res/drawable/pearson.png differ
diff --git a/app/src/main/res/drawable/product.png b/app/src/main/res/drawable/product.png
new file mode 100644
index 0000000..8f5cb21
Binary files /dev/null and b/app/src/main/res/drawable/product.png differ
diff --git a/app/src/main/res/drawable/rousongbread.png b/app/src/main/res/drawable/rousongbread.png
new file mode 100644
index 0000000..3b2bc62
Binary files /dev/null and b/app/src/main/res/drawable/rousongbread.png differ
diff --git a/app/src/main/res/drawable/shopping.jpg b/app/src/main/res/drawable/shopping.jpg
new file mode 100644
index 0000000..d6a6056
Binary files /dev/null and b/app/src/main/res/drawable/shopping.jpg differ
diff --git a/app/src/main/res/drawable/shuiguo.png b/app/src/main/res/drawable/shuiguo.png
new file mode 100644
index 0000000..d316137
Binary files /dev/null and b/app/src/main/res/drawable/shuiguo.png differ
diff --git a/app/src/main/res/drawable/strawberrybread.png b/app/src/main/res/drawable/strawberrybread.png
new file mode 100644
index 0000000..4c10eae
Binary files /dev/null and b/app/src/main/res/drawable/strawberrybread.png differ
diff --git a/app/src/main/res/drawable/sweet.png b/app/src/main/res/drawable/sweet.png
new file mode 100644
index 0000000..268e14a
Binary files /dev/null and b/app/src/main/res/drawable/sweet.png differ
diff --git a/app/src/main/res/drawable/taosu.jpg b/app/src/main/res/drawable/taosu.jpg
new file mode 100644
index 0000000..c7d9fb3
Binary files /dev/null and b/app/src/main/res/drawable/taosu.jpg differ
diff --git a/app/src/main/res/drawable/xiawucha.png b/app/src/main/res/drawable/xiawucha.png
new file mode 100644
index 0000000..98505e5
Binary files /dev/null and b/app/src/main/res/drawable/xiawucha.png differ
diff --git a/app/src/main/res/drawable/img.png b/app/src/main/res/drawable/xiawucha2.png
similarity index 100%
rename from app/src/main/res/drawable/img.png
rename to app/src/main/res/drawable/xiawucha2.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index de1395d..6612219 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,29 @@
-
+ android:orientation="vertical"
+ tools:context=".activity.IndexActivity">
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/category_detail_content.xml b/app/src/main/res/layout/category_detail_content.xml
index fabad2d..30761bc 100644
--- a/app/src/main/res/layout/category_detail_content.xml
+++ b/app/src/main/res/layout/category_detail_content.xml
@@ -2,41 +2,31 @@
-
+ android:layout_width="100dp"
+ android:layout_marginTop="5dp"
+ android:layout_height="100dp"
+ android:layout_gravity="center" />
+
- />
-
-
+ android:textSize="16sp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_index.xml b/app/src/main/res/layout/content_index.xml
new file mode 100644
index 0000000..0a264fc
--- /dev/null
+++ b/app/src/main/res/layout/content_index.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_nav.xml b/app/src/main/res/layout/content_nav.xml
new file mode 100644
index 0000000..2f83d59
--- /dev/null
+++ b/app/src/main/res/layout/content_nav.xml
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_product.xml b/app/src/main/res/layout/content_product.xml
new file mode 100644
index 0000000..c946607
--- /dev/null
+++ b/app/src/main/res/layout/content_product.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_shopping.xml b/app/src/main/res/layout/content_shopping.xml
new file mode 100644
index 0000000..e152fbb
--- /dev/null
+++ b/app/src/main/res/layout/content_shopping.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/index_famous.xml b/app/src/main/res/layout/index_famous.xml
new file mode 100644
index 0000000..5902a8a
--- /dev/null
+++ b/app/src/main/res/layout/index_famous.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yemamadatabase.db b/yemamadatabase.db
deleted file mode 100644
index 755fbab..0000000
Binary files a/yemamadatabase.db and /dev/null differ