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 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(); } - }