yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI修改:1.动态话题列表 2.发布动态 3.动态详情 4.选择动态弹窗

Browse Source
This commit is contained in:
huangjian
2021-03-26 18:38:57 +08:00
parent 0a9f65adbb
commit 6735f1f1fb
16 changed files with 82 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java
View File

@@ -105,7 +105,7 @@ public abstract class AbstractMvpActivity<V extends IMvpBaseView, P extends Abst
}
private void logInfo(String msg) {
if (DEBUG)
if (false)
Log.e(TAG_LOG, msg);
}
}

2
app/src/main/java/com/yizhuan/erban/base/AbstractMvpFragment.java
View File

@@ -100,7 +100,7 @@ public abstract class AbstractMvpFragment<V extends IMvpBaseView, P extends Abst
}
private void logInfo(String msg) {
if (AbstractMvpActivity.DEBUG)
if (false)
Log.e(TAG_LOG, msg);
}
}

3
app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java
View File

@@ -17,6 +17,7 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.community.publish.view.WorldsChooseFrg;
import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter;
@@ -125,7 +126,7 @@ public class ChooseWorldsDialog extends AppCompatDialogFragment
WindowManager.LayoutParams wlp = window.getAttributes();
wlp.gravity = Gravity.BOTTOM;
wlp.width = WindowManager.LayoutParams.MATCH_PARENT;
wlp.height = WindowManager.LayoutParams.MATCH_PARENT;
wlp.height = ScreenUtil.screenHeight - ScreenUtil.getStatusBarHeight(context);
window.setDimAmount(0.3f);
window.setAttributes(wlp);
window.setBackgroundDrawableResource(R.drawable.bg_audio_party_list_dialog);

6
app/src/main/res/drawable/bg_white_top_0_8.xml
View File

@@ -2,11 +2,11 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:topLeftRadius="0dp"
android:topRightRadius="0dp"
<corners android:topLeftRadius="8dp"
android:topRightRadius="8dp"
android:bottomRightRadius="0dp"
android:bottomLeftRadius="0dp"/>
<solid android:color="@color/white"/>
<solid android:color="@color/color_2a2a39"/>
</shape>

2
app/src/main/res/layout/layout_choose_worlds.xml
View File

@@ -3,7 +3,7 @@
android:id="@+id/fl_dialog_world"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent">
>
<LinearLayout
android:layout_gravity="bottom"

2
app/src/main/res/values/colors.xml
View File

@@ -492,7 +492,7 @@
<color name="color_9af5ef">#9af5ef</color>
<!-- 音游主题色 -->
<color name="color_7154EE">#7154EE</color>
<color name="color_7154EE">#248cfe</color>
<color name="color_39EBDF">#39EBDF</color>
<color name="color_39D0EB">#39D0EB</color>

2
app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -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);

16
app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
View File

@@ -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<IPublishView, PublishPresen
}
isOriginalImage = (boolean) SharedPreferenceUtils.get(KEY_SP_ORIGINAL_IMAGE, false);
initTitleBar(R.string.pic_text_publish);
initWhiteTitleBar("图文发布");
initGridImages();
updateImagesData();
initEditContent();
@@ -260,7 +261,7 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
tvInputLimit.setText(s.length() + "/500");
updatePublishStatus();
String inputText = s.toString().trim();
tvPublish.setTextColor(!TextUtils.isEmpty(inputText) ? getResources().getColor(R.color.color_7154EE):getResources().getColor(R.color.color_999999));
tvPublish.setTextColor(!TextUtils.isEmpty(inputText) ? getResources().getColor(R.color.color_7154EE):getResources().getColor(R.color.color_c6c6e9));
tvPublish.setEnabled(!TextUtils.isEmpty(inputText));
}
});
@@ -526,4 +527,15 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
}
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
}

25
app/src/module_community/res/layout/activity_publish.xml
View File

@@ -4,10 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/color_1c1b22">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_marginTop="25dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
@@ -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"
>
<TextView
@@ -134,7 +135,7 @@
android:paddingEnd="10dp"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/color_7154EE"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
tools:text="话题名称" />
@@ -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"
/>
</LinearLayout>
@@ -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="添加话题"/>

35
app/src/module_community/res/layout/head_dynamic_detail.xml
View File

@@ -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" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_root_mini_world"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:orientation="horizontal"
android:visibility="gone"
android:paddingBottom="@dimen/dp_4"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/rv_image"
tools:visibility="visible">
@@ -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" />
<TextView
android:id="@+id/tv_time"
android:id="@+id/tv_time_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_24"
android:gravity="center"
android:textColor="#4F516A"
android:textSize="@dimen/sp_11"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginEnd="@dimen/dp_24"
tools:text="刚刚" />
android:text="刚刚" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_option"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world">
<ImageView
android:id="@+id/iv_like_pic"
@@ -260,15 +264,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_24"
android:paddingTop="@dimen/dp_6"
android:paddingStart="@dimen/dp_12"
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_6"
android:paddingEnd="0dp"
android:paddingBottom="@dimen/dp_6"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_item_more"
app:layout_constraintBottom_toBottomOf="@id/cl_option"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/cl_option"
app:layout_constraintBottom_toBottomOf="@id/cl_option"
tools:visibility="visible" />
<View
@@ -276,8 +280,8 @@
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_15"
android:background="#353548"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -296,5 +300,4 @@
tools:text="250条评论" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/module_community/res/layout/item_worlds_choose.xml
View File

@@ -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 @@
<View
android:layout_width="220dp"
android:layout_height="1dp"
android:background="@color/color_F4F4F4"
android:background="@color/color_4F516A"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_world_desc"
app:layout_constraintTop_toBottomOf="@id/rriv_world"

7
app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java
View File

@@ -9,6 +9,7 @@ import androidx.core.content.ContextCompat;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;
import com.yizhuan.erban.base.BaseMvpActivity;
@@ -65,7 +66,7 @@ public class AllTopicActivity extends BaseMvpActivity<IMiniWorldView, MiniWorldP
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_all_topic);
initTitleBar("更多话题");
initWhiteTitleBar("更多话题");
initViews();
mMiniWorldCategoryId = getIntent().getIntExtra(PARAM_MINI_WORLD_CATEGORY_ID, -1);
List<Fragment> fragments = new ArrayList<>();
@@ -87,9 +88,7 @@ public class AllTopicActivity extends BaseMvpActivity<IMiniWorldView, MiniWorldP
@Override
protected void setStatusBar() {
//白底黑字
StatusBarLightModes(true);
StatusBarUtil.transparencyBar(this);
}
@Override

16
app/src/module_mini_world/res/layout/activity_all_topic.xml
View File

@@ -4,33 +4,31 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/color_1c1b22"
android:orientation="vertical"
tools:context="com.yizhuan.erban.miniworld.activity.MiniWorldActivity">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25" />
<com.yizhuan.erban.common.widget.StatusLayout
android:background="@color/white"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/dp_10"
>
android:paddingBottom="@dimen/dp_10">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:visibility="gone"
android:background="@color/white" />
android:visibility="gone" />
<androidx.viewpager.widget.ViewPager
android:layout_below="@+id/magic_indicator"
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_below="@+id/magic_indicator" />
</com.yizhuan.erban.common.widget.StatusLayout>
</LinearLayout>

25
app/src/module_mini_world/res/layout/item_all_topic_list.xml
View File

@@ -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 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
tools:text="100条动态"
android:textColor="@color/color_999999"
app:layout_constraintTop_toTopOf="@id/tv_title"
app:layout_constraintBottom_toBottomOf="@id/tv_title"
android:textColor="@color/color_c6c6e9"
android:textSize="@dimen/sp_13"
/>
app:layout_constraintBottom_toBottomOf="@id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_title"
tools:text="100条动态" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_F4F4F4"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@id/tv_title"
/>
android:background="@color/color_353548"
app:layout_constraintTop_toBottomOf="@id/tv_title" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java
View File

@@ -138,7 +138,7 @@ public abstract class AbstractMvpPresenter<V extends IMvpBaseView> implements Li
};
private void logInfo(String msg) {
if (BuildConfig.DEBUG)
if (false)
Log.e(TAG, msg);
}

2
library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java
View File

@@ -137,7 +137,7 @@ public class BaseMvpProxy<V extends IMvpBaseView, P extends AbstractMvpPresenter
}
private void logInfo(String msg) {
if (BuildConfig.DEBUG)
if (false)
Log.e(TAG, msg);
}
}