From 9d882bec5afe977a2e478cb1be6f4e2fd8cd6898 Mon Sep 17 00:00:00 2001 From: hayden <2867571834@qq.com> Date: Wed, 26 Apr 2023 11:32:54 +0800 Subject: [PATCH] 2.1 --- .idea/gradle.xml | 1 + .idea/vcs.xml | 6 ++ .../java/com/orangesale/cn/MainActivity.java | 6 ++ .../orangesale/cn/activity/IndexActivity.java | 2 + .../cn/activity/RegisterActivity.java | 5 ++ .../orangesale/cn/activity/UserActivity.java | 2 +- .../cn/fragment/PearsonFragment.java | 1 - app/src/main/res/drawable/button_1.xml | 32 +++++++++ app/src/main/res/drawable/logo.png | Bin 0 -> 16360 bytes app/src/main/res/drawable/logo2.png | Bin 0 -> 17279 bytes app/src/main/res/drawable/mine2.png | Bin 0 -> 5100 bytes app/src/main/res/drawable/products2.png | Bin 0 -> 5236 bytes app/src/main/res/drawable/proface2.png | Bin 0 -> 4714 bytes app/src/main/res/drawable/shoppingcar2.png | Bin 0 -> 2446 bytes app/src/main/res/drawable/user_icon2.png | Bin 0 -> 8862 bytes app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/content_nav.xml | 62 ++++++++--------- app/src/main/res/layout/content_user.xml | 65 +++++------------- app/src/main/res/layout/user_login.xml | 36 +++++----- app/src/main/res/layout/user_register.xml | 18 +++-- app/src/main/res/values/colors.xml | 13 ++++ 21 files changed, 142 insertions(+), 109 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 app/src/main/res/drawable/button_1.xml create mode 100644 app/src/main/res/drawable/logo.png create mode 100644 app/src/main/res/drawable/logo2.png create mode 100644 app/src/main/res/drawable/mine2.png create mode 100644 app/src/main/res/drawable/products2.png create mode 100644 app/src/main/res/drawable/proface2.png create mode 100644 app/src/main/res/drawable/shoppingcar2.png create mode 100644 app/src/main/res/drawable/user_icon2.png diff --git a/.idea/gradle.xml b/.idea/gradle.xml index a9f4e52..a2d7c21 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,5 +1,6 @@ +