손장민 / FirebaseAuth

Go to a project
Toggle navigation Toggle navigation pinning
한윤범
4d8dd9d9 1 parent e3e3cc31

community function

Inline Side-by-side
Showing 32 changed files with 333 additions and 77 deletions
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <profile version="1.0"> 2 <profile version="1.0">
3 <option name="myName" value="Project Default" /> 3 <option name="myName" value="Project Default" />
4 <inspection_tool class="AndroidLintMissingConstraints" enabled="false" level="ERROR" enabled_by_default="false" /> 4 <inspection_tool class="AndroidLintMissingConstraints" enabled="false" level="ERROR" enabled_by_default="false" />
5 + <inspection_tool class="AndroidLintValidFragment" enabled="false" level="ERROR" enabled_by_default="false" />
5 <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false"> 6 <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
6 <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" /> 7 <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
7 <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" /> 8 <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ProjectModuleManager"> 3 <component name="ProjectModuleManager">
4 <modules> 4 <modules>
5 + <module fileurl="file://$PROJECT_DIR$/FirebaseAuth.iml" filepath="$PROJECT_DIR$/FirebaseAuth.iml" />
5 <module fileurl="file://$PROJECT_DIR$/FirebaseAuthDemo.iml" filepath="$PROJECT_DIR$/FirebaseAuthDemo.iml" /> 6 <module fileurl="file://$PROJECT_DIR$/FirebaseAuthDemo.iml" filepath="$PROJECT_DIR$/FirebaseAuthDemo.iml" />
6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> 7 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
7 </modules> 8 </modules>
......
...@@ -25,10 +25,14 @@ dependencies { ...@@ -25,10 +25,14 @@ dependencies {
25 exclude group: 'com.android.support', module: 'support-annotations' 25 exclude group: 'com.android.support', module: 'support-annotations'
26 }) 26 })
27 compile 'com.android.support:appcompat-v7:25.3.1' 27 compile 'com.android.support:appcompat-v7:25.3.1'
28 + compile 'com.android.support:recyclerview-v7:25.3.1'
29 + compile 'com.android.support:cardview-v7:25.3.1'
28 compile 'com.android.support.constraint:constraint-layout:1.0.2' 30 compile 'com.android.support.constraint:constraint-layout:1.0.2'
29 compile 'com.google.firebase:firebase-auth:10.2.6' 31 compile 'com.google.firebase:firebase-auth:10.2.6'
30 compile 'com.google.android.gms:play-services-auth:10.2.6' 32 compile 'com.google.android.gms:play-services-auth:10.2.6'
31 compile 'com.google.firebase:firebase-database:10.2.6' 33 compile 'com.google.firebase:firebase-database:10.2.6'
34 + compile 'com.google.firebase:firebase-storage:10.2.6'
35 + compile 'com.firebaseui:firebase-ui-database:0.4.0'
32 compile 'com.android.support:design:25.3.1' 36 compile 'com.android.support:design:25.3.1'
33 testCompile 'junit:junit:4.12' 37 testCompile 'junit:junit:4.12'
34 } 38 }
...@@ -36,4 +40,5 @@ dependencies { ...@@ -36,4 +40,5 @@ dependencies {
36 40
37 41
38 42
43 +
39 apply plugin: 'com.google.gms.google-services' 44 apply plugin: 'com.google.gms.google-services'
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
23 <activity 23 <activity
24 android:name=".Main2Activity" 24 android:name=".Main2Activity"
25 android:label="@string/title_activity_main2" 25 android:label="@string/title_activity_main2"
26 - android:theme="@style/AppTheme.NoActionBar"></activity> 26 + android:theme="@style/AppTheme.NoActionBar" />
27 + <activity android:name=".PostActivity"></activity>
27 </application> 28 </application>
28 29
29 </manifest> 30 </manifest>
...\ No newline at end of file ...\ No newline at end of file
......
1 +package com.example.user.firebaseauthdemo;
2 +
3 +import android.content.Intent;
4 +import android.os.Bundle;
5 +import android.support.annotation.Nullable;
6 +import android.support.v4.app.Fragment;
7 +import android.view.LayoutInflater;
8 +import android.view.Menu;
9 +import android.view.MenuInflater;
10 +import android.view.MenuItem;
11 +import android.view.View;
12 +import android.view.ViewGroup;
13 +
14 +/**
15 + * Created by HYB on 2017. 10. 11..
16 + */
17 +
18 +public class Community extends Fragment {
19 +
20 +
21 + @Nullable
22 + @Override
23 + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
24 + setHasOptionsMenu(true);
25 + return inflater.inflate(R.layout.community, container, false);
26 + }
27 +
28 + @Override
29 + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
30 + inflater.inflate(R.menu.community_menu, menu);
31 + super.onCreateOptionsMenu(menu, inflater);
32 + }
33 +
34 + @Override
35 + public boolean onOptionsItemSelected(MenuItem item) {
36 +
37 + if(item.getItemId() == R.id.action_add){
38 + Intent intent = new Intent(getActivity(), PostActivity.class);
39 + startActivity(intent);
40 + }
41 +
42 + return super.onOptionsItemSelected(item);
43 + }
44 +}
...@@ -163,22 +163,22 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList ...@@ -163,22 +163,22 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
163 163
164 if(TextUtils.isEmpty(email)){ 164 if(TextUtils.isEmpty(email)){
165 //email is empty 165 //email is empty
166 - Toast.makeText(this, "Please enter email", Toast.LENGTH_SHORT).show(); 166 + Toast.makeText(this, "이메일을 입력하세요", Toast.LENGTH_SHORT).show();
167 //stopping the function execution further 167 //stopping the function execution further
168 return; 168 return;
169 } 169 }
170 170
171 if(TextUtils.isEmpty(password)) { 171 if(TextUtils.isEmpty(password)) {
172 //password is empty 172 //password is empty
173 - Toast.makeText(this, "Please enter password", Toast.LENGTH_SHORT).show(); 173 + Toast.makeText(this, "패스워드를 입력하세요", Toast.LENGTH_SHORT).show();
174 //stopping the function execution further 174 //stopping the function execution further
175 return; 175 return;
176 } 176 }
177 //if validation are ok 177 //if validation are ok
178 //we will first show a progressbar 178 //we will first show a progressbar
179 179
180 - progressDialog.setTitle("Loading..."); 180 + progressDialog.setTitle("로딩중...");
181 - progressDialog.setMessage("Registering User..."); 181 + progressDialog.setMessage("로그인 중입니다");
182 progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); 182 progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
183 progressDialog.show(); 183 progressDialog.show();
184 184
......
1 package com.example.user.firebaseauthdemo; 1 package com.example.user.firebaseauthdemo;
2 2
3 +import android.content.Intent;
3 import android.os.Bundle; 4 import android.os.Bundle;
4 -import android.support.design.widget.FloatingActionButton;
5 -import android.support.design.widget.Snackbar;
6 -import android.view.View;
7 import android.support.design.widget.NavigationView; 5 import android.support.design.widget.NavigationView;
6 +import android.support.v4.app.Fragment;
7 +import android.support.v4.app.FragmentTransaction;
8 import android.support.v4.view.GravityCompat; 8 import android.support.v4.view.GravityCompat;
9 import android.support.v4.widget.DrawerLayout; 9 import android.support.v4.widget.DrawerLayout;
10 import android.support.v7.app.ActionBarDrawerToggle; 10 import android.support.v7.app.ActionBarDrawerToggle;
...@@ -23,14 +23,6 @@ public class Main2Activity extends AppCompatActivity ...@@ -23,14 +23,6 @@ public class Main2Activity extends AppCompatActivity
23 Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); 23 Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
24 setSupportActionBar(toolbar); 24 setSupportActionBar(toolbar);
25 25
26 - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
27 - fab.setOnClickListener(new View.OnClickListener() {
28 - @Override
29 - public void onClick(View view) {
30 - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
31 - .setAction("Action", null).show();
32 - }
33 - });
34 26
35 DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); 27 DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
36 ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( 28 ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
...@@ -67,31 +59,48 @@ public class Main2Activity extends AppCompatActivity ...@@ -67,31 +59,48 @@ public class Main2Activity extends AppCompatActivity
67 int id = item.getItemId(); 59 int id = item.getItemId();
68 60
69 //noinspection SimplifiableIfStatement 61 //noinspection SimplifiableIfStatement
70 - if (id == R.id.action_settings) { 62 +// if (id == R.id.action_settings) {
71 - return true; 63 +// return true;
72 - } 64 +// }
73 65
74 return super.onOptionsItemSelected(item); 66 return super.onOptionsItemSelected(item);
75 } 67 }
76 68
77 - @SuppressWarnings("StatementWithEmptyBody") 69 + private void displaySelectedScreen(int id){
78 - @Override 70 +
79 - public boolean onNavigationItemSelected(MenuItem item) { 71 + Fragment fragment = null;
80 - // Handle navigation view item clicks here. 72 +
81 - int id = item.getItemId(); 73 + switch (id){
82 - 74 + case R.id.nav_map:
83 - if (id == R.id.nav_map) { 75 + fragment = new Map();
84 - // Handle the camera action 76 + break;
85 - } else if (id == R.id.nav_route) { 77 + case R.id.nav_route:
86 - 78 + fragment = new Route();
87 - } else if (id == R.id.nav_community) { 79 + break;
88 - 80 + case R.id.nav_community:
89 - } else if (id == R.id.nav_manage) { 81 + fragment = new Community();
82 + break;
83 + case R.id.nav_manage:
84 + finish();
85 + startActivity(new Intent(getApplicationContext(), ProfileActivity.class));
86 + }
90 87
88 + if(fragment != null){
89 + FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
90 + ft.replace(R.id.content_main, fragment);
91 + ft.commit();
91 } 92 }
92 93
93 DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); 94 DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
94 drawer.closeDrawer(GravityCompat.START); 95 drawer.closeDrawer(GravityCompat.START);
96 + }
97 +
98 + @SuppressWarnings("StatementWithEmptyBody")
99 + @Override
100 + public boolean onNavigationItemSelected(MenuItem item) {
101 + // Handle navigation view item clicks here.
102 + int id = item.getItemId();
103 + displaySelectedScreen(id);
95 return true; 104 return true;
96 } 105 }
97 } 106 }
......
...@@ -2,14 +2,13 @@ package com.example.user.firebaseauthdemo; ...@@ -2,14 +2,13 @@ package com.example.user.firebaseauthdemo;
2 2
3 import android.app.ProgressDialog; 3 import android.app.ProgressDialog;
4 import android.content.Intent; 4 import android.content.Intent;
5 +import android.os.Bundle;
5 import android.support.annotation.NonNull; 6 import android.support.annotation.NonNull;
6 import android.support.v7.app.AppCompatActivity; 7 import android.support.v7.app.AppCompatActivity;
7 -import android.os.Bundle;
8 import android.text.TextUtils; 8 import android.text.TextUtils;
9 import android.view.View; 9 import android.view.View;
10 import android.widget.Button; 10 import android.widget.Button;
11 import android.widget.EditText; 11 import android.widget.EditText;
12 -import android.widget.ProgressBar;
13 import android.widget.TextView; 12 import android.widget.TextView;
14 import android.widget.Toast; 13 import android.widget.Toast;
15 14
...@@ -41,7 +40,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -41,7 +40,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
41 if(firebaseAuth.getCurrentUser() != null){ 40 if(firebaseAuth.getCurrentUser() != null){
42 //profile activity here 41 //profile activity here
43 finish(); 42 finish();
44 - startActivity(new Intent(getApplicationContext(), ProfileActivity.class)); 43 + startActivity(new Intent(getApplicationContext(), Main2Activity.class));
45 } 44 }
46 45
47 buttonRegister = (Button) findViewById(R.id.buttonRegister); 46 buttonRegister = (Button) findViewById(R.id.buttonRegister);
...@@ -61,22 +60,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -61,22 +60,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
61 60
62 if(TextUtils.isEmpty(email)){ 61 if(TextUtils.isEmpty(email)){
63 //email is empty 62 //email is empty
64 - Toast.makeText(this, "Please enter email", Toast.LENGTH_SHORT).show(); 63 + Toast.makeText(this, "이메일을 입력하세요요", Toast.LENGTH_SHORT).show();
65 - //stopping the function execution further 64 + //stopping the function execution further
66 return; 65 return;
67 } 66 }
68 67
69 if(TextUtils.isEmpty(password)) { 68 if(TextUtils.isEmpty(password)) {
70 //password is empty 69 //password is empty
71 - Toast.makeText(this, "Please enter password", Toast.LENGTH_SHORT).show(); 70 + Toast.makeText(this, "패스워드를 입력하세요", Toast.LENGTH_SHORT).show();
72 //stopping the function execution further 71 //stopping the function execution further
73 return; 72 return;
74 } 73 }
75 //if validation are ok 74 //if validation are ok
76 //we will first show a progressbar 75 //we will first show a progressbar
77 76
78 - progressDialog.setTitle("Loading..."); 77 + progressDialog.setTitle("로딩중...");
79 - progressDialog.setMessage("Registering User..."); 78 + progressDialog.setMessage("등록 중입니다");
80 progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); 79 progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
81 progressDialog.show(); 80 progressDialog.show();
82 //creating a new user 81 //creating a new user
...@@ -86,9 +85,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -86,9 +85,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
86 public void onComplete(@NonNull Task<AuthResult> task) { 85 public void onComplete(@NonNull Task<AuthResult> task) {
87 if(task.isSuccessful()){ 86 if(task.isSuccessful()){
88 finish(); 87 finish();
89 - startActivity(new Intent(getApplicationContext(), ProfileActivity.class)); 88 + startActivity(new Intent(getApplicationContext(), Main2Activity.class));
90 }else{ 89 }else{
91 - Toast.makeText(MainActivity.this, "Could not register.. Try again", Toast.LENGTH_SHORT).show(); 90 + Toast.makeText(MainActivity.this, "등록할 수 없습니다.", Toast.LENGTH_SHORT).show();
92 } 91 }
93 progressDialog.dismiss(); 92 progressDialog.dismiss();
94 } 93 }
......
1 +package com.example.user.firebaseauthdemo;
2 +
3 +import android.os.Bundle;
4 +import android.support.annotation.Nullable;
5 +import android.support.v4.app.Fragment;
6 +import android.view.LayoutInflater;
7 +import android.view.View;
8 +import android.view.ViewGroup;
9 +
10 +/**
11 + * Created by HYB on 2017. 10. 11..
12 + */
13 +
14 +public class Map extends Fragment {
15 +
16 + @Nullable
17 + @Override
18 + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
19 + return inflater.inflate(R.layout.map, container, false);
20 + }
21 +
22 + @Override
23 + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
24 + super.onViewCreated(view, savedInstanceState);
25 +
26 + getActivity().setTitle("Map");
27 + }
28 +}
1 +package com.example.user.firebaseauthdemo;
2 +
3 +import android.content.Intent;
4 +import android.net.Uri;
5 +import android.os.Bundle;
6 +import android.support.v7.app.AppCompatActivity;
7 +import android.view.View;
8 +import android.widget.ImageButton;
9 +
10 +public class PostActivity extends AppCompatActivity {
11 +
12 + private ImageButton mSelectImage;
13 +
14 + private static final int GALLARY_REQUEST = 1;
15 +
16 + @Override
17 + protected void onCreate(Bundle savedInstanceState) {
18 + super.onCreate(savedInstanceState);
19 + setContentView(R.layout.activity_post);
20 +
21 + mSelectImage = (ImageButton)findViewById(R.id.imageSelect);
22 +
23 + mSelectImage.setOnClickListener(new View.OnClickListener() {
24 + @Override
25 + public void onClick(View view) {
26 + Intent gallaryIntent = new Intent(Intent.ACTION_GET_CONTENT);
27 + gallaryIntent.setType("image/*");
28 + startActivityForResult(gallaryIntent, GALLARY_REQUEST);
29 + }
30 + });
31 + }
32 +
33 + @Override
34 + protected void onActivityResult(int requestCode, int resultCode, Intent data) {
35 + super.onActivityResult(requestCode, resultCode, data);
36 +
37 + if(requestCode == GALLARY_REQUEST && resultCode == RESULT_OK){
38 + Uri imageUri = data.getData();
39 + mSelectImage.setImageURI(imageUri);
40 + }
41 + }
42 +}
...@@ -34,7 +34,9 @@ public class ProfileActivity extends AppCompatActivity implements View.OnClickLi ...@@ -34,7 +34,9 @@ public class ProfileActivity extends AppCompatActivity implements View.OnClickLi
34 finish(); 34 finish();
35 startActivity(new Intent(this,LoginActivity.class)); 35 startActivity(new Intent(this,LoginActivity.class));
36 } 36 }
37 +
37 databaseReference = FirebaseDatabase.getInstance().getReference(); 38 databaseReference = FirebaseDatabase.getInstance().getReference();
39 +
38 editTextAddress = (EditText) findViewById(R.id.editTextAddress); 40 editTextAddress = (EditText) findViewById(R.id.editTextAddress);
39 editTextName = (EditText)findViewById(R.id.editTextName); 41 editTextName = (EditText)findViewById(R.id.editTextName);
40 buttonSave = (Button)findViewById(R.id.buttonSave); 42 buttonSave = (Button)findViewById(R.id.buttonSave);
...@@ -57,8 +59,7 @@ public class ProfileActivity extends AppCompatActivity implements View.OnClickLi ...@@ -57,8 +59,7 @@ public class ProfileActivity extends AppCompatActivity implements View.OnClickLi
57 FirebaseUser user = firebaseAuth.getCurrentUser(); 59 FirebaseUser user = firebaseAuth.getCurrentUser();
58 databaseReference.child(user.getUid()).setValue(userInformation); 60 databaseReference.child(user.getUid()).setValue(userInformation);
59 61
60 - Toast.makeText(this, "Information Saved...", Toast.LENGTH_LONG).show(); 62 + Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_LONG).show();
61 -
62 } 63 }
63 64
64 @Override 65 @Override
......
1 +package com.example.user.firebaseauthdemo;
2 +
3 +import android.os.Bundle;
4 +import android.support.annotation.Nullable;
5 +import android.support.v4.app.Fragment;
6 +import android.view.LayoutInflater;
7 +import android.view.View;
8 +import android.view.ViewGroup;
9 +
10 +/**
11 + * Created by HYB on 2017. 10. 11..
12 + */
13 +
14 +public class Route extends Fragment {
15 + @Nullable
16 + @Override
17 + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
18 + return inflater.inflate(R.layout.route, container, false);
19 + }
20 +
21 + @Override
22 + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
23 + super.onViewCreated(view, savedInstanceState);
24 +
25 + getActivity().setTitle("Route");
26 + }
27 +}
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 +
4 + <stroke android:color="@color/colorGray" android:width="1dp "/>
5 + <corners android:radius="5dp"/>
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
21 android:layout_height="wrap_content" 21 android:layout_height="wrap_content"
22 android:layout_gravity="center_horizontal" 22 android:layout_gravity="center_horizontal"
23 android:layout_margin="30dp" 23 android:layout_margin="30dp"
24 - android:text="User Login" 24 + android:text="HELPLIST"
25 android:textAppearance="?android:attr/textAppearanceLarge" /> 25 android:textAppearance="?android:attr/textAppearanceLarge" />
26 26
27 <EditText 27 <EditText
28 android:layout_margin="15dp" 28 android:layout_margin="15dp"
29 android:inputType="textEmailAddress" 29 android:inputType="textEmailAddress"
30 - android:hint="Enter your email" 30 + android:hint="이메일을 입력하세요"
31 android:id="@+id/editTextEmail" 31 android:id="@+id/editTextEmail"
32 android:layout_width="368dp" 32 android:layout_width="368dp"
33 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 <EditText 37 <EditText
38 android:layout_margin="15dp" 38 android:layout_margin="15dp"
39 android:inputType="textPassword" 39 android:inputType="textPassword"
40 - android:hint="Enter your password" 40 + android:hint="패스워드를 입력하세요"
41 android:id="@+id/editTextPassword" 41 android:id="@+id/editTextPassword"
42 android:layout_width="match_parent" 42 android:layout_width="match_parent"
43 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 android:layout_width="match_parent" 49 android:layout_width="match_parent"
50 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
51 android:layout_margin="15dp" 51 android:layout_margin="15dp"
52 - android:text="Sign in" /> 52 + android:text="로그인" />
53 53
54 <com.google.android.gms.common.SignInButton 54 <com.google.android.gms.common.SignInButton
55 android:layout_width="match_parent" 55 android:layout_width="match_parent"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 android:layout_width="match_parent" 63 android:layout_width="match_parent"
64 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
65 android:layout_margin="15dp" 65 android:layout_margin="15dp"
66 - android:text="Not have an account? Signup Here" /> 66 + android:text="계정이 없나요? 이곳을 클릭하세요" />
67 67
68 </LinearLayout> 68 </LinearLayout>
69 </android.support.constraint.ConstraintLayout> 69 </android.support.constraint.ConstraintLayout>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 17
18 <TextView 18 <TextView
19 android:layout_margin="30dp" 19 android:layout_margin="30dp"
20 - android:text="User Registration" 20 + android:text="환영합니다"
21 android:id="@+id/textView" 21 android:id="@+id/textView"
22 android:layout_width="wrap_content" 22 android:layout_width="wrap_content"
23 android:textAppearance="?android:attr/textAppearanceLarge" 23 android:textAppearance="?android:attr/textAppearanceLarge"
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
47 <Button 47 <Button
48 android:layout_margin="15dp" 48 android:layout_margin="15dp"
49 android:id="@+id/buttonRegister" 49 android:id="@+id/buttonRegister"
50 - android:text="Register User" 50 + android:text="가입"
51 android:layout_width="match_parent" 51 android:layout_width="match_parent"
52 android:layout_height="wrap_content" /> 52 android:layout_height="wrap_content" />
53 53
54 <TextView 54 <TextView
55 android:textAlignment="center" 55 android:textAlignment="center"
56 - android:text="Already Registered? Sign in here" 56 + android:text="이미 가입했나요? 이곳을 클릭하세요"
57 android:id="@+id/textViewSignIn" 57 android:id="@+id/textViewSignIn"
58 android:layout_width="match_parent" 58 android:layout_width="match_parent"
59 android:layout_height="wrap_content" /> 59 android:layout_height="wrap_content" />
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 + xmlns:tools="http://schemas.android.com/tools"
5 + android:layout_width="match_parent"
6 + android:layout_height="match_parent"
7 + tools:context="com.example.user.firebaseauthdemo.PostActivity">
8 +
9 + <LinearLayout
10 + android:layout_width="368dp"
11 + android:layout_height="wrap_content"
12 + android:orientation="vertical"
13 + tools:layout_editor_absoluteY="8dp"
14 + tools:layout_editor_absoluteX="8dp"
15 + android:weightSum="1">
16 +
17 + <ImageButton
18 + android:id="@+id/imageSelect"
19 + android:layout_width="match_parent"
20 + android:layout_height="204dp"
21 + app:srcCompat="@mipmap/add_btn"
22 + android:layout_weight="0.05" />
23 +
24 + <EditText
25 + android:id="@+id/titleField"
26 + android:layout_width="match_parent"
27 + android:layout_height="45dp"
28 + android:layout_gravity="center_horizontal"
29 + android:layout_margin="15dp"
30 + android:background="@drawable/input_outline"
31 + android:ems="10"
32 + android:hint="Post Title.."
33 + android:inputType="textPersonName"
34 + android:singleLine="true"
35 + tools:layout_editor_absoluteX="0dp"
36 + tools:layout_editor_absoluteY="0dp" />
37 +
38 + <EditText
39 + android:id="@+id/descField"
40 + android:layout_width="match_parent"
41 + android:layout_height="47dp"
42 + android:layout_margin="15dp"
43 + android:background="@drawable/input_outline"
44 + android:ems="10"
45 + android:hint=" Post Descriptions..."
46 + android:inputType="textMultiLine" />
47 +
48 + <Button
49 + android:id="@+id/submitBtn"
50 + android:layout_width="match_parent"
51 + android:layout_height="wrap_content"
52 + android:layout_margin="40dp"
53 + android:background="@color/colorPrimary"
54 + android:text="Submit Post"
55 + android:textColor="@android:color/white"
56 + app:layout_constraintBottom_toBottomOf="parent"
57 + app:layout_constraintLeft_toLeftOf="parent"
58 + app:layout_constraintRight_toRightOf="parent"
59 + app:layout_constraintTop_toTopOf="parent" />
60 + </LinearLayout>
61 +</android.support.constraint.ConstraintLayout>
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
24 24
25 <EditText 25 <EditText
26 android:id="@+id/editTextName" 26 android:id="@+id/editTextName"
27 - android:hint="Enter your Name" 27 + android:hint="이름을 입력해 주세요"
28 android:layout_width="match_parent" 28 android:layout_width="match_parent"
29 android:layout_height="wrap_content" /> 29 android:layout_height="wrap_content" />
30 30
31 <EditText 31 <EditText
32 android:id="@+id/editTextAddress" 32 android:id="@+id/editTextAddress"
33 - android:hint="Enter your Address" 33 + android:hint="주소를 입력해 주세요"
34 android:layout_width="match_parent" 34 android:layout_width="match_parent"
35 android:layout_height="wrap_content" /> 35 android:layout_height="wrap_content" />
36 36
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
39 android:id="@+id/buttonSave" 39 android:id="@+id/buttonSave"
40 android:layout_width="match_parent" 40 android:layout_width="match_parent"
41 android:layout_height="wrap_content" 41 android:layout_height="wrap_content"
42 - android:text="Save information" /> 42 + android:text="정보 저장" />
43 43
44 <Button 44 <Button
45 android:id="@+id/buttonLogout" 45 android:id="@+id/buttonLogout"
46 android:layout_width="wrap_content" 46 android:layout_width="wrap_content"
47 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
48 android:layout_gravity="center_horizontal" 48 android:layout_gravity="center_horizontal"
49 - android:text="Logout" /> 49 + android:text="로그아웃" />
50 </LinearLayout> 50 </LinearLayout>
51 </android.support.constraint.ConstraintLayout> 51 </android.support.constraint.ConstraintLayout>
......
...@@ -22,12 +22,4 @@ ...@@ -22,12 +22,4 @@
22 22
23 <include layout="@layout/content_main2" /> 23 <include layout="@layout/content_main2" />
24 24
25 - <android.support.design.widget.FloatingActionButton
26 - android:id="@+id/fab"
27 - android:layout_width="wrap_content"
28 - android:layout_height="wrap_content"
29 - android:layout_gravity="bottom|end"
30 - android:layout_margin="@dimen/fab_margin"
31 - app:srcCompat="@android:drawable/ic_dialog_email" />
32 -
33 </android.support.design.widget.CoordinatorLayout> 25 </android.support.design.widget.CoordinatorLayout>
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:layout_width="match_parent"
4 + android:layout_height="match_parent"
5 + android:orientation="horizontal">
6 +
7 +</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 + android:id="@+id/content_main"
7 app:layout_behavior="@string/appbar_scrolling_view_behavior" 8 app:layout_behavior="@string/appbar_scrolling_view_behavior"
8 tools:context="com.example.user.firebaseauthdemo.Main2Activity" 9 tools:context="com.example.user.firebaseauthdemo.Main2Activity"
9 tools:showIn="@layout/app_bar_main2"> 10 tools:showIn="@layout/app_bar_main2">
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:orientation="vertical" android:layout_width="match_parent"
4 + android:layout_height="match_parent">
5 + <TextView
6 + android:id="@+id/map"
7 + android:layout_width="match_parent"
8 + android:layout_height="wrap_content"
9 + android:layout_centerHorizontal="true"
10 + android:text="Terror inform is displayed in here."
11 + android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
12 +
13 +</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
27 android:textAppearance="@style/TextAppearance.AppCompat.Body2" /> 27 android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
28 28
29 <TextView 29 <TextView
30 - android:id="@+id/textView"
31 - android:layout_width="wrap_content"
32 - android:layout_height="wrap_content"
33 - android:text="hanorang2@gmail.com" />
34 -
35 - <TextView
36 android:id="@+id/gitURL" 30 android:id="@+id/gitURL"
37 android:layout_width="wrap_content" 31 android:layout_width="wrap_content"
38 android:layout_height="wrap_content" 32 android:layout_height="wrap_content"
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:orientation="vertical" android:layout_width="match_parent"
4 + android:layout_height="match_parent">
5 +
6 + <TextView
7 + android:id="@+id/map"
8 + android:layout_width="match_parent"
9 + android:layout_height="wrap_content"
10 + android:layout_centerHorizontal="true"
11 + android:text="Route Searching."
12 + android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
13 +
14 +</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<menu xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto">
4 +
5 + <item android:id="@+id/action_add"
6 + android:icon="@mipmap/ic_add_white_24dp"
7 + android:title="Add Post"
8 + app:showAsAction="always" />
9 +
10 + <item android:id="@+id/action_settings"
11 + android:title="Settings"
12 + app:showAsAction="never" />
13 +</menu>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <menu xmlns:android="http://schemas.android.com/apk/res/android" 2 <menu xmlns:android="http://schemas.android.com/apk/res/android"
3 xmlns:app="http://schemas.android.com/apk/res-auto"> 3 xmlns:app="http://schemas.android.com/apk/res-auto">
4 - <item 4 +
5 - android:id="@+id/action_settings"
6 - android:orderInCategory="100"
7 - android:title="@string/action_settings"
8 - app:showAsAction="never" />
9 </menu> 5 </menu>
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <resources> 2 <resources>
3 - <color name="colorPrimary">#3F51B5</color> 3 + <color name="colorPrimary">#0488d1</color>
4 - <color name="colorPrimaryDark">#303F9F</color> 4 + <color name="colorPrimaryDark">#0477bd</color>
5 <color name="colorAccent">#FF4081</color> 5 <color name="colorAccent">#FF4081</color>
6 + <color name="colorGray">#c2c2c2</color>
6 </resources> 7 </resources>
......