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 @@ + - + android:text="" + android:textSize="25sp" /> + + + +