신기성 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
soonmyeong2
b25a41ff 1 parent ba873ed5

back up stage file

Expand all
Inline Side-by-side
Showing 29 changed files with 183 additions and 29 deletions
......@@ -31,6 +31,7 @@
<activity android:name=".InputProfilFirstThreeActivity" />
<activity android:name=".InputProfilFirstTwoActivity" />
<activity android:name=".InputProfilFirstOneActivity" />
<activity android:name=".AccountSettingActivity"/>
<activity android:name=".PrivacyPolicyActivity"/>
<activity android:name=".TermsOfUserActivity"/>
<activity android:name=".NoticeActivity"/>
......
package com.example.vip
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
class AccountSettingActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_account_settings)
}
}
\ No newline at end of file
......@@ -77,7 +77,7 @@ class DetailActivity : AppCompatActivity() {
detailDday.text=memo!!.Date
detailTitle.text=memo!!.Policy
detailScore.rating=4.toFloat()
detailFavor.text="0"
detailFavor.text=" [실행 부처]"
val web : WebView = findViewById(R.id.policy_context)
val summary : String = memo!!.Content
......
......@@ -66,10 +66,12 @@ class SearchActivity : AppCompatActivity() {
}
override fun onDataChange(dataSnapshot: DataSnapshot) {
if (dataSnapshot.exists() == false){ // 값 없을 때
policy_scroll_view.setVisibility(View.GONE)
no_search.setVisibility(View.VISIBLE)
}
else {
no_search.setVisibility(View.GONE)
policy_scroll_view.setVisibility(View.VISIBLE)
}
for (memoSnapshot in dataSnapshot.children){
......
......@@ -11,6 +11,10 @@ class SettingsInForm : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_settings_in_form)
accountBtn.setOnClickListener {
var intent = Intent(this, AccountSettingActivity::class.java)
startActivity(intent)
}
info_push.setOnClickListener {
var intent = Intent(this, PushInfoActivity::class.java)
......
......@@ -12,6 +12,6 @@
android:bottom="0dp"
/>
<corners android:bottomRightRadius="22dp" android:bottomLeftRadius="0dp"
<corners android:bottomRightRadius="13dp" android:bottomLeftRadius="0dp"
android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
</shape>
\ No newline at end of file
......
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFF"/>
<stroke android:width="1dp"
android:color="#E6E6E6"
/>
<padding android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
/>
<corners android:bottomRightRadius="13dp" android:bottomLeftRadius="13dp"
android:topLeftRadius="13dp" android:topRightRadius="13dp"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFF"/>
<stroke android:width="0dp"
android:color="#FFF"
/>
<padding android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
/>
<corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
android:topLeftRadius="13dp" android:topRightRadius="13dp"/>
</shape>
\ No newline at end of file
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="11dp"
android:background="#FFF"
android:elevation="5dp"
android:gravity="center"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<TextView
android:layout_width="77dp"
android:layout_height="44dp"
android:layout_gravity="center"
android:gravity="center"
android:text="계정 설정"
android:textColor="#000"
android:textSize="16dp" />
</androidx.appcompat.widget.Toolbar>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#fff"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"></LinearLayout>
<Button
android:id="@+id/button"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_marginLeft="11dp"
android:layout_marginRight="11dp"
android:background="@drawable/bottom_border"
android:gravity="left|center_vertical"
android:paddingLeft="33dp"
android:text="정보 수정 (준비중)"
android:textSize="17dp" />
<Button
android:id="@+id/info_push"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_marginLeft="11dp"
android:layout_marginRight="11dp"
android:background="@drawable/bottom_border"
android:gravity="left|center_vertical"
android:paddingLeft="33dp"
android:text="로그아웃 (준비중)"
android:textSize="17dp" />
<Button
android:id="@+id/terms_of_use"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_marginLeft="11dp"
android:layout_marginRight="11dp"
android:background="@drawable/bottom_border"
android:gravity="left|center_vertical"
android:paddingLeft="33dp"
android:text="회원 탈퇴 (준비중)"
android:textSize="17dp" />
</LinearLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomNavigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="#FFF"
app:itemIconTint="#29ABE2"
app:itemTextColor="#29ABE2"
app:labelVisibilityMode="labeled"
app:menu="@menu/bottom_nav_menu" />
</LinearLayout>
\ No newline at end of file
......@@ -37,13 +37,13 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_weight="1"
android:elevation="5dp"
android:fillViewport="true">
android:background="@drawable/round_ratangle"
android:elevation="3dp"
android:fillViewport="true"
android:padding="7dp">
<LinearLayout
android:layout_width="match_parent"
......@@ -55,18 +55,20 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:background="@drawable/round_ratangle"
android:elevation="5dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/image03" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="7dp"
android:orientation="vertical">
<TextView
android:id="@+id/policyDdayDetail"
android:layout_width="77dp"
android:layout_height="44dp"
android:layout_height="39dp"
android:background="@drawable/broken_rectangle"
android:gravity="center"
android:text="TextView"
......@@ -74,24 +76,33 @@
android:textSize="18sp" />
<TextView
android:id="@+id/policyFavorDetail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="TextView" />
<TextView
android:id="@+id/policyTitleDetail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="11dp"
android:layout_marginBottom="5dp"
android:layout_marginBottom="4dp"
android:text="Textw"
android:textSize="30sp" />
<RatingBar
android:id="@+id/policyScoreDetail"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/policyFavorDetail"
style="?android:attr/ratingBarStyleIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView" />
android:layout_marginLeft="11dp"
android:max="5"
android:rating="3.5"
android:scaleX=".5"
android:scaleY="0.5"
android:transformPivotX="0dp"
android:transformPivotY="0dp" />
<WebView
android:id="@+id/policy_context"
......@@ -105,6 +116,7 @@
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp"
app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout
......@@ -116,7 +128,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1.3"
android:layout_weight="1.2"
android:orientation="horizontal">
<com.google.android.material.bottomnavigation.BottomNavigationView
......@@ -125,6 +137,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="#FFF"
android:elevation="5dp"
app:itemIconTint="#DDDDDD"
app:labelVisibilityMode="unlabeled"
app:menu="@menu/detailpage_navigation" />
......@@ -141,7 +154,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/link1"
android:background="@drawable/link2"
android:elevation="5dp"
app:itemIconTint="#FFF"
app:itemTextColor="#FFF"
app:labelVisibilityMode="unlabeled"
......
......@@ -40,7 +40,7 @@
android:orientation="vertical"></LinearLayout>
<Button
android:id="@+id/button"
android:id="@+id/accountBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="65dp"
......@@ -49,7 +49,7 @@
android:background="@drawable/bottom_border"
android:gravity="left|center_vertical"
android:paddingLeft="33dp"
android:text="계정 설정 (미구현)"
android:text="계정 설정"
android:textSize="17dp" />
<Button
......@@ -67,16 +67,16 @@
<Button
android:id="@+id/button3"
android:textSize="17dp"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_marginLeft="11dp"
android:layout_marginRight="11dp"
android:layout_height="65dp"
android:gravity="left|center_vertical"
android:background="@drawable/bottom_border"
android:gravity="left|center_vertical"
android:paddingLeft="33dp"
android:text="접근권한 설정 (미구현)" />
android:text="접근권한 설정 (준비중)"
android:textSize="17dp" />
<Button
android:id="@+id/terms_of_use"
......
......@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_margin="10dp"
android:background="@drawable/edgemaking"
android:background="@drawable/round_ractagle_solid"
android:orientation="horizontal"
android:padding="10dp">
......
This diff is collapsed. Click to expand it.
......@@ -6,8 +6,7 @@
<item
android:id="@+id/linkBtn"
android:enabled="true"
android:icon="@drawable/link1"
android:title="사이트 바로가기"
android:title=""
app:showAsAction="ifRoom" />
</menu>
......