diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index b3405b3..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -My Application \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.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 d9a6163..1263070 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,23 +6,20 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@drawable/ic_launcher_foreground" + android:icon="@mipmap/ic_app" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/Theme.MyApplication" tools:targetApi="31"> + - - \ No newline at end of file diff --git a/app/src/main/ic_app-playstore.png b/app/src/main/ic_app-playstore.png new file mode 100644 index 0000000..69cdd42 Binary files /dev/null and b/app/src/main/ic_app-playstore.png differ diff --git a/app/src/main/ic_applauncher-playstore.png b/app/src/main/ic_applauncher-playstore.png new file mode 100644 index 0000000..18e0f4a Binary files /dev/null and b/app/src/main/ic_applauncher-playstore.png differ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..18e0f4a Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/example/myapplication/LoginMenuActivity.java b/app/src/main/java/cc/liuyx/app/LoginMenuActivity.java similarity index 51% rename from app/src/main/java/com/example/myapplication/LoginMenuActivity.java rename to app/src/main/java/cc/liuyx/app/LoginMenuActivity.java index 75dd181..d128d2e 100644 --- a/app/src/main/java/com/example/myapplication/LoginMenuActivity.java +++ b/app/src/main/java/cc/liuyx/app/LoginMenuActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package cc.liuyx.app; import androidx.appcompat.app.AppCompatActivity; @@ -7,6 +7,8 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; +import com.example.myapplication.R; + public class LoginMenuActivity extends AppCompatActivity { @Override @@ -14,12 +16,12 @@ public class LoginMenuActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_login_menu); - Button loginBtn = findViewById(R.id.btn_login); - loginBtn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - startActivity(new Intent(LoginMenuActivity.this, RegisterActivity.class)); - } - }); +// Button loginBtn = findViewById(R.id.btn_login); +// loginBtn.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// startActivity(new Intent(LoginMenuActivity.this, RegisterActivity.class)); +// } +// }); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/MainActivity2.java b/app/src/main/java/com/example/myapplication/MainActivity2.java deleted file mode 100644 index 52b8c22..0000000 --- a/app/src/main/java/com/example/myapplication/MainActivity2.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.myapplication; - -import android.os.Bundle; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; - -public class MainActivity2 extends AppCompatActivity { - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_register); - } -} diff --git a/app/src/main/java/com/example/myapplication/RegisterActivity.java b/app/src/main/java/com/example/myapplication/RegisterActivity.java deleted file mode 100644 index da85559..0000000 --- a/app/src/main/java/com/example/myapplication/RegisterActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.myapplication; - -import androidx.appcompat.app.AppCompatActivity; - -import android.os.Bundle; - -public class RegisterActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_register); - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/input_sharp.xml b/app/src/main/res/drawable/input_sharp.xml new file mode 100644 index 0000000..1bd4ef9 --- /dev/null +++ b/app/src/main/res/drawable/input_sharp.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login_menu.xml b/app/src/main/res/layout/activity_login_menu.xml index 7f2d555..baea6fd 100644 --- a/app/src/main/res/layout/activity_login_menu.xml +++ b/app/src/main/res/layout/activity_login_menu.xml @@ -1,44 +1,70 @@ - + android:orientation="vertical" + android:background="#FAF9FA"> + + + android:gravity="center" + android:textSize="15sp" + android:hint="请输入用户名" + android:inputType="textPersonName" + android:background="@drawable/input_sharp" + android:layout_margin="10dp"/> + android:gravity="center" + android:textSize="15sp" + android:hint="请输入密码" + android:inputType="textPassword" + android:background="@drawable/input_sharp" + android:layout_margin="10dp" />