From 609db697c8a35a15650df6c1f5a7bfad17a43c35 Mon Sep 17 00:00:00 2001
From: Unknown <kimts2002kr@naver.com>
Date: Sun, 2 Dec 2018 22:45:41 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8B=9C=20?=
 =?UTF-8?q?=EB=8B=89=EB=84=A4=EC=9E=84=EC=9D=B4=20=EC=A0=9C=EB=8C=80?=
 =?UTF-8?q?=EB=A1=9C=20=ED=91=9C=EA=B8=B0=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8D=98=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                             |  4 ++++
 .../fragment/login/CreateAccountFragment.java          |  1 +
 .../fragment/meeting/MeetingCategoryFragment.java      | 10 ----------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index a866dbe..877d461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,8 +18,12 @@
 bin/
 gen/
 out/
+app/debug
+app/release
 
 # Properties
+
+keystore
 keystore.properties
 string_key.xml
 
diff --git a/app/src/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/login/CreateAccountFragment.java b/app/src/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/login/CreateAccountFragment.java
index 753616c..28b7d90 100644
--- a/app/src/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/login/CreateAccountFragment.java
+++ b/app/src/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/login/CreateAccountFragment.java
@@ -49,6 +49,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                         .observeOn(AndroidSchedulers.mainThread())
                         .doOnNext(res -> {
                             if(res.code() == HttpsURLConnection.HTTP_OK) {
+                                PreferencesManager.setNickname(res.body().nickname);
                                 intentMain();
                             }
                             else {
diff --git a/app/src/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/meeting/MeetingCategoryFragment.java b/app/src/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/meeting/MeetingCategoryFragment.java
index a26c787..bc6b38a 100644
--- a/app/src/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/meeting/MeetingCategoryFragment.java
+++ b/app/src/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/meeting/MeetingCategoryFragment.java
@@ -10,7 +10,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -19,7 +18,6 @@
 import com.depromeet.hanriver.hanrivermeetup.HanRiverMeetupApplication;
 import com.depromeet.hanriver.hanrivermeetup.R;
 import com.depromeet.hanriver.hanrivermeetup.common.PreferencesManager;
-import com.depromeet.hanriver.hanrivermeetup.fragment.login.LoginFragment;
 import com.depromeet.hanriver.hanrivermeetup.fragment.meeting.Adapter.Category.MeetingCategoryAdapter;
 import com.depromeet.hanriver.hanrivermeetup.model.meeting.Activity;
 import com.depromeet.hanriver.hanrivermeetup.model.meeting.Weather;
@@ -43,7 +41,6 @@ public class MeetingCategoryFragment extends Fragment {
 
     @Nullable
     private TextView mActivitesView;
-    private GridView gridview;
     private RecyclerView recyclerView;
     private RecyclerView.LayoutManager rvManager;
     private ImageView weather_img;
@@ -68,7 +65,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         setupViews(v);
         Log.d("TAG","oncreateView");
         return v;
-
     }
 
     private void setupViews(View v) {
@@ -82,7 +78,6 @@ private void setupViews(View v) {
         rvManager = new LinearLayoutManager(getContext());
         Log.d("TAG","setupViews");
         MainActivity.tabVisible(View.VISIBLE);
-
     }
 
     @Override
@@ -116,11 +111,8 @@ private void bind() {
                     }
                 })
                 .subscribe());
-
     }
 
-
-
     private void unBind() {
         mCompositeDisposable.clear();
     }
@@ -129,7 +121,6 @@ private void setActivites(@NonNull final List<Activity> activites) {
         assert mActivitesView != null;
         recyclerView.setLayoutManager(rvManager);
         recyclerView.setAdapter(new MeetingCategoryAdapter(activites,getContext(),this));
-
     }
 
     private void setWeather(@NonNull final Weather weather){
@@ -147,5 +138,4 @@ private void setWeather(@NonNull final Weather weather){
     private MeetingCategoryViewModel getViewModel() {
         return ((HanRiverMeetupApplication)getActivity().getApplicationContext()).getMeetingCategoryViewModel();
     }
-
 }