장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
95c6bddf 1 parent 85c061a5

button wrong word changing

Inline Side-by-side
Showing 28 changed files with 147 additions and 91 deletions
......@@ -126,6 +126,15 @@ class DetailActivity : AppCompatActivity() {
}
}
linkBtn.setOnClickListener {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(memo.Link))
startActivity(intent)
}
shareBtn.setOnClickListener {
}
bottomBar=supportActionBar!!
val r_bottomNavigation: BottomNavigationView =findViewById(R.id.rightBottomBVW)
val l_bottomNavigation: BottomNavigationView=findViewById(R.id.leftBottomBVW)
......
......@@ -182,6 +182,11 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
var intent = Intent(this, InputProfilThirdOneActivity::class.java)
startActivity(intent)
}
if(janyeoButton.isChecked==false&&brotherButton.isChecked==true){
var intent = Intent(this, InputProfilSecondThreeActivity::class.java)
startActivity(intent)
}
}
nothingButton.setOnClickListener {
......
......@@ -148,6 +148,7 @@ class InputProfilSecondThreeActivity : AppCompatActivity() {
val bsList = ArrayList<BSItem>()
bsNumberInputButton.setOnClickListener {
bsList.clear()
if(findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()>0){
var bsNum=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()
var cnt=1
......
......@@ -162,6 +162,7 @@ class InputProfilSecondTwoActivity : AppCompatActivity() {
val childList = ArrayList<ChildItem>()
childNumberInputButton.setOnClickListener {
childList.clear()
if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){
var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()
var cnt=1
......
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false" android:drawable="@drawable/detail_heart_x" />
<item android:state_checked="true" android:drawable="@drawable/detail_heart_o" />
<item android:state_checked="false" android:drawable="@drawable/heart_x" />
<item android:state_checked="true" android:drawable="@drawable/heart_o" />
</selector>
\ No newline at end of file
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="#00000000"
android:endColor="#33000000"
android:angle="270"/>
<!--android:centerY="0.95"-->
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false" android:drawable="@drawable/heart_stroke" />
<item android:state_checked="true" android:drawable="@drawable/heart_fill" />
<item android:state_checked="false" android:drawable="@drawable/heart_x" />
<item android:state_checked="true" android:drawable="@drawable/heart_o" />
</selector>
\ No newline at end of file
......
......@@ -24,6 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="11dp"
android:background="#FFF"
android:elevation="5dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
......@@ -39,7 +40,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:layout_marginBottom="5dp"
android:layout_weight="1"
android:background="@drawable/round_ratangle"
android:elevation="3dp"
......@@ -134,8 +135,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@drawable/gradation"
android:layout_height="3dp"
android:background="@drawable/gradation_for_shadow"
android:orientation="horizontal"></LinearLayout>
<FrameLayout
......@@ -157,29 +158,58 @@
android:gravity="center"
android:orientation="horizontal">
<ToggleButton
android:id="@+id/favorBtn"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginRight="50dp"
android:background="@drawable/detail_favor_selector"
android:textOff=" "
android:textOn=" " />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:gravity="center"
android:orientation="horizontal">
<ToggleButton
android:id="@+id/favorBtn"
android:layout_width="20dp"
android:layout_height="20dp"
android:background="@drawable/detail_favor_selector"
android:textOff=" "
android:textOn=" " />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/shareBtn"
android:layout_width="20dp"
android:layout_height="20dp"
android:background="@drawable/share_x"
android:textOff=" "
android:textOn=" " />
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/shareBtn"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="@drawable/share"
android:textOff=" "
android:textOn=" " />
android:id="@+id/linkBtn"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_weight="4"
android:background="@drawable/link_cut" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/leftBottomBVW"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="#FFF"
android:elevation="5dp"
android:visibility="gone"
app:itemIconTint="#DDDDDD"
......@@ -191,7 +221,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
android:orientation="horizontal"
android:visibility="gone">
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/rightBottomBVW"
......
......@@ -221,10 +221,10 @@
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:gravity="center"
android:text="피부양자(직장)"
android:text="피부양자\n(직장)"
android:textColor="#757575"
android:textOff="피부양자(직장)"
android:textOn="피부양자(직장)"
android:textOff="피부양자\n(직장)"
android:textOn="피부양자\n(직장)"
android:textSize="16dp" />
<ToggleButton
......@@ -234,10 +234,10 @@
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:gravity="center"
android:text="피부양자(지역)"
android:text="피부양자\n(지역)"
android:textColor="#757575"
android:textOff="피부양자(지역)"
android:textOn="피부양자(지역)"
android:textOff="피부양자\n(지역)"
android:textOn="피부양자\n(지역)"
android:textSize="16dp" />
</LinearLayout>
......@@ -256,10 +256,10 @@
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:gravity="center"
android:text="의료급여수급건자"
android:text="의료급여\n수급권자"
android:textColor="#757575"
android:textOff="의료급여수급건자"
android:textOn="의료급여수급건자"
android:textOff="의료급여\n수급권자"
android:textOn="의료급여\n수급권자"
android:textSize="16dp" />
<ToggleButton
......
......@@ -215,10 +215,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="일제강점기피해자"
android:text="일제강점기\n피해자"
android:textColor="#757575"
android:textOff="일제강점기피해자"
android:textOn="일제강점기피해자"
android:textOff="일제강점기\n피해자"
android:textOn="일제강점기\n피해자"
android:textSize="16dp" />
</LinearLayout>
......@@ -236,10 +236,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="특수상황피해자"
android:text="특수상황\n피해자"
android:textColor="#757575"
android:textOff="특수상황피해자"
android:textOn="특수상황피해자"
android:textOff="특수상황\n피해자"
android:textOn="특수상황\n피해자"
android:textSize="16dp" />
<ToggleButton
......@@ -249,10 +249,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="산업재해피해자/가족"
android:text="산업재해\n피해자/가족"
android:textColor="#757575"
android:textOff="산업재해피해자/가족"
android:textOn="산업재해피해자/가족"
android:textOff="산업재해\n피해자/가족"
android:textOn="산업재해\n피해자/가족"
android:textSize="16dp" />
</LinearLayout>
......@@ -269,13 +269,13 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="기타피해상황"
android:text="기타\n피해상황"
android:textColor="#757575"
android:textOff="기타피해상황"
android:textOn="기타피해상황"
android:textSize="16dp"
android:layout_margin="10dp" />
android:textOff="기타\n피해상황"
android:textOn="기타\n피해상황"
android:textSize="16dp" />
<ToggleButton
android:id="@+id/emptyButton"
......
......@@ -241,10 +241,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="가출/실종/사망"
android:text="가출\n/실종/사망"
android:textColor="#757575"
android:textOff="가출/실종/사망"
android:textOn="가출/실종/사망"
android:textOff="가출\n/실종/사망"
android:textOn="가출\n/실종/사망"
android:textSize="16dp" />
<ToggleButton
......@@ -301,10 +301,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="학교밖청소년"
android:text="학교 밖\n청소년"
android:textColor="#757575"
android:textOff="학교밖청소년"
android:textOn="학교밖청소년"
android:textOff="학교 밖\n청소년"
android:textOn="학교 밖\n청소년"
android:textSize="16dp" />
<ToggleButton
......
......@@ -358,10 +358,10 @@
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/circle_selector"
android:text="보장기관제공주거"
android:text="보장기관\n제공 주거"
android:textColor="#757575"
android:textOff="보장기관제공주거"
android:textOn="보장기관제공주거"
android:textOff="보장기관\n제공 주거"
android:textOn="보장기관\n제공 주거"
android:textSize="16dp" />
<ToggleButton
......
......@@ -355,10 +355,10 @@
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/circle_selector"
android:text="보장기관제공주거"
android:text="보장기관\n제공 주거"
android:textColor="#757575"
android:textOff="보장기관제공주거"
android:textOn="보장기관제공주거"
android:textOff="보장기관\n제공 주거"
android:textOn="보장기관\n제공 주거"
android:textSize="16dp" />
<ToggleButton
......
......@@ -231,10 +231,10 @@
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/circle_selector"
android:text="배우자의조부모"
android:text="배우자의\n조부모"
android:textColor="#757575"
android:textOff="배우자의조부모"
android:textOn="배우자의조부모" />
android:textOff="배우자의\n조부모"
android:textOn="배우자의\n조부모" />
</LinearLayout>
......
......@@ -215,10 +215,10 @@
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/circle_selector"
android:text="임신및출산(예정)"
android:text="임신 및 출산\n(예정)"
android:textColor="#757575"
android:textOff="임신및출산(예정)"
android:textOn="임신및출산(예정)"
android:textOff="임신 및 출산\n(예정)"
android:textOn="임신 및 출산\n(예정)"
android:textSize="16dp" />
</LinearLayout>
......@@ -236,11 +236,11 @@
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/circle_selector"
android:text="희귀난치성및중증질환"
android:text="희귀난치성\n및\n중증질환"
android:textColor="#757575"
android:textOff="희귀난치성및중증질환"
android:textOn="희귀난치성및중증질환"
android:textSize="16dp" />
android:textOff="희귀난치성\n및\n중증질환"
android:textOn="희귀난치성\n및\n중증질환"
android:textSize="12dp" />
<ToggleButton
android:id="@+id/oeButton"
......@@ -250,10 +250,10 @@
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/circle_selector"
android:text="중증질환외질병"
android:text="중증질환 외\n질병"
android:textColor="#757575"
android:textOff="중증질환외질병"
android:textOn="중증질환외질병"
android:textOff="중증질환 외\n질병"
android:textOn="중증질환 외\n질병"
android:textSize="16dp" />
</LinearLayout>
......@@ -274,7 +274,7 @@
android:textColor="#757575"
android:textOff="(장기)요양환자"
android:textOn="(장기)요양환자"
android:textSize="16dp" />
android:textSize="14dp" />
<ToggleButton
android:id="@+id/guitarButton"
......
......@@ -250,10 +250,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="복무중(현역병)"
android:text="복무중\n(현역병)"
android:textColor="#757575"
android:textOff="복무중(현역병)"
android:textOn="복무중(현역병)" />
android:textOff="복무중\n(현역병)"
android:textOn="복무중\n(현역병)" />
<ToggleButton
android:id="@+id/mangijedaeButton"
......@@ -262,10 +262,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="만기제대"
android:text="만기 제대"
android:textColor="#757575"
android:textOff="만기제대"
android:textOn="만기제대" />
android:textOff="만기 제대"
android:textOn="만기 제대" />
</LinearLayout>
......@@ -281,10 +281,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="병역특례(복무만료)"
android:text="병역특례\n(복무만료)"
android:textColor="#757575"
android:textOff="병역특례(복무만료)"
android:textOn="병역특례(복무만료)" />
android:textOff="병역특례\n(복무만료)"
android:textOn="병역특례\n(복무만료)" />
<ToggleButton
android:id="@+id/specialbokmoosanupButton"
......@@ -293,10 +293,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="병역특례(산업복무중)"
android:text="병역특례\n(산업복무중)"
android:textColor="#757575"
android:textOff="병역특례(산업복무중)"
android:textOn="병역특례(산업복무중)" />
android:textOff="병역특례\n(산업복무중)"
android:textOn="병역특례\n(산업복무중)" />
<ToggleButton
android:id="@+id/specialbokmoojeonmoonButton"
......@@ -305,10 +305,10 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:background="@drawable/circle_selector"
android:text="병역특례(전문복무중)"
android:text="병역특례\n(전문복무중)"
android:textColor="#757575"
android:textOff="병역특례(전문복무중)"
android:textOn="병역특례(전문복무중)" />
android:textOff="병역특례\n(전문복무중)"
android:textOn="병역특례\n(전문복무중)" />
</LinearLayout>
<LinearLayout
......
......@@ -4,25 +4,25 @@
<item
android:id="@+id/bottomHome"
android:enabled="true"
android:icon="@drawable/home"
android:icon="@drawable/bottom_home"
android:title="WELLO"
app:showAsAction="ifRoom" />
<item
android:id="@+id/bottomRecommend"
android:enabled="true"
android:icon="@drawable/wish"
android:icon="@drawable/bottom_recommend"
android:title="추천정책"
app:showAsAction="ifRoom" />
<item
android:id="@+id/bottomFavorites"
android:enabled="true"
android:icon="@drawable/instagram"
android:icon="@drawable/bottom_favor"
android:title="찜한목록"
app:showAsAction="ifRoom" />
<item
android:id="@+id/bottomInfo"
android:enabled="true"
android:icon="@drawable/info"
android:icon="@drawable/bottom_info"
android:title="내 정보"
app:showAsAction="ifRoom" />
</menu>
\ No newline at end of file
......