diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0c79abc..ac39376 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -28,11 +28,14 @@
+
+
+
-
+
-
+
@@ -46,6 +49,7 @@
+
diff --git a/app/src/debug/ic_launcher-playstore.png b/app/src/debug/ic_launcher-playstore.png
new file mode 100644
index 0000000..56ee9e6
Binary files /dev/null and b/app/src/debug/ic_launcher-playstore.png differ
diff --git a/app/src/debug/ic_logo-playstore.png b/app/src/debug/ic_logo-playstore.png
new file mode 100644
index 0000000..56ee9e6
Binary files /dev/null and b/app/src/debug/ic_logo-playstore.png differ
diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/app/src/debug/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..ca3826a
--- /dev/null
+++ b/app/src/debug/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/debug/res/drawable/ic_logo_background.xml b/app/src/debug/res/drawable/ic_logo_background.xml
new file mode 100644
index 0000000..ca3826a
--- /dev/null
+++ b/app/src/debug/res/drawable/ic_logo_background.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..c4a603d
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..c4a603d
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_logo.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_logo.xml
new file mode 100644
index 0000000..0147326
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_logo.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_logo_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_logo_round.xml
new file mode 100644
index 0000000..0147326
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_logo_round.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..c8df8cb
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..51beea7
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..9de598d
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_logo.png b/app/src/debug/res/mipmap-hdpi/ic_logo.png
new file mode 100644
index 0000000..c8df8cb
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_logo.png differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_logo_foreground.png b/app/src/debug/res/mipmap-hdpi/ic_logo_foreground.png
new file mode 100644
index 0000000..51beea7
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_logo_foreground.png differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_logo_round.png b/app/src/debug/res/mipmap-hdpi/ic_logo_round.png
new file mode 100644
index 0000000..9de598d
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_logo_round.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..0e39682
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..fb55e61
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..78ee856
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_logo.png b/app/src/debug/res/mipmap-mdpi/ic_logo.png
new file mode 100644
index 0000000..0e39682
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_logo.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_logo_foreground.png b/app/src/debug/res/mipmap-mdpi/ic_logo_foreground.png
new file mode 100644
index 0000000..fb55e61
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_logo_foreground.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_logo_round.png b/app/src/debug/res/mipmap-mdpi/ic_logo_round.png
new file mode 100644
index 0000000..78ee856
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_logo_round.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..7c9efcb
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c8cdd83
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..e25ec89
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_logo.png b/app/src/debug/res/mipmap-xhdpi/ic_logo.png
new file mode 100644
index 0000000..7c9efcb
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_logo.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_logo_foreground.png b/app/src/debug/res/mipmap-xhdpi/ic_logo_foreground.png
new file mode 100644
index 0000000..c8cdd83
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_logo_foreground.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_logo_round.png b/app/src/debug/res/mipmap-xhdpi/ic_logo_round.png
new file mode 100644
index 0000000..e25ec89
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_logo_round.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..1719610
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..358ab47
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..12f6578
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_logo.png b/app/src/debug/res/mipmap-xxhdpi/ic_logo.png
new file mode 100644
index 0000000..1719610
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_logo.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_logo_foreground.png b/app/src/debug/res/mipmap-xxhdpi/ic_logo_foreground.png
new file mode 100644
index 0000000..358ab47
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_logo_foreground.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_logo_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_logo_round.png
new file mode 100644
index 0000000..12f6578
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_logo_round.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..5416959
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..7278caf
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1efd759
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_logo.png b/app/src/debug/res/mipmap-xxxhdpi/ic_logo.png
new file mode 100644
index 0000000..5416959
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_logo.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_logo_foreground.png b/app/src/debug/res/mipmap-xxxhdpi/ic_logo_foreground.png
new file mode 100644
index 0000000..7278caf
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_logo_foreground.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_logo_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_logo_round.png
new file mode 100644
index 0000000..1efd759
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_logo_round.png differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4572349..6baedcf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,9 +14,9 @@
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
- android:icon="@mipmap/ic_launcher"
- android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
+ android:icon="@mipmap/ic_logo"
+ android:label="너나묵자"
+ android:roundIcon="@mipmap/ic_logo_round"
android:supportsRtl="true"
android:theme="@style/Theme.realnona2"
android:usesCleartextTraffic="true"
diff --git a/app/src/main/java/com/example/realnona2/F_F_Login_form_Activity.java b/app/src/main/java/com/example/realnona2/F_F_Login_form_Activity.java
index ee52484..28ff314 100644
--- a/app/src/main/java/com/example/realnona2/F_F_Login_form_Activity.java
+++ b/app/src/main/java/com/example/realnona2/F_F_Login_form_Activity.java
@@ -68,6 +68,12 @@ public void onResponse(String response) {
String UserClass = jsonObject.getString( "UserClass" );
String UserSex = jsonObject.getString( "UserSex" );
+ Loginsave.setString(mContext,"UserNum",UserNum);
+ Loginsave.setString(mContext,"UserName",UserName);
+ Loginsave.setString(mContext,"UserClass",UserClass);
+ Loginsave.setString(mContext,"UserSex",UserSex);
+
+
Toast.makeText( getApplicationContext(), String.format("%s님 환영합니다.", UserName), Toast.LENGTH_SHORT ).show();
Intent intent = new Intent( F_F_Login_form_Activity.this, F_F_main_form_Activity.class );
diff --git a/app/src/main/java/com/example/realnona2/test_userActivity.java b/app/src/main/java/com/example/realnona2/test_userActivity.java
index 23c91db..e4b556e 100644
--- a/app/src/main/java/com/example/realnona2/test_userActivity.java
+++ b/app/src/main/java/com/example/realnona2/test_userActivity.java
@@ -15,10 +15,6 @@ public class test_userActivity extends AppCompatActivity {
private Button Logout,testbtn;
private Context mContext;
-
- /*회원가입 페이지로 정보 보낼려면 겟셋 두번 하기 or 한번에 보내주는 법 찾기 */
-
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -30,32 +26,30 @@ protected void onCreate(Bundle savedInstanceState) {
UserinfoSex = findViewById(R.id.UserinfoSex);
testbtn= findViewById(R.id.testbtn);
mContext = this;
-
Logout = findViewById(R.id.Logout);
- Intent intent = getIntent();
- final String data1 = intent.getStringExtra("UserNum");
- final String data2 = intent.getStringExtra("UserName");
- final String data3 = intent.getStringExtra("UserClass");
- final String data4 = intent.getStringExtra("UserSex");
+
+ String Userdata1 = Loginsave.getString(mContext,"UserNum");
+ String Userdata2 = Loginsave.getString(mContext,"UserName");
+ String Userdata3 = Loginsave.getString(mContext,"UserClass");
+ String Userdata4 = Loginsave.getString(mContext,"UserSex");
+
+ UserinfoNum.setText(Userdata1);
+ UserinfoName.setText(Userdata2);
+ UserinfoClass.setText(Userdata3);
+ UserinfoSex.setText(Userdata4);
testbtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- UserinfoNum.setText(data1);
- UserinfoName.setText(data2);
- UserinfoClass.setText(data3);
- UserinfoSex.setText(data4);
+ /*회원탈퇴 들어갈 부분*/
}
});
- UserinfoNum.setText(data1);
- UserinfoName.setText(data2);
- UserinfoClass.setText(data3);
- UserinfoSex.setText(data4);
+ //로그아웃 버튼
Logout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git a/app/src/main/res/drawable-v24/backcir2.png b/app/src/main/res/drawable-v24/backcir2.png
new file mode 100644
index 0000000..e6240fe
Binary files /dev/null and b/app/src/main/res/drawable-v24/backcir2.png differ
diff --git a/app/src/main/res/drawable-v24/load.png b/app/src/main/res/drawable-v24/load.png
new file mode 100644
index 0000000..e5c225c
Binary files /dev/null and b/app/src/main/res/drawable-v24/load.png differ
diff --git a/app/src/main/res/drawable-v24/load2.png b/app/src/main/res/drawable-v24/load2.png
new file mode 100644
index 0000000..24e7de7
Binary files /dev/null and b/app/src/main/res/drawable-v24/load2.png differ
diff --git a/app/src/main/res/drawable-v24/purpleuser.png b/app/src/main/res/drawable-v24/purpleuser.png
new file mode 100644
index 0000000..98a8812
Binary files /dev/null and b/app/src/main/res/drawable-v24/purpleuser.png differ
diff --git a/app/src/main/res/drawable/l_f_round_adg_purple.xml b/app/src/main/res/drawable/l_f_round_adg_purple.xml
index 4321df9..ed9cbbf 100644
--- a/app/src/main/res/drawable/l_f_round_adg_purple.xml
+++ b/app/src/main/res/drawable/l_f_round_adg_purple.xml
@@ -2,9 +2,9 @@
-
-
-
-
+
+
+
diff --git a/app/src/main/res/drawable/l_f_round_adg_purple2.xml b/app/src/main/res/drawable/l_f_round_adg_purple2.xml
new file mode 100644
index 0000000..57e864e
--- /dev/null
+++ b/app/src/main/res/drawable/l_f_round_adg_purple2.xml
@@ -0,0 +1,10 @@
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/load.png b/app/src/main/res/drawable/load.png
deleted file mode 100644
index de4159c..0000000
Binary files a/app/src/main/res/drawable/load.png and /dev/null differ
diff --git a/app/src/main/res/layout/f_f_activity_login.xml b/app/src/main/res/layout/f_f_activity_login.xml
index e5ffc56..6305256 100644
--- a/app/src/main/res/layout/f_f_activity_login.xml
+++ b/app/src/main/res/layout/f_f_activity_login.xml
@@ -9,24 +9,29 @@
+ app:layout_constraintStart_toStartOf="@+id/login_password"
+ />
+
-
+ app:layout_constraintHorizontal_bias="0.497"
+ app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/f_f_activity_main.xml b/app/src/main/res/layout/f_f_activity_main.xml
index 85d114e..b828188 100644
--- a/app/src/main/res/layout/f_f_activity_main.xml
+++ b/app/src/main/res/layout/f_f_activity_main.xml
@@ -6,7 +6,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".F_F_main_form_Activity"
- android:background="#b09cdd">
+ >
+
+
@@ -29,7 +31,7 @@
android:gravity="center"
android:fontFamily="@font/l_f_binggraebold"
android:text="너나묵자"
- android:textColor="@color/purple_200"
+ android:textColor="@color/white"
android:textSize="35sp"
android:transitionName="L_V_share_txTransition" />
@@ -45,7 +47,7 @@
android:gravity="center"
android:text="같이묵자"
- android:textColor="@color/purple_200"
+ android:textColor="@color/white"
android:textSize="35sp"
android:transitionName="L_V_with_txTransition" />
@@ -57,7 +59,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="15sp"
- android:backgroundTint="#F783DAD6"
+ android:backgroundTint="#9370db"
android:src="@drawable/l_f_icon_add"
/>
diff --git a/app/src/main/res/layout/f_f_activity_signup.xml b/app/src/main/res/layout/f_f_activity_signup.xml
index f239355..8b9ff39 100644
--- a/app/src/main/res/layout/f_f_activity_signup.xml
+++ b/app/src/main/res/layout/f_f_activity_signup.xml
@@ -10,12 +10,12 @@
+ android:gravity="center"
+ >
+
+
+
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:orientation="horizontal"
+ android:gravity="center">
+ android:hint="학번" />
+ android:backgroundTint="#9370db"
+ android:textColor="@android:color/white" />
-
-
+ android:hint="과" />
+
+ android:hint="성별" />
+ android:textColor="@android:color/white" />
+ android:backgroundTint="#9370db"
+ android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/l_f_decorate_share_form.xml b/app/src/main/res/layout/l_f_decorate_share_form.xml
index 8dbdc9c..70885f4 100644
--- a/app/src/main/res/layout/l_f_decorate_share_form.xml
+++ b/app/src/main/res/layout/l_f_decorate_share_form.xml
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="15sp"
- android:backgroundTint="#F783DAD6"
+ android:backgroundTint="#9370db"
android:src="@drawable/l_f_icon_add"
/>
diff --git a/app/src/main/res/layout/l_f_decorate_with_form.xml b/app/src/main/res/layout/l_f_decorate_with_form.xml
index c02666a..0ee699c 100644
--- a/app/src/main/res/layout/l_f_decorate_with_form.xml
+++ b/app/src/main/res/layout/l_f_decorate_with_form.xml
@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".F_F_main_form_Activity">
+ tools:context=".F_F_main_form_Activity"
+ >
@@ -33,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="15sp"
- android:backgroundTint="#F783DAD6"
+ app:backgroundTint="#9370db"
android:src="@drawable/l_f_icon_add"
/>
diff --git a/app/src/main/res/layout/l_f_toolbar_share.xml b/app/src/main/res/layout/l_f_toolbar_share.xml
index 635ccfd..ffd265c 100644
--- a/app/src/main/res/layout/l_f_toolbar_share.xml
+++ b/app/src/main/res/layout/l_f_toolbar_share.xml
@@ -7,7 +7,7 @@
app:title="."
android:elevation="30dp"
app:titleTextColor="#00FFFFFF"
- android:background="#9370db"
+ android:background="@drawable/l_f_round_adg_purple2"
app:menu="@menu/l_f_menu_toolbar">
diff --git a/app/src/main/res/layout/l_f_toolbar_with.xml b/app/src/main/res/layout/l_f_toolbar_with.xml
index c629833..15ffccb 100644
--- a/app/src/main/res/layout/l_f_toolbar_with.xml
+++ b/app/src/main/res/layout/l_f_toolbar_with.xml
@@ -6,7 +6,7 @@
android:id="@+id/toolbar"
app:title="."
app:titleTextColor="#00FFFFFF"
- android:background="#8b00ff"
+ android:background="@drawable/l_f_round_adg_purple2"
android:elevation="30dp"
app:menu="@menu/l_f_menu_toolbar">
diff --git a/app/src/main/res/layout/test_activity_user.xml b/app/src/main/res/layout/test_activity_user.xml
index c739a50..21171b7 100644
--- a/app/src/main/res/layout/test_activity_user.xml
+++ b/app/src/main/res/layout/test_activity_user.xml
@@ -5,117 +5,87 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".test_userActivity"
- android:orientation="vertical">
+ android:background="#9370db"
+ android:orientation="vertical"
+ >
+ android:layout_width="300dp"
+ android:layout_height="450dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="130dp"
+ android:background="@drawable/l_f_round_adg_white"
+ android:orientation="vertical">
-
-
+ android:layout_marginTop="100dp"
+ android:layout_gravity="center"
+ android:orientation="horizontal">
+ android:textSize="20sp" />
-
-
-
-
-
-
+
-
-
-
-
-
-
+ android:layout_margin="10dp"
+ android:layout_gravity="center"
+ android:orientation="horizontal">
-
+
+
+
+ android:layout_margin="10dp"
+ android:layout_gravity="center"
+ android:orientation="horizontal">
+ android:gravity="center"
+ android:text="학과 : "
+ android:textSize="20sp" />
@@ -125,40 +95,61 @@
-
-
-
-
-
-
+
-
+ android:text=""
+ android:textSize="25sp" />
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/test_activity_user2.xml b/app/src/main/res/layout/test_activity_user2.xml
new file mode 100644
index 0000000..1d20374
--- /dev/null
+++ b/app/src/main/res/layout/test_activity_user2.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/l_f_menu_toolbar.xml b/app/src/main/res/menu/l_f_menu_toolbar.xml
index 0f48abe..5e95bec 100644
--- a/app/src/main/res/menu/l_f_menu_toolbar.xml
+++ b/app/src/main/res/menu/l_f_menu_toolbar.xml
@@ -8,7 +8,8 @@
android:enabled="true"
android:title="메뉴1"
android:icon="@drawable/l_f_icon_home"
- app:showAsAction="always"/>
+ app:showAsAction="always"
+ />
-
\ No newline at end of file