Skip to content

Y
YDL-Component-Medical
Commit 23cdea3d by konghaorui
Options

样式统一

parent ada6a1a8
Showing with 163 additions and 113 deletions
app/build.gradle
......@@ -211,7 +211,7 @@ dependencies {
// api rootProject.ext.dependencies["ydl-m-fm-module-ydl"]
// api rootProject.ext.dependencies["ydl-m-fm-api"]
implementation project(':m-fm')
// implementation project(':m-course')
implementation project(':m-course')
implementation modularPublication('com.ydl:m-fm-api')
implementation modularPublication('com.ydl:m-audioim-api')
} else {
......
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -156,13 +156,13 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
.navigation()
}
bt_to_home.setOnClickListener {
FragmentContainerActivity.start(this, "YdlHomeFragment")
}
bt_to_mine.setOnClickListener {
FragmentContainerActivity.start(this, "MineFragment")
// startActivity(Intent(this, TestAppActivity::class.java))
// FragmentContainerActivity.start(this, "YdlHomeFragment")
// startActivity(Intent(this, TestAppActivity::class.java))
}
bt_to_test.setOnClickListener {
bt_to_privacy.setOnClickListener {
val dialog = SecretDescriptionDialog(this@MainActivity, "感谢您信任并使用壹点灵APP，\\n\n" +
"我们深知个人隐私的重要性，为了您更好的使用本APP，希望您着重关注：\\n\\n1. 为向您提供交易相关基本功能，我们会收集、使用必要的信息;\\n\n" +
"2. 基于您的明示授权，我们可能会获取您的位置(为您提供附近的咨询师等)、设备号信息(以保障您账号与交易安全)等信息，您有权拒绝或取消授权;\\n\n" +
......
app/src/main/java/com/ydl/component/base/DemoAppLifecycles.kt
......@@ -58,7 +58,7 @@ class DemoAppLifecycles : IAppLifecycles {
TestPlugin.testDelegate = object:TestPlugin.TestPluginDelegate{
override fun getHideBack(): Boolean {
return false
return true
}
}
YDLCommonPlugin.pluginDelegate = object:YDLCommonPlugin.CommonPluginDelegate {
......@@ -233,7 +233,6 @@ class DemoAppLifecycles : IAppLifecycles {
LogHelper.getInstance().writeLogSync(e!!.localizedMessage)
}
})
}
......
app/src/main/res/layout/activity_main.xml
......@@ -194,13 +194,21 @@
android:paddingBottom="20dp">
<Button
android:id="@+id/bt_to_test"
android:id="@+id/bt_to_privacy"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="10dp"
android:text="入口" />
<Button
android:id="@+id/bt_to_mine"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="10dp"
android:text="我的" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/values/colors.xml
......@@ -30,7 +30,7 @@
<!-- 分割线颜色-->
<color name="platform_dividing_line_color">#EBEBEB</color>
<!-- 主题色渐变背景颜色 -->
<color name="platform_main_gradient_start_color">#FFDB26</color>
<color name="platform_main_gradient_start_color">#fdbd00</color>
<color name="platform_main_gradient_end_color">#FFD814</color>
<!-- ============ 文字颜色 ============ -->
......
m-confide/src/main/java/com/ydl/confide/home/util/ConfideHomeUtils.kt
......@@ -459,11 +459,11 @@ class ConfideHomeUtils {
when (status) {
IConfideHomeConfig.FILTER_STATUS_NORMAL -> {
tv.setTextColor(ContextCompat.getColor(mContext, R.color._6))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_un, 0)
}
IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> {
tv.setTextColor(ContextCompat.getColor(mContext, R.color.platform_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.confide_ic_arrow_drop_down_green_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_en, 0)
}
}
}
......@@ -479,17 +479,17 @@ class ConfideHomeUtils {
tv.setTextColor(ContextCompat.getColor(mContext, R.color.platform_main_theme))
}
}
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_un, 0)
}
//更改筛选选项的按钮 图标
private fun updateOthersTextDrawable(mContext: Context, tv: AppCompatTextView, status: Int) {
when (status) {
IConfideHomeConfig.FILTER_STATUS_NORMAL -> {
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_un, 0)
}
IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> {
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.confide_ic_arrow_drop_down_green_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_en, 0)
}
}
}
......
m-confide/src/main/res/drawable/confide_common_bg.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/platform_main_theme_light"
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_gradient_end_color"
android:endColor="@color/platform_main_gradient_start_color"
android:angle="0" />
</shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_confidehome_bg.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/platform_main_theme_light"
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_gradient_end_color"
android:endColor="@color/platform_main_gradient_start_color"
android:angle="0" />
</shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_consult_btn_bg.xml
......@@ -3,8 +3,8 @@
android:shape="rectangle">
<gradient
android:startColor="#FFDB26"
android:endColor="#FFD814"/>
android:startColor="@color/platform_main_gradient_end_color"
android:endColor="@color/platform_main_gradient_start_color"/>
<corners android:radius="15dp" />
......
m-confide/src/main/res/layout/confide_home_activity.xml
......@@ -52,7 +52,7 @@
android:paddingLeft="@dimen/confide_dp_20"
android:paddingRight="@dimen/confide_dp_20"
android:text="一键倾诉"
android:textColor="@color/platform_color_242424"
android:textColor="@color/platform_but_text_color"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
......
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
......@@ -1417,17 +1417,17 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
FILTER_STATUS_NORMAL -> {
tv.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
tv.setTextColor(ContextCompat.getColor(this, R.color.platform_colorTextDefault))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_un, 0)
}
FILTER_STATUS_FILTERED -> {
tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(this, R.color.platform_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_un, 0)
}
FILTER_STATUS_OPEN -> {
tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(this, R.color.platform_colorTextDefault))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.consultant_ic_arrow_drop_down, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_en, 0)
}
}
}
......
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
......@@ -1356,17 +1356,17 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
FILTER_STATUS_NORMAL -> {
tv.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
tv.setTextColor(ContextCompat.getColor(context, R.color.platform_colorTextDefault))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_un, 0)
}
FILTER_STATUS_FILTERED -> {
tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_un, 0)
}
FILTER_STATUS_OPEN -> {
tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(context, R.color.platform_colorTextDefault))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.consultant_ic_arrow_drop_down, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_arrow_drop_down_en, 0)
}
}
}
......
m-course/src/main/AndroidManifest.xml
......@@ -20,6 +20,7 @@
android:theme="@style/CoursePosterShowTheme" />
<activity
android:name=".coursePlay.CourseCommentActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize" />
<activity
......@@ -54,6 +55,7 @@
/>
<activity
android:name=".course_special_list.activity.CourseSpecialListActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<service android:name="com.lzf.easyfloat.service.FloatService" />
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
......@@ -293,14 +293,14 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
sort_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_grey_500_18dp,
R.drawable.platform_arrow_drop_down_un,
0
)
}
sort_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_green_18dp,
R.drawable.platform_arrow_drop_down_en,
0
)
popupWindow.showAsDropDown(view_line)
......@@ -353,7 +353,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_grey_500_18dp,
R.drawable.platform_arrow_drop_down_un,
0
)
}
......@@ -366,7 +366,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_green_18dp,
R.drawable.platform_arrow_drop_down_en,
0
)
popupWindow.showAsDropDown(view_line)
......@@ -422,7 +422,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_grey_500_18dp,
R.drawable.platform_arrow_drop_down_un,
0
)
}
......@@ -435,7 +435,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_green_18dp,
R.drawable.platform_arrow_drop_down_en,
0
)
popupWindow.showAsDropDown(view_line)
......@@ -665,7 +665,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_grey_500_18dp,
R.drawable.platform_arrow_drop_down_un,
0
)
}
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/widget/CourseSortPopupWindow.kt
......@@ -66,7 +66,7 @@ class CourseSortPopupWindow(val context: Context, var selectedSort: String, priv
}
private fun setSelect(textView: TextView) {
textView.setTextColor(ContextCompat.getColor(context, R.color.course_color_1DA1F2))
textView.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
textView.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
}
......
m-course/src/main/java/com/yidianling/course/coursePlay/CourseCommentActivity.kt
......@@ -10,6 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.utils.log.LogHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.CourseConstants
......@@ -40,6 +41,9 @@ class CourseCommentActivity : BaseActivity() {
}
}
override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(true, statusBarDarkMode = true)
}
override fun layoutResId(): Int {
return R.layout.activity_course_commeny
}
......
m-course/src/main/java/com/yidianling/course/course_special_list/activity/CourseSpecialListActivity.kt
......@@ -5,6 +5,7 @@ import android.support.v4.widget.SwipeRefreshLayout
import android.support.v7.widget.LinearLayoutManager
import android.view.View
import com.ydl.ydlcommon.base.BaseMvpActivity
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.view.swapelayout.YDLAdapterWrapper
import com.ydl.ydlcommon.view.swapelayout.YDLSwipeToLoadHelper
import com.yidianling.common.tools.ToastUtil
......@@ -15,8 +16,8 @@ import com.yidianling.course.course_special_list.contract.ICourseSpecialListCont
import com.yidianling.course.course_special_list.event.CourseSpecialListEventImpl
import com.yidianling.course.course_special_list.event.ICourseSpecialListEvent
import com.yidianling.course.course_special_list.presenter.CourseSpecialListPresenterImpl
import kotlinx.android.synthetic.main.course_special_list_activity.*
import kotlinx.android.synthetic.main.course_layout_title_bar.*
import kotlinx.android.synthetic.main.course_special_list_activity.*
/**
* @author yuanwai
......@@ -50,6 +51,9 @@ class CourseSpecialListActivity :
*/
private var page: Int = 1
override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(true, statusBarDarkMode = true)
}
override fun createPresenter(): ICourseSpecialListContract.Presenter {
return CourseSpecialListPresenterImpl(this)
}
......
m-course/src/main/res/drawable/background_course_comment_push.xml
......@@ -4,7 +4,7 @@
<item android:state_enabled="true">
<shape>
<corners android:radius="16dp"/>
<solid android:color="@color/course_color_FFDB26"/>
<solid android:color="@color/platform_main_theme"/>
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/xlzx/res/drawable/background_course_hot_search.xml → m-course/src/main/res/drawable/background_course_hot_search.xml
......@@ -4,9 +4,9 @@
<item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#EEFFF3" />
<solid android:color="@color/platform_main_theme_bright" />
<corners android:radius="11dp" />
<stroke android:width="0.5dp" android:color="@color/course_color_34CD65" />
<stroke android:width="0.5dp" android:color="@color/platform_main_theme" />
</shape>
</item>
<item android:state_enabled="true">
......
m-course/src/main/res/drawable/course_comment_item_btn_background.xml
......@@ -4,6 +4,6 @@
<corners android:radius="14dp" />
<solid android:color="@color/course_color_FFDB26" />
<solid android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_select_sel.xml
......@@ -4,7 +4,7 @@
<corners android:radius="4dp" />
<stroke android:color="@color/course_color_1DA1F2" android:width="1px" />
<stroke android:color="@color/platform_main_theme" android:width="1px" />
<solid android:color="@color/course_color_151DA1F2" />
<solid android:color="@color/platform_main_theme_bright" />
</shape>
\ No newline at end of file
m-course/src/main/res/layout/activity_course_commeny.xml
......@@ -41,7 +41,7 @@
android:paddingRight="16dp"
android:paddingBottom="5dp"
android:text="发布"
android:textColor="@color/course_color_242424"
android:textColor="@color/platform_but_text_color"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
......
m-course/src/main/res/layout/activity_courses.xml
......@@ -47,7 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/platform_arrow_drop_down_un"
android:gravity="center"
android:text="综合排序"
android:textColor="@color/platform_main_theme"
......@@ -59,7 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/platform_arrow_drop_down_un"
android:gravity="center"
android:text="分类"
android:textColor="@color/course_color_242424"
......@@ -70,7 +70,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/platform_arrow_drop_down_un"
android:gravity="center"
android:text="筛选"
android:textColor="@color/course_color_242424"
......
m-course/src/main/res/layout/item_course_list.xml
......@@ -49,7 +49,7 @@
android:paddingLeft="11dp"
android:paddingRight="11dp"
android:text="评价课程"
android:textColor="@color/course_color_242424"
android:textColor="@color/platform_but_text_color"
android:textSize="12sp"
android:visibility="invisible" />
......
m-course/src/xlzx/res/color/color_course_filter_selector.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/course_color_34CD65" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/course_color_666666" android:state_enabled="true"/>
</selector>
\ No newline at end of file
m-course/src/ydl/res/drawable/background_course_hot_search.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingDefaultResource">
<item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#E8F6FF"/>
<corners android:radius="11dp"/>
<stroke android:width="0.5dp" android:color="@color/course_color_1DA1F2"/>
</shape>
</item>
<item android:state_enabled="true">
<shape>
<corners android:radius="11dp"/>
<solid android:color="@color/course_color_F5F5F5"/>
</shape>
</item>
</selector>
\ No newline at end of file
m-dynamic/src/main/res/layout/dynamic_activity_thank.xml
......@@ -9,7 +9,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:pa_left_text="取消"
app:pa_title_text="打赏感谢" />
app:pa_title_text="打赏感谢"
android:background="@color/platform_white"
/>
<in.srain.cube.views.ptr.PtrFrameLayout
android:id="@+id/store_house_ptr_frame"
......
m-dynamic/src/main/res/layout/dynamic_activity_trend_details.xml
......@@ -287,7 +287,7 @@
android:layout_weight="1"
android:drawableRight="@drawable/dynamic_msg_next"
android:gravity="center_vertical"
android:textColor="@color/platform_color_blue_3a9efb"
android:textColor="@color/platform_main_theme"
android:textSize="@dimen/dynamic_text_size_17"
tools:text="#小朋友去哪了#" />
</LinearLayout>
......
m-fm/src/main/AndroidManifest.xml
......@@ -5,7 +5,9 @@
<activity android:name=".FMActivity"
android:label="电台页面"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"
/>
<activity android:name=".FMDetailActivity"
android:label="电台详情页面"
......
m-fm/src/main/java/com/yidianling/fm/FMActivity.java
......@@ -3,23 +3,22 @@ package com.yidianling.fm;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.widget.PopupWindow;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.ydl.media.view.PlayTypeEnum;
import com.ydl.media.view.PlayerFloatHelper;
import com.ydl.ydlcommon.adapter.FragmentWithTabPagerAdapter;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.utils.PopUtils;
import com.ydl.ydlcommon.utils.bitmap.ColorUtil;
import com.ydl.ydlcommon.view.SlidingTabLayout;
import com.ydl.ydlcommon.view.TitleBar;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
......@@ -38,6 +37,12 @@ public class FMActivity extends BaseActivity {
private PopupWindow popupWindow;
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
public static Intent newIntent(Activity activity) {
Intent intent = new Intent(activity, FMActivity.class);
return intent;
......
m-fm/src/main/res/layout/fm_activity_fm.xml
......@@ -9,7 +9,8 @@
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:pa_left_start_icon_color="@color/platform_main_theme"
android:background="@color/platform_white"
app:pa_left_start_icon="@drawable/platform_common_back"
app:pa_title_text="心灵电台" />
<FrameLayout
......
m-im/src/main/java/com/yidianling/uikit/custom/widget/ConfideOrderInfoView.java
......@@ -96,7 +96,7 @@ public class ConfideOrderInfoView extends RelativeLayout {
} else if (info.listenOrderCommentStatus == 1) {//订单未评价
tv_status.setText("已结束");
tv_action.setBackground(getResources().getDrawable(R.drawable.im_background_chat_confide_order_action));
tv_action.setTextColor(getResources().getColor(R.color.im_white));
tv_action.setTextColor(getResources().getColor(R.color.platform_but_text_color));
tv_action.setText("去评价");
tv_tips.setVisibility(View.VISIBLE);
}
......
m-im/src/main/res/drawable/im_message_chat_setting_sure_btn_bg.xml
......@@ -3,8 +3,8 @@
android:shape="rectangle">
<gradient
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_theme_light"/>
android:endColor="@color/platform_main_gradient_start_color"
android:startColor="@color/platform_main_gradient_end_color"/>
<corners android:bottomRightRadius="8dp" />
......
m-im/src/main/res/layout/im_message_chat_setting.xml
......@@ -57,7 +57,7 @@
android:gravity="center"
android:text="全部已读"
android:textSize="16dp"
android:textColor="@color/white"
android:textColor="@color/platform_but_text_color"
android:background="@drawable/im_message_chat_setting_sure_btn_bg"/>
</LinearLayout>
......
m-im/src/main/res_uikit/drawable/im_background_chat_confide_order_action.xml
......@@ -5,6 +5,6 @@
<corners android:radius="20dp" />
<gradient
android:endColor="@color/platform_main_theme"
android:startColor="@color/im_color_3DBEF5" />
android:endColor="@color/platform_main_gradient_end_color"
android:startColor="@color/platform_main_gradient_start_color" />
</shape>
m-im/src/main/res_uikit/drawable/im_background_chat_confide_order_stytle.xml
......@@ -4,5 +4,5 @@
<corners android:radius="4dp" />
<solid android:color="#1A1DA1F2" />
<solid android:color="@color/platform_main_theme_bright" />
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/layout/im_nim_message_activity_text_layout.xml
......@@ -113,17 +113,17 @@
android:scaleType="center" />
<TextView
android:id="@+id/buttonSendMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/im_nim_message_button_bottom_send_selector"
android:contentDescription="@string/im_empty"
android:gravity="center"
android:padding="5dp"
android:text="@string/im_send"
android:textColor="@color/im_white"
android:textSize="14sp" />
android:id="@+id/buttonSendMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/platform_bg_radius_5"
android:contentDescription="@string/im_empty"
android:gravity="center"
android:padding="5dp"
android:text="@string/im_send"
android:textColor="@color/platform_but_text_color"
android:textSize="14sp" />
</FrameLayout>
</RelativeLayout>
m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
......@@ -219,7 +219,8 @@
android:orientation="horizontal"
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:visibility="gone">
android:visibility="gone"
>
<TextView
android:id="@+id/im_focus_btn"
......@@ -227,7 +228,7 @@
android:layout_height="20dp"
android:background="@drawable/im_focus_btn_bg"
android:gravity="center"
android:textColor="#1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="12dp"
tools:text="关注" />
......@@ -248,7 +249,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="1"
android:textColor="#1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="12dp"
android:text="评价" />
......@@ -257,7 +258,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="1"
android:textColor="#1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="12dp"
android:layout_marginBottom="1dp"
android:text="(" />
......@@ -268,7 +269,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="1"
android:textColor="#1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="12dp"
tools:text="18714" />
......@@ -277,21 +278,17 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="1"
android:textColor="#1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="12dp"
android:layout_marginBottom="1dp"
android:text=")" />
<ImageView
android:id="@+id/tv_all_comment_go"
android:layout_width="6dp"
android:layout_height="39dp"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:paddingTop="14.5dp"
android:paddingBottom="14.5dp"
android:scaleType="fitXY"
android:src="@drawable/im_comment_list_right_icon" />
android:src="@drawable/platform_right_arrow" />
</LinearLayout>
......
ydl-pay/src/main/AndroidManifest.xml
......@@ -6,6 +6,7 @@
<application>
<activity
android:name=".pay.PayActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
</application>
......
ydl-platform/build.gradle
......@@ -25,6 +25,7 @@ android {
ndk {
abiFilters "armeabi-v7a"
}
vectorDrawables.useSupportLibrary = true
}
lintOptions {
......
ydl-platform/src/main/res/drawable/platform_arrow_drop_down.xml 0 → 100644
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M7,10l5,5 5,-5z" />
</vector>
ydl-platform/src/main/res/drawable/platform_arrow_drop_down_en.xml 0 → 100644
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/platform_main_theme"
android:pathData="M7,10l5,5 5,-5z"/>
</vector>
ydl-platform/src/main/res/drawable/platform_arrow_drop_down_un.xml 0 → 100644
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/platform_text_hint_color"
android:pathData="M7,10l5,5 5,-5z"/>
</vector>
ydl-platform/src/main/res/drawable/platform_bg_radius_5.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp"></corners>
<solid android:color="@color/platform_main_theme" />
<stroke android:width="1dp" android:color="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_right_arrow.xml 0 → 100644
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="31dp"
android:height="31dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/platform_main_theme"
android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
</vector>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment