diff --git a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java b/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java index 429fc7eb3..273d74a09 100644 --- a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java @@ -105,7 +105,7 @@ public abstract class AbstractMvpActivity - - + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_choose_worlds.xml b/app/src/main/res/layout/layout_choose_worlds.xml index bbd9fb657..dfadb0789 100644 --- a/app/src/main/res/layout/layout_choose_worlds.xml +++ b/app/src/main/res/layout/layout_choose_worlds.xml @@ -3,7 +3,7 @@ android:id="@+id/fl_dialog_world" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/transparent"> + > #9af5ef - #7154EE + #248cfe #39EBDF #39D0EB diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java index 3c4b0d52a..07e1f3db1 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java @@ -317,7 +317,7 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele ivAvatar = mHeaderView.findViewById(R.id.iv_avatar); ivHeadWear = mHeaderView.findViewById(R.id.iv_head_wear); widgetNickDetail = mHeaderView.findViewById(R.id.widget_nick_detail); - tvTime = mHeaderView.findViewById(R.id.tv_time); + tvTime = mHeaderView.findViewById(R.id.tv_time_detail); ivMore = mHeaderView.findViewById(R.id.iv_more); etvContent = mHeaderView.findViewById(R.id.etv_content); rvImage = mHeaderView.findViewById(R.id.rv_image); diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java index b3806bf6e..eb3420c05 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java @@ -18,6 +18,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.google.android.flexbox.FlexboxLayout; +import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.log.LogUtil; import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; @@ -162,7 +163,7 @@ public class PublishActivity extends BaseMvpActivity + android:background="@color/color_1c1b22"> @@ -24,7 +25,7 @@ android:gravity="center" android:maxLength="500" android:text="@string/dy_publish" - android:textColor="@color/color_999999" + android:textColor="@color/color_c6c6e9" android:textSize="@dimen/sp_13" app:layout_constraintBottom_toBottomOf="@id/title_bar" app:layout_constraintEnd_toEndOf="parent" @@ -43,8 +44,8 @@ android:paddingBottom="@dimen/dp_10" android:maxLength="500" android:textSize="@dimen/sp_13" - android:textColor="@color/color_333333" - android:textColorHint="@color/color_BDBDBF" + android:textColor="@color/white" + android:textColorHint="@color/color_4F516A" app:layout_constraintTop_toBottomOf="@id/title_bar" /> @@ -54,7 +55,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_20" android:text="0/500" - android:textColor="@color/color_999999" + android:textColor="@color/color_c6c6e9" android:textSize="@dimen/sp_13" app:layout_constraintTop_toBottomOf="@id/et_content" app:layout_constraintEnd_toEndOf="parent"/> @@ -63,7 +64,7 @@ android:id="@+id/view" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/color_F4F4F4" + android:background="@color/color_353548" app:layout_constraintTop_toBottomOf="@id/tv_input_limit" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" @@ -79,7 +80,7 @@ android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_25" android:text="@string/dy_publish_user_tips" - android:textColor="@color/color_999999" + android:textColor="@color/color_4F516A" android:textSize="@dimen/sp_11" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" @@ -123,7 +124,7 @@ android:gravity="center_vertical" android:visibility="gone" tools:visibility="visible" - android:background="@drawable/bg_dynamic_topic" + android:background="@drawable/shape_bg_mini_world_name" > @@ -145,7 +146,7 @@ android:textSize="@dimen/dp_12" android:paddingEnd="10dp" android:paddingStart="0dp" - android:src="@drawable/ic_topic_close" + android:src="@drawable/ic_room_main_entrance_close" /> @@ -154,7 +155,7 @@ android:id="@+id/tv_choose" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/color_333333" + android:textColor="@color/white" android:textSize="12sp" android:gravity="center" android:layout_marginEnd="20dp" @@ -163,7 +164,7 @@ android:paddingTop="@dimen/dp_3" android:paddingBottom="@dimen/dp_3" tools:visibility="gone" - android:background="@drawable/bg_dynamic_topic_f4f4f4" + android:background="@drawable/shape_bg_mini_world_name" android:text="添加话题"/> diff --git a/app/src/module_community/res/layout/head_dynamic_detail.xml b/app/src/module_community/res/layout/head_dynamic_detail.xml index aa51c722c..b1a6b43b8 100644 --- a/app/src/module_community/res/layout/head_dynamic_detail.xml +++ b/app/src/module_community/res/layout/head_dynamic_detail.xml @@ -46,8 +46,8 @@ android:id="@+id/etv_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_8" android:layout_marginLeft="@dimen/dp_20" + android:layout_marginTop="@dimen/dp_8" android:layout_marginRight="@dimen/dp_20" android:orientation="vertical" app:animAlphaStart="1" @@ -87,20 +87,21 @@ android:id="@+id/rv_image" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_12" android:layout_marginStart="@dimen/dp_15" + android:layout_marginTop="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_15" - app:layout_constraintStart_toStartOf="parent" android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/etv_content" /> @@ -110,7 +111,7 @@ android:layout_height="@dimen/dp_25" android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/dp_20" - android:background="@drawable/bg_dynamic_topic" + android:background="@drawable/shape_bg_mini_world_name" android:orientation="horizontal" android:paddingStart="@dimen/dp_11" android:paddingEnd="@dimen/dp_11" @@ -127,7 +128,7 @@ android:gravity="center" android:maxWidth="150dp" android:singleLine="true" - android:textColor="@color/color_7154EE" + android:textColor="@color/white" android:textSize="@dimen/sp_12" tools:text="话题名称话题名称话题名称" /> @@ -150,26 +151,29 @@ app:layout_constraintTop_toTopOf="parent" /> + android:text="刚刚" /> + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world"> - \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_worlds_choose.xml b/app/src/module_community/res/layout/item_worlds_choose.xml index 1d09bb77c..c5e7b7ba9 100644 --- a/app/src/module_community/res/layout/item_worlds_choose.xml +++ b/app/src/module_community/res/layout/item_worlds_choose.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:layout_marginStart="12dp" - android:textColor="@color/color_333333" + android:textColor="@color/white" android:textSize="@dimen/sp_15" android:maxLines="1" android:ellipsize="end" @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:layout_marginTop="3.5dp" android:layout_marginStart="12dp" - android:textColor="@color/color_999999" + android:textColor="@color/color_c6c6e9" android:textSize="@dimen/sp_13" android:maxLines="1" android:ellipsize="end" @@ -53,7 +53,7 @@ fragments = new ArrayList<>(); @@ -87,9 +88,7 @@ public class AllTopicActivity extends BaseMvpActivity + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_25" /> + android:paddingBottom="@dimen/dp_10"> + android:visibility="gone" /> + android:layout_height="match_parent" + android:layout_below="@+id/magic_indicator" /> diff --git a/app/src/module_mini_world/res/layout/item_all_topic_list.xml b/app/src/module_mini_world/res/layout/item_all_topic_list.xml index 8627d694f..a79932e21 100644 --- a/app/src/module_mini_world/res/layout/item_all_topic_list.xml +++ b/app/src/module_mini_world/res/layout/item_all_topic_list.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" android:paddingStart="20dp" android:paddingEnd="20dp"> @@ -16,7 +15,7 @@ android:ellipsize="end" android:lines="1" android:text="明媚的早晨" - android:textColor="@color/color_333333" + android:textColor="@color/white" android:textSize="13sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -25,12 +24,12 @@ android:id="@+id/iv_hot" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_5" android:src="@mipmap/ic_topic_hot" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@id/tv_title" app:layout_constraintStart_toEndOf="@id/tv_title" app:layout_constraintTop_toTopOf="@id/tv_title" - app:layout_constraintBottom_toBottomOf="@id/tv_title" - android:layout_marginStart="@dimen/dp_5" - android:visibility="gone" tools:visibility="visible" /> @@ -38,20 +37,18 @@ + app:layout_constraintBottom_toBottomOf="@id/tv_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/tv_title" + tools:text="100条动态" /> + android:background="@color/color_353548" + app:layout_constraintTop_toBottomOf="@id/tv_title" /> \ No newline at end of file diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java index 2a491f0cb..d446d5063 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java @@ -138,7 +138,7 @@ public abstract class AbstractMvpPresenter implements Li }; private void logInfo(String msg) { - if (BuildConfig.DEBUG) + if (false) Log.e(TAG, msg); } diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java index a2c083141..2de3247c8 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java @@ -137,7 +137,7 @@ public class BaseMvpProxy