장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
9f7435f7 1 parent a64781e2

proto merging

Inline Side-by-side
Showing 6 changed files with 36 additions and 77 deletions
......@@ -16,12 +16,14 @@ class SplashActivity : AppCompatActivity() {
val editor: SharedPreferences.Editor = settings.edit()
editor.putBoolean("isFirst", true)
editor.commit()
Thread.sleep(2000)
val intent = Intent(this, WelcomeActivity::class.java)
startActivity(intent)
finish()
}
else
{
Thread.sleep(2000)
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
finish()
......

25.4 KB | W: | H:

30.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -11,60 +11,36 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_weight="1"
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="30dp"
android:layout_weight="1"
android:background="@drawable/profile_logo"
android:scaleType="centerCrop" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/textView11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="30dp"
android:gravity="center"
android:text="WELLO는 프로필을 기반으로 동작해요\n더 정확한 맞춤형 결과를 위해 프로필을 입력해주세요!" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<Button
android:id="@+id/inputStartButton"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="30dp"
android:background="@drawable/button_o"
android:gravity="center"
android:text="프로필 정보 입력하기"
android:textColor="#FFFFFF"
android:textSize="20dp" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......
......@@ -50,7 +50,7 @@
<androidx.viewpager.widget.ViewPager
android:id="@+id/welcomeViewPager"
android:layout_width="match_parent"
android:layout_height="262dp"
android:layout_height="280dp"
android:layout_gravity="top"
android:layout_weight="1"
android:elevation="-7dp">
......
......@@ -12,44 +12,35 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_weight="1"
android:orientation="vertical">
</LinearLayout>
<TextView
android:id="@+id/becomeFamilyTextView"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center|center_horizontal|center_vertical"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
android:gravity="center|center_horizontal|center_vertical"
android:text="Wello의 가족이 되어주세요 ^^"
android:text="Wello의 가족이 되어주세요"
android:textSize="30dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="10dp"
<ImageView
android:id="@+id/imageView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:orientation="vertical"></LinearLayout>
</LinearLayout>
android:background="@drawable/signup_logo"
tools:srcCompat="@tools:sample/avatars" />
<EditText
android:id="@+id/edit_email_sign_up"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:ems="10"
android:hint="Email"
android:inputType="textEmailAddress" />
......@@ -59,8 +50,10 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:ems="10"
android:hint="Password"
android:inputType="textPassword" />
......@@ -71,38 +64,26 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="16dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:background="@drawable/button_o"
android:gravity="center"
android:text="회원가입"
android:textColor="@color/common_google_signin_btn_text_dark_default" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_weight="1"
android:orientation="vertical"></LinearLayout>
<TextView
android:id="@+id/agreeTextView"
android:layout_width="200dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:layout_marginBottom="50dp"
android:gravity="center"
android:text="* 회원가입을 진행하실 경우, 서비스 이용약관, 개인 정보 취급 방침에 자동으로 동의하시게 됩니다." />
android:text="* 회원가입을 진행하실 경우, \n서비스 이용약관, 개인 정보 취급 방침에 \n자동으로 동의하시게 됩니다." />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_weight="1"
android:orientation="vertical"></LinearLayout>
</LinearLayout>
</LinearLayout>
......