#dev fix codes nickname(timeline),telnumber(mapCard)

HanRiverMeetup · Dec 2, 2018 · e753dd0 · e753dd0
1 parent ca55d78
commit e753dd0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...c/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/timeline/TimelineFragment.java b/...c/main/java/com/depromeet/hanriver/hanrivermeetup/fragment/timeline/TimelineFragment.java
@@ -16,6 +16,7 @@
 import android.widget.Toast;
 
 import com.depromeet.hanriver.hanrivermeetup.R;
+import com.depromeet.hanriver.hanrivermeetup.common.PreferencesManager;
 import com.depromeet.hanriver.hanrivermeetup.fragment.timeline.Adapter.TimeLineAdapter;
 import com.depromeet.hanriver.hanrivermeetup.model.meeting.Weather;
 import com.depromeet.hanriver.hanrivermeetup.model.timeline.EventVO;
@@ -59,6 +60,7 @@ public class TimelineFragment extends Fragment {
     @BindView(R.id.timeline_weather_status_text) TextView weather_temp_sub;
     @BindView(R.id.event_pager) ViewPager mEventViewPager;
     @BindView(R.id.page_text) TextView pageTextView;
+    @BindView(R.id.timeline_main_text) TextView nickNameText;
 
     private EventBannerAdapter eventBannerAdapter;
 
@@ -104,6 +106,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mRecyclerView.setLayoutManager(mLayoutManager);
         mTimeLineAdapter = new TimeLineAdapter(getActivity());
         mRecyclerView.setAdapter(mTimeLineAdapter);
+        nickNameText.setText(PreferencesManager.getNickname()+" 님\n한강소식을 알볼까요?");
 
         return view;
     }

diff --git a/app/src/main/res/layout/tour_event_info_card.xml b/app/src/main/res/layout/tour_event_info_card.xml
@@ -27,7 +27,10 @@
                 android:lineSpacingExtra="-2sp"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:text="Card title" />
+                android:maxLines="2"
+                android:text="Card title"
+                android:ellipsize="end"
+                />
 
             <TextView
                 android:id="@+id/address"
@@ -47,8 +50,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/address"
-                android:layout_marginTop="20dp"
+                app:layout_constraintBottom_toTopOf="@id/phone_text"
+                android:layout_marginBottom="10dp"
                 android:text="홈페이지 주소"
                 android:textSize="15sp"
                 android:textColor="@color/white"/>
@@ -58,8 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/homepage_text"
-                android:layout_marginTop="5dp"
+                app:layout_constraintBottom_toBottomOf="parent"
                 android:text="홈페이지 주소"
                 android:textSize="15sp"
                 android:textColor="@color/white"/>