Compare commits

...

1 Commits

Author SHA1 Message Date
wangyi 9575df1702 实验四new
2 years ago

@ -1,4 +1,4 @@
package com.example.orangesale_05.activity; package com.example.Fruitparty.activity;
import android.app.Activity; import android.app.Activity;
import android.app.FragmentManager; import android.app.FragmentManager;
@ -8,10 +8,10 @@ import android.widget.ListView;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
import com.example.orangesale_05.adapter.Adapter; import com.example.Fruitparty.adapter.Adapter;
import com.example.orangesale_05.entity.Product; import com.example.Fruitparty.entity.Product;
import com.example.orangesale_05.fragment.SetDetailFragment; import com.example.Fruitparty.fragment.SetDetailFragment;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;

@ -1,4 +1,4 @@
package com.example.orangesale_05.activity; package com.example.Fruitparty.activity;
import android.app.Activity; import android.app.Activity;
import android.app.FragmentTransaction; import android.app.FragmentTransaction;
@ -9,11 +9,11 @@ import android.widget.LinearLayout;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
import com.example.orangesale_05.fragment.IndexFragment; import com.example.Fruitparty.fragment.IndexFragment;
import com.example.orangesale_05.fragment.PearsonFragment; import com.example.Fruitparty.fragment.PearsonFragment;
import com.example.orangesale_05.fragment.ProductFragment; import com.example.Fruitparty.fragment.ProductFragment;
import com.example.orangesale_05.fragment.ShoppingCartFragment; import com.example.Fruitparty.fragment.ShoppingCartFragment;
public class IndexActivity extends Activity implements View.OnClickListener { public class IndexActivity extends Activity implements View.OnClickListener {
private IndexFragment indexFragment; private IndexFragment indexFragment;

@ -1,4 +1,4 @@
package com.example.orangesale_05.activity; package com.example.Fruitparty.activity;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Intent; import android.content.Intent;
@ -16,8 +16,8 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.lljjcoder.citypickerview.widget.CityPicker; import com.lljjcoder.citypickerview.widget.CityPicker;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
import com.example.orangesale_05.dataoperation.OrangeDatabase; import com.example.Fruitparty.dataoperation.OrangeDatabase;
public class RegisterActivity extends AppCompatActivity implements View.OnClickListener, RadioGroup.OnCheckedChangeListener { public class RegisterActivity extends AppCompatActivity implements View.OnClickListener, RadioGroup.OnCheckedChangeListener {
private EditText usernameEdit, passwordEdit, surePasswordEdit; private EditText usernameEdit, passwordEdit, surePasswordEdit;

@ -1,4 +1,4 @@
package com.example.orangesale_05.activity; package com.example.Fruitparty.activity;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@ -10,7 +10,7 @@ import android.widget.TextView;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
public class UserActivity extends Activity implements View.OnClickListener { public class UserActivity extends Activity implements View.OnClickListener {
private ImageView userIconImage; private ImageView userIconImage;

@ -1,4 +1,4 @@
package com.example.orangesale_05.adapter; package com.example.Fruitparty.adapter;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
@ -9,7 +9,7 @@ import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.TextView; import android.widget.TextView;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
import java.util.List; import java.util.List;

@ -1,4 +1,4 @@
package com.example.orangesale_05.adapter; package com.example.Fruitparty.adapter;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
@ -9,8 +9,8 @@ import android.widget.BaseAdapter;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
import com.example.orangesale_05.entity.Product; import com.example.Fruitparty.entity.Product;
import java.util.List; import java.util.List;

@ -1,4 +1,4 @@
package com.example.orangesale_05.dataoperation; package com.example.Fruitparty.dataoperation;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;

@ -1,4 +1,4 @@
package com.example.orangesale_05.entity; package com.example.Fruitparty.entity;
public class OrangeUser { public class OrangeUser {
private Integer id; private Integer id;

@ -1,4 +1,4 @@
package com.example.orangesale_05.entity; package com.example.Fruitparty.entity;
import java.math.BigDecimal; import java.math.BigDecimal;

@ -1,4 +1,4 @@
package com.example.orangesale_05.fragment; package com.example.Fruitparty.fragment;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
@ -12,9 +12,9 @@ import android.widget.SearchView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
import com.example.orangesale_05.adapter.ProductAdapter; import com.example.Fruitparty.adapter.ProductAdapter;
import com.example.orangesale_05.entity.Product; import com.example.Fruitparty.entity.Product;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;

@ -1,4 +1,4 @@
package com.example.orangesale_05.fragment; package com.example.Fruitparty.fragment;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
@ -12,7 +12,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
public class PearsonFragment extends Fragment implements View.OnClickListener { public class PearsonFragment extends Fragment implements View.OnClickListener {
private ImageView userIconImage; private ImageView userIconImage;

@ -1,4 +1,4 @@
package com.example.orangesale_05.fragment; package com.example.Fruitparty.fragment;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
@ -9,7 +9,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
public class ProductFragment extends Fragment { public class ProductFragment extends Fragment {
@Nullable @Nullable

@ -1,4 +1,4 @@
package com.example.orangesale_05.fragment; package com.example.Fruitparty.fragment;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Fragment; import android.app.Fragment;
@ -13,8 +13,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
import com.example.orangesale_05.activity.CategoryActivity; import com.example.Fruitparty.activity.CategoryActivity;
import java.util.Objects; import java.util.Objects;

@ -1,4 +1,4 @@
package com.example.orangesale_05.fragment; package com.example.Fruitparty.fragment;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
@ -9,7 +9,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.example.orangesale_05.R; import com.example.Fruitparty.R;
public class ShoppingCartFragment extends Fragment { public class ShoppingCartFragment extends Fragment {
@Nullable @Nullable

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 150 KiB

Before

Width:  |  Height:  |  Size: 681 B

After

Width:  |  Height:  |  Size: 681 B

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

@ -1,2 +0,0 @@
include ':app'
rootProject.name='OrangeSale_05'

@ -0,0 +1,116 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="XML">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme>
</component>

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
</component>
</project>

@ -4,7 +4,7 @@ android {
compileSdkVersion 30 compileSdkVersion 30
buildToolsVersion "30.0.2" buildToolsVersion "30.0.2"
defaultConfig { defaultConfig {
applicationId "com.example.orangesale_05" applicationId "com.example.Fruitparty"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30
versionCode 1 versionCode 1

@ -1,4 +1,4 @@
package com.example.orangesale_05; package com.example.Fruitparty;
import android.content.Context; import android.content.Context;

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.orangesale_05"> package="com.example.Fruitparty">
<application <application
android:allowBackup="true" android:allowBackup="true"
@ -9,17 +9,17 @@
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".MainActivity"> <activity android:name="com.example.Fruitparty.MainActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".activity.RegisterActivity"></activity> <activity android:name="com.example.Fruitparty.activity.RegisterActivity"></activity>
<activity android:name=".activity.UserActivity" /> <activity android:name="com.example.Fruitparty.activity.UserActivity" />
<activity android:name=".activity.CategoryActivity" /> <activity android:name="com.example.Fruitparty.activity.CategoryActivity" />
<activity android:name=".activity.IndexActivity" /> <activity android:name="com.example.Fruitparty.activity.IndexActivity" />
</application> </application>
</manifest> </manifest>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save