Skip to content

Commit

Permalink
Merge pull request #25 from WonderWoman-Team/feature/17-post
Browse files Browse the repository at this point in the history
[Fix] build 에러 해결 및 gitignore 파일 수정
  • Loading branch information
seuriseuljjeok authored Aug 1, 2023
2 parents 4b57653 + 0de5856 commit 94605e2
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
.externalNativeBuild
.cxx
local.properties
*.json
*.pro
14 changes: 13 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,24 @@
android:supportsRtl="true"
android:theme="@style/Theme.WonderWoman"
tools:targetApi="31">
<activity android:name=".Main1Activity" android:exported="true">
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
</activity>
<activity android:name=".Main2Activity" android:exported="true"/>
<activity android:name=".LoginActivity" android:exported="true"/>
<activity android:name=".SchoolActivity" android:exported="true"/>
<activity android:name=".EmailActivity" android:exported="true"/>
<activity android:name=".PasswordActivity" android:exported="true"/>
<activity android:name=".NameActivity" android:exported="true"/>
<activity android:name=".CheckActivity" android:exported="true"/>
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand Down
23 changes: 23 additions & 0 deletions app/src/main/java/com/example/wonderwoman/EmailActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.example.wonderwoman

import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.example.wonderwoman.databinding.Login22MainBinding

class EmailActivity : AppCompatActivity() {
private var mBinding: Login22MainBinding? = null
private val binding get() = mBinding!!

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mBinding = Login22MainBinding.inflate(layoutInflater)
setContentView(binding.root)

//다음페이지
val intent = Intent(this, PasswordActivity::class.java)
binding.nextBtn2.setOnClickListener{startActivity(intent) }
//이전페이지
val intent2 = Intent(this, SchoolActivity::class.java)
binding.back2.setOnClickListener{startActivity(intent2) }
}}
File renamed without changes
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/go_out_btn.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:right="1dp"
android:top="1dp" />

<solid android:color="#25999999" />
<solid android:color="#10999999" />

<corners android:radius="20dp" />
</shape>
Expand All @@ -23,7 +23,7 @@
android:right="1dp"
android:top="1dp" />

<solid android:color="#40999999" />
<solid android:color="#30999999" />

<corners android:radius="20dp" />
</shape>
Expand All @@ -36,7 +36,7 @@
android:right="1dp"
android:top="1dp" />

<solid android:color="#70999999" />
<solid android:color="#50999999" />

<corners android:radius="20dp" />
</shape>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/list_check.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
android:drawable="@drawable/img"/>
<!-- 체크박스 선택 상태 -->
<item android:state_checked="true"
android:drawable="@drawable/check"/>
android:drawable="@drawable/checked"/>
</selector>
12 changes: 6 additions & 6 deletions app/src/main/res/layout/login5_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".">
tools:context=".CheckActivity">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -94,7 +94,7 @@
android:orientation="horizontal"
android:layout_marginLeft="15dp">

<com.umc.wonder.MultiLevelCheckBox
<com.example.wonderwoman.MultiLevelCheckBox
android:id="@+id/parent_checkbox"
android:layout_width="25dp"
android:layout_height="25dp"
Expand Down Expand Up @@ -127,7 +127,7 @@
android:layout_marginTop="5dp"
android:layout_marginLeft="15dp">

<com.umc.wonder.MultiLevelCheckBox
<com.example.wonderwoman.MultiLevelCheckBox
android:id="@+id/checkbox1"
android:layout_width="25dp"
android:layout_height="25dp"
Expand All @@ -152,7 +152,7 @@
android:layout_marginTop="5dp"
android:layout_marginLeft="15dp">

<com.umc.wonder.MultiLevelCheckBox
<com.example.wonderwoman.MultiLevelCheckBox
android:id="@+id/checkbox2"
android:layout_width="25dp"
android:layout_height="25dp"
Expand All @@ -177,7 +177,7 @@
android:layout_marginTop="5dp"
android:layout_marginLeft="15dp">

<com.umc.wonder.MultiLevelCheckBox
<com.example.wonderwoman.MultiLevelCheckBox
android:id="@+id/checkbox3"
android:layout_width="25dp"
android:layout_height="25dp"
Expand All @@ -203,7 +203,7 @@
android:layout_marginLeft="15dp"
android:layout_marginBottom="10dp">

<com.umc.wonder.MultiLevelCheckBox
<com.example.wonderwoman.MultiLevelCheckBox
android:id="@+id/checkbox4"
android:layout_width="25dp"
android:layout_height="25dp"
Expand Down

0 comments on commit 94605e2

Please sign in to comment.