From 3d624b126b4e14fcfcea6b6271d16af48d783334 Mon Sep 17 00:00:00 2001
From: Jinhak Wee <wlsgkr91@gmail.com>
Date: Fri, 13 Apr 2018 14:59:33 +0900
Subject: [PATCH] =?UTF-8?q?model,ui=20=EC=B6=94=EA=B0=80,=20layout=20?=
=?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../opensource_projectapp/model/ChatModel.kt | 7 ++
.../model/OnDataChanged.kt | 7 ++
.../model/OnUploadImage.kt | 7 ++
.../opensource_projectapp/model/UserModel.kt | 7 ++
.../opensource_projectapp/ui/LoginActivity.kt | 7 ++
app/src/main/res/layout/activity_login.xml | 67 +++++++++++++++++++
app/src/main/res/layout/activity_main.xml | 61 ++++++++++++++---
.../main/res/layout/recycler_item_chat.xml | 19 ++++++
8 files changed, 171 insertions(+), 11 deletions(-)
create mode 100644 app/src/main/java/com/cc/wee/opensource_projectapp/model/ChatModel.kt
create mode 100644 app/src/main/java/com/cc/wee/opensource_projectapp/model/OnDataChanged.kt
create mode 100644 app/src/main/java/com/cc/wee/opensource_projectapp/model/OnUploadImage.kt
create mode 100644 app/src/main/java/com/cc/wee/opensource_projectapp/model/UserModel.kt
create mode 100644 app/src/main/java/com/cc/wee/opensource_projectapp/ui/LoginActivity.kt
create mode 100755 app/src/main/res/layout/activity_login.xml
mode change 100644 => 100755 app/src/main/res/layout/activity_main.xml
create mode 100755 app/src/main/res/layout/recycler_item_chat.xml
diff --git a/app/src/main/java/com/cc/wee/opensource_projectapp/model/ChatModel.kt b/app/src/main/java/com/cc/wee/opensource_projectapp/model/ChatModel.kt
new file mode 100644
index 0000000..7a74713
--- /dev/null
+++ b/app/src/main/java/com/cc/wee/opensource_projectapp/model/ChatModel.kt
@@ -0,0 +1,7 @@
+package com.cc.wee.opensource_projectapp.model
+
+/**
+ * Created by wee on 2018. 4. 13..
+ */
+class ChatModel {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cc/wee/opensource_projectapp/model/OnDataChanged.kt b/app/src/main/java/com/cc/wee/opensource_projectapp/model/OnDataChanged.kt
new file mode 100644
index 0000000..1a8435f
--- /dev/null
+++ b/app/src/main/java/com/cc/wee/opensource_projectapp/model/OnDataChanged.kt
@@ -0,0 +1,7 @@
+package com.cc.wee.opensource_projectapp.model
+
+/**
+ * Created by wee on 2018. 4. 13..
+ */
+interface OnDataChanged {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cc/wee/opensource_projectapp/model/OnUploadImage.kt b/app/src/main/java/com/cc/wee/opensource_projectapp/model/OnUploadImage.kt
new file mode 100644
index 0000000..a9511a2
--- /dev/null
+++ b/app/src/main/java/com/cc/wee/opensource_projectapp/model/OnUploadImage.kt
@@ -0,0 +1,7 @@
+package com.cc.wee.opensource_projectapp.model
+
+/**
+ * Created by wee on 2018. 4. 13..
+ */
+interface OnUploadImage {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cc/wee/opensource_projectapp/model/UserModel.kt b/app/src/main/java/com/cc/wee/opensource_projectapp/model/UserModel.kt
new file mode 100644
index 0000000..dac264c
--- /dev/null
+++ b/app/src/main/java/com/cc/wee/opensource_projectapp/model/UserModel.kt
@@ -0,0 +1,7 @@
+package com.cc.wee.opensource_projectapp.model
+
+/**
+ * Created by wee on 2018. 4. 13..
+ */
+class UserModel {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cc/wee/opensource_projectapp/ui/LoginActivity.kt b/app/src/main/java/com/cc/wee/opensource_projectapp/ui/LoginActivity.kt
new file mode 100644
index 0000000..0291995
--- /dev/null
+++ b/app/src/main/java/com/cc/wee/opensource_projectapp/ui/LoginActivity.kt
@@ -0,0 +1,7 @@
+package com.cc.wee.opensource_projectapp.ui
+
+/**
+ * Created by wee on 2018. 4. 13..
+ */
+class LoginActivity {
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100755
index 0000000..ab96adb
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+
+ <ProgressBar
+ android:id="@+id/progress_bar"
+ android:visibility="invisible"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="20dp" />
+
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/email_edit_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+
+ <EditText
+ android:id="@+id/email_edit"
+ android:layout_width="250dp"
+ android:layout_height="wrap_content"
+ android:hint="email"
+ android:inputType="textEmailAddress"
+ android:text="test@gmail.com" />
+
+ </android.support.design.widget.TextInputLayout>
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/password_edit_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/email_edit_layout"
+ android:layout_centerInParent="true"
+ android:hint="password">
+
+ <EditText
+ android:id="@+id/password_edit"
+ android:layout_width="250dp"
+ android:layout_height="wrap_content"
+ android:text="123456"
+ android:inputType="textPassword" />
+ </android.support.design.widget.TextInputLayout>
+
+
+ <Button
+ android:id="@+id/login_button"
+ style="@style/Base.Widget.AppCompat.Button.Colored"
+ android:layout_width="250dp"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/password_edit_layout"
+ android:layout_centerInParent="true"
+ android:text="Login" />
+
+ <com.google.android.gms.common.SignInButton
+ android:id="@+id/google_login_button"
+ android:layout_width="250dp"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/login_button"
+ android:layout_centerInParent="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
index 337b283..da588a7
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.cc.wee.opensource_projectapp.ui.MainActivity">
+ tools:context="cc.foxtail.firebaseapp.ui.MainActivity">
- <TextView
- android:layout_width="wrap_content"
+
+ <LinearLayout
+ android:id="@+id/linearLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentStart="true"
+ android:background="#ffffff"
+ android:weightSum="1">
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/password_edit_layout"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:hint="Message">
+
+ <EditText
+ android:id="@+id/chat_edit"
+ android:layout_width="250dp"
+ android:layout_height="wrap_content"
+ />
+ </android.support.design.widget.TextInputLayout>
+
+
+ <Button
+ android:id="@+id/chat_button"
+ style="@style/Base.Widget.AppCompat.Button.Colored"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Send" />
+
+ <Button
+ android:id="@+id/photo_button"
+ style="@style/Base.Widget.AppCompat.Button.Colored"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Photo" />
+
+
+ </LinearLayout>
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/recycler_view"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Hello World!"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ android:layout_above="@id/linearLayout"
+ android:layout_alignParentStart="true" />
-</android.support.constraint.ConstraintLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/recycler_item_chat.xml b/app/src/main/res/layout/recycler_item_chat.xml
new file mode 100755
index 0000000..f7bff4a
--- /dev/null
+++ b/app/src/main/res/layout/recycler_item_chat.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <ImageView
+ android:id="@+id/chat_image_view"
+ android:layout_gravity="center"
+ android:layout_width="200dp"
+ android:layout_height="200dp" />
+
+ <TextView
+ android:id="@+id/chat_text_view"
+ style="@style/TextAppearance.AppCompat.Large"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
--
GitLab