Skip to content

Commit

Permalink
로그인시 닉네임이 제대로 표기되지 않던 버그 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
TaerryKim committed Dec 2, 2018
1 parent e753dd0 commit 609db69
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
bin/
gen/
out/
app/debug
app/release

# Properties

keystore
keystore.properties
string_key.xml

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -68,7 +65,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
setupViews(v);
Log.d("TAG","oncreateView");
return v;

}

private void setupViews(View v) {
Expand All @@ -82,7 +78,6 @@ private void setupViews(View v) {
rvManager = new LinearLayoutManager(getContext());
Log.d("TAG","setupViews");
MainActivity.tabVisible(View.VISIBLE);

}

@Override
Expand Down Expand Up @@ -116,11 +111,8 @@ private void bind() {
}
})
.subscribe());

}



private void unBind() {
mCompositeDisposable.clear();
}
Expand All @@ -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){
Expand All @@ -147,5 +138,4 @@ private void setWeather(@NonNull final Weather weather){
private MeetingCategoryViewModel getViewModel() {
return ((HanRiverMeetupApplication)getActivity().getApplicationContext()).getMeetingCategoryViewModel();
}

}

0 comments on commit 609db69

Please sign in to comment.