장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
e14056d7 1 parent e453ce24

design doing

Inline Side-by-side
Showing 9 changed files with 78 additions and 27 deletions
......@@ -9,7 +9,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/NoActionBar">
<activity android:name=".PushingActivity"></activity>
<activity android:name=".OnboardingActivity"></activity>
<activity android:name=".PushingActivity" />
<activity android:name=".DetailActivity" />
<activity android:name=".InfoActivity" />
<activity android:name=".FavoritesActivity" />
......@@ -28,8 +29,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
\ No newline at end of file
......
package com.example.vip
import android.animation.Animator
import android.animation.AnimatorInflater
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.preference.PreferenceManager
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.Toast
import com.google.firebase.auth.FirebaseAuth
import kotlinx.android.synthetic.main.activity_main.*
import org.w3c.dom.Node
import java.lang.Boolean.getBoolean
class MainActivity : AppCompatActivity() {
......@@ -42,9 +50,9 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
emailSigninBtn.setOnClickListener{
loginEmail()
......@@ -55,7 +63,11 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
}
}
......
......@@ -29,42 +29,56 @@
</androidx.appcompat.widget.Toolbar>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="100dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:orientation="horizontal">
<ImageView
android:id="@+id/infoAccountImage"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:layout_weight="1"
tools:srcCompat="@tools:sample/avatars" />
<LinearLayout
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/InfoNickname"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="GRACE" />
<TextView
android:id="@+id/InfoEmail"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="grace@naver.com" />
<TextView
android:id="@+id/InfoProfilProgress"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="프로필정보입력15/20" />
......@@ -74,6 +88,7 @@
android:id="@+id/InfoProfilImage"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:layout_weight="1"
tools:srcCompat="@tools:sample/avatars" />
</LinearLayout>
......@@ -81,12 +96,16 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/InfoProfilModify"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="프로필 정보 수정" />
......@@ -94,12 +113,14 @@
android:id="@+id/InfoProgress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_gravity="center" />
<TextView
android:id="@+id/InfoExplain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="많이입력해야정확해요" />
......@@ -107,6 +128,7 @@
android:id="@+id/InfoStep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="STEP 15/20" />
</LinearLayout>
......@@ -114,30 +136,36 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/InfoButtonNotice"
android:id="@+id/InfoButtonApp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="공지사항" />
android:text="APP 정보" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/InfoButtonFAQ"
android:id="@+id/InfoButtonLaw"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="자주 묻는 질문" />
android:text="개인정보처리방침" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<Button
......@@ -150,25 +178,31 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/InfoButtonLaw"
android:id="@+id/InfoButtonFAQ"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="개인정보처리방침" />
android:text="자주 묻는 질문" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/InfoButtonApp"
android:id="@+id/InfoButtonNotice"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="APP 정보" />
android:text="공지사항" />
</LinearLayout>
</LinearLayout>
<FrameLayout
......
......@@ -69,4 +69,5 @@
android:layout_gravity="center"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......
......@@ -4,19 +4,25 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp">
android:layout_margin="3dp"
android:background="@drawable/edgemaking">
<ImageView
android:id="@+id/searchIcon"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"/>
android:layout_gravity="center"
android:layout_weight="0"
android:adjustViewBounds="true" />
<TextView
android:id="@+id/searchIconText"
android:layout_width="150dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"/>
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:textSize="20sp" />
</LinearLayout>
\ No newline at end of file
......
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">
<SearchView
android:id="@+id/searchForm"
......@@ -18,9 +18,8 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/searchRecyclerView"
android:layout_width="match_parent"
android:layout_height="340dp"
android:layout_height="wrap_content"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:spanCount="3"
app:layout_constraintBottom_toBottomOf="@id/bottomNavigation"
tools:listitem="@layout/item_search" />
</LinearLayout>
\ No newline at end of file
......