Skip to content

Y
YDL-Component-Medical
Commit f69402af by konghaorui
Options

consultant 业务模块 - 资源文件前缀修改

parent 3e843120
Showing with 279 additions and 265 deletions
m-consultant/build.gradle
......@@ -2,6 +2,14 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'plugin.resTools' // 资源重命名插件
// 配置资源重命名插件
resConfig {
new_prefix = 'consultant_' // 资源前缀
old_prefix = '' // 老前缀，可为''空字符串
}
kapt {
arguments {
arg("AROUTER_MODULE_NAME", "consultant")
......@@ -35,6 +43,10 @@ android {
}
}
//前缀的名字
resourcePrefix "consultant_"
//Flavor 信息
publishNonDefault true
productFlavors {
ydl {}
......@@ -71,7 +83,4 @@ dependencies {
transitive = true
}
}
}
m-consultant/src/main/AndroidManifest.xml
......@@ -7,12 +7,12 @@
android:name=".ExpertSearchActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"/>
android:theme="@style/consultant_NoTitleTheme"/>
<activity
android:name=".HotSearchActivity"
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"/>
android:theme="@style/consultant_NoTitleTheme"/>
</application>
</manifest>
\ No newline at end of file
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
......@@ -55,11 +55,11 @@ import com.yidianling.consultant.ui.view.AreaPopupWindow
import com.yidianling.consultant.ui.view.CategoryPopupWindow
import com.yidianling.consultant.ui.view.FilterPopupWindow
import com.yidianling.consultant.ui.view.SortPopupWindow
import kotlinx.android.synthetic.main.activity_expert_search_list.*
import kotlinx.android.synthetic.main.item_filter_online.view.*
import kotlinx.android.synthetic.main.layout_search_content.*
import kotlinx.android.synthetic.main.layout_search_head_bg.*
import kotlinx.android.synthetic.main.layout_search_toolbar.*
import kotlinx.android.synthetic.main.consultant_activity_expert_search_list.*
import kotlinx.android.synthetic.main.consultant_item_filter_online.view.*
import kotlinx.android.synthetic.main.consultant_layout_search_content.*
import kotlinx.android.synthetic.main.consultant_layout_search_head_bg.*
import kotlinx.android.synthetic.main.consultant_layout_search_toolbar.*
import org.json.JSONObject
import java.util.concurrent.Executors
......@@ -80,7 +80,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
}
override fun layoutResId(): Int {
return R.layout.activity_expert_search_list
return R.layout.consultant_activity_expert_search_list
}
override fun initDataAndEvent() {
......@@ -389,7 +389,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
}
}
}
banner_search.setImageLoader(GlideImageLoader(R.drawable.expert_banner_default)).setImages(bannerList).start()
banner_search.setImageLoader(GlideImageLoader(R.drawable.consultant_expert_banner_default)).setImages(bannerList).start()
banner_search.setIndicatorBottomPadding(20)
}
......@@ -467,7 +467,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
val popWidth = RxDeviceTool.getScreenWidth(mContext)
val mWidth = (popWidth - RxImageTool.dp2px(10f)) / hotData.size
for ((index, hot) in hotData!!.withIndex()) {
val tv = View.inflate(mContext, R.layout.item_filter_online, null) as TextView
val tv = View.inflate(mContext, R.layout.consultant_item_filter_online, null) as TextView
val textView = tv.tvFree
val params = LinearLayout.LayoutParams(0, RxImageTool.dp2px(22f))
params.weight = 1f
......@@ -844,7 +844,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
isRecommend = false
if (curPage == 1) {
v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, getString(R.string.reload_hint))
v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, getString(R.string.consultant_reload_hint))
v_loading.visibility = View.VISIBLE
ll_network_error.visibility = View.GONE
......@@ -875,7 +875,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
if (msg != null) {
ToastUtil.toastShort(msg)
}
v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, getString(R.string.reload_hint))
v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, getString(R.string.consultant_reload_hint))
v_loading.visibility = View.VISIBLE
ll_network_error.visibility = View.GONE
......@@ -1424,7 +1424,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
}
FILTER_STATUS_FILTERED -> {
tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(this, R.color.main_theme))
tv.setTextColor(ContextCompat.getColor(this, R.color.consultant_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
}
FILTER_STATUS_OPEN -> {
......
m-consultant/src/main/java/com/yidianling/consultant/HotSearchActivity.kt
......@@ -31,8 +31,8 @@ import com.yidianling.consultant.bean.HotSearchPopularDoctorBean
import com.yidianling.consultant.contract.IHotSearchContract
import com.yidianling.consultant.modular.utils.TempH5RouteUtils
import com.yidianling.consultant.presenter.HotSearchPresenterImpl
import kotlinx.android.synthetic.main.activity_hot_search.*
import kotlinx.android.synthetic.main.item_expert_hot_search.view.*
import kotlinx.android.synthetic.main.consultant_activity_hot_search.*
import kotlinx.android.synthetic.main.consultant_item_expert_hot_search.view.*
@Route(path = "/consult/hot_search")
class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchContract.Presenter>(), IHotSearchContract.View {
......@@ -51,7 +51,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
private var dp42: Int = 0
override fun layoutResId(): Int {
return R.layout.activity_hot_search
return R.layout.consultant_activity_hot_search
}
override fun createPresenter(): IHotSearchContract.Presenter {
......@@ -155,7 +155,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
llHotSearch.visibility = View.VISIBLE
flHotSearch.removeAllViews()
for (index in keywordData.indices) {
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false)
val view = LayoutInflater.from(this).inflate(R.layout.consultant_item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = keywordData[index].keyword
view.setOnClickListener {
etSearch.setText(keywordData[index].keyword)
......@@ -175,7 +175,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
expertWidth = 0
flHotExpert.removeAllViews()
for (index in hotSearchExpert.indices) {
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false)
val view = LayoutInflater.from(this).inflate(R.layout.consultant_item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = hotSearchExpert[index].name
if (!TextUtils.isEmpty(hotSearchExpert[index].name)) {
expertWidth += getTextContentWidth(view.findViewById(R.id.tvHotSearch), if (hotSearchExpert[index].name!!.length > 7) hotSearchExpert[index].name!!.substring(0, 8) else hotSearchExpert[index].name!!) + dp42
......@@ -215,7 +215,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
TempH5RouteUtils.tempH5Route(focusList[it].linkUrl)
}
}
banner.setImageLoader(GlideImageLoader(R.drawable.expert_banner_default)).setImages(bannerList).start()
banner.setImageLoader(GlideImageLoader(R.drawable.consultant_expert_banner_default)).setImages(bannerList).start()
banner.setIndicatorBottomPadding(5)
}
......@@ -231,7 +231,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
if (historyList.size > 0) {
for (historyStr in historyList.reversed()) {
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false)
val view = LayoutInflater.from(this).inflate(R.layout.consultant_item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = historyStr
historyCurrentWidth += getTextContentWidth(view.findViewById(R.id.tvHotSearch),
if (historyStr.length > 7) historyStr.substring(0, 8) else historyStr) + RxImageTool.dp2px(50f)
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/CategoryRecyclerViewAdapter.kt
......@@ -8,7 +8,7 @@ import android.view.ViewGroup
import android.widget.TextView
import com.yidianling.consultant.R
import com.yidianling.consultant.model.bean.CateItem
import kotlinx.android.synthetic.main.item_subject.view.*
import kotlinx.android.synthetic.main.consultant_item_subject.view.*
/**
* 主题Recycler适配器
......@@ -25,7 +25,7 @@ class CategoryRecyclerViewAdapter(private val context: Context, private val cate
}
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
val itemView = LayoutInflater.from(context).inflate(R.layout.item_subject, parent, false)
val itemView = LayoutInflater.from(context).inflate(R.layout.consultant_item_subject, parent, false)
return ViewHolder(itemView)
}
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
......@@ -27,12 +27,12 @@ import com.yidianling.consultant.constants.ConsultBIConstants
import com.yidianling.consultant.model.bean.DoctorServiceItem
import com.yidianling.consultant.modular.utils.TempH5RouteUtils
import com.yidianling.consultant.router.ConsultantIn
import kotlinx.android.synthetic.main.expert_search_feedbackrate.view.*
import kotlinx.android.synthetic.main.expert_search_item_view.view.*
import kotlinx.android.synthetic.main.expert_search_products_item.view.*
import kotlinx.android.synthetic.main.item_empty.view.*
import kotlinx.android.synthetic.main.item_footer.view.*
import kotlinx.android.synthetic.main.item_tag.view.*
import kotlinx.android.synthetic.main.consultant_expert_search_feedbackrate.view.*
import kotlinx.android.synthetic.main.consultant_expert_search_item_view.view.*
import kotlinx.android.synthetic.main.consultant_expert_search_products_item.view.*
import kotlinx.android.synthetic.main.consultant_item_empty.view.*
import kotlinx.android.synthetic.main.consultant_item_footer.view.*
import kotlinx.android.synthetic.main.consultant_item_tag.view.*
/**
* 专家服务列表适配器
......@@ -63,8 +63,8 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
val itemBean = listData[position]
//头像
val headConfig = SimpleImageOpConfiger()
headConfig.loadingPic = R.drawable.avatar_def_circle
headConfig.errorPic = R.drawable.avatar_def_circle
headConfig.loadingPic = R.drawable.consultant_avatar_def_circle
headConfig.errorPic = R.drawable.consultant_avatar_def_circle
expertSearchView.showImage(itemBean.head,holder.imgHead,holder.imgHead.width,holder.imgHead.height,headConfig)
//姓名
holder.tvName.text = itemBean.name
......@@ -112,16 +112,16 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
//能力等级标签
if (1 == itemBean.abilityLevel){
//实习
holder.imgAbilityLevel.background = context.resources.getDrawable(R.drawable.expert_search_shixi)
holder.imgAbilityLevel.background = context.resources.getDrawable(R.drawable.consultant_expert_search_shixi)
holder.imgAbilityLevel.visibility = View.VISIBLE
}else if (2 == itemBean.abilityLevel){
//新手
holder.imgAbilityLevel.background = context.resources.getDrawable(R.drawable.expert_search_xinshou)
holder.imgAbilityLevel.background = context.resources.getDrawable(R.drawable.consultant_expert_search_xinshou)
holder.imgAbilityLevel.visibility = View.VISIBLE
}
// else if (3 == itemBean.abilityLevel){
// //精英
// holder.imgAbilityLevel.background = context.resources.getDrawable(R.drawable.expert_search_jingying)
// holder.imgAbilityLevel.background = context.resources.getDrawable(R.drawable.consultant_expert_search_jingying)
// holder.imgAbilityLevel.visibility = View.VISIBLE
// }
else{
......@@ -133,8 +133,8 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
expertSearchView.showImage(itemBean.tagsIcon.serviceFreeIcon,holder.imgServiceFree)
}else{
val sp = SimpleImageOpConfiger()
sp.loadingPic = R.drawable.service_free
sp.errorPic = R.drawable.service_free
sp.loadingPic = R.drawable.consultant_service_free
sp.errorPic = R.drawable.consultant_service_free
expertSearchView.showImage("",holder.imgServiceFree,sp)
}
holder.imgServiceFree.visibility = View.VISIBLE
......@@ -147,8 +147,8 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
expertSearchView.showImage(itemBean.tagsIcon.newEnterIcon,holder.imgNewEnter)
}else{
val sp = SimpleImageOpConfiger()
sp.loadingPic = R.drawable.new_enter
sp.errorPic = R.drawable.new_enter
sp.loadingPic = R.drawable.consultant_new_enter
sp.errorPic = R.drawable.consultant_new_enter
expertSearchView.showImage("",holder.imgNewEnter,sp)
}
holder.imgNewEnter.visibility = View.VISIBLE
......@@ -157,13 +157,13 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
}
holder.ll_feedbackRate.removeAllViews()
for (num in 1..5){
val view = LayoutInflater.from(context).inflate(R.layout.expert_search_feedbackrate, holder.ll_feedbackRate, false)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_expert_search_feedbackrate, holder.ll_feedbackRate, false)
if (itemBean.feedbackRate >= num){
(view.imgRate as ImageView).background = context.resources.getDrawable(R.drawable.expert_search_full_star)
(view.imgRate as ImageView).background = context.resources.getDrawable(R.drawable.consultant_expert_search_full_star)
}else if (itemBean.feedbackRate < num && itemBean.feedbackRate > num - 1){
(view.imgRate as ImageView).background = context.resources.getDrawable(R.drawable.expert_search_half_star)
(view.imgRate as ImageView).background = context.resources.getDrawable(R.drawable.consultant_expert_search_half_star)
}else{
(view.imgRate as ImageView).background = context.resources.getDrawable(R.drawable.expert_search_nothing_star)
(view.imgRate as ImageView).background = context.resources.getDrawable(R.drawable.consultant_expert_search_nothing_star)
}
holder.ll_feedbackRate.addView(view)
}
......@@ -178,7 +178,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
val tagList = itemBean.tags!!.split("|")
for (tag in tagList) {
if (!TextUtils.isEmpty(tag)){
val view = LayoutInflater.from(context).inflate(R.layout.item_tag, holder.ll_tags, false)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_item_tag, holder.ll_tags, false)
view.tvTag.text = tag
holder.ll_tags.addView(view)
}
......@@ -206,17 +206,17 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
holder.ll_products.removeAllViews()
if (null != itemBean.products && !itemBean.products.isEmpty()){
for (item in itemBean.products) {
val view = LayoutInflater.from(context).inflate(R.layout.expert_search_products_item, holder.ll_tags, false)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_expert_search_products_item, holder.ll_tags, false)
if (1 == item.isPackage){
view.tvTitle.text = "单次"
view.tvTitle.setTextColor(context.resources.getColor(R.color.platform_color_1DA1F2))
view.tvTitle.background = context.resources.getDrawable(R.drawable.expert_search_single)
view.tvTitle.background = context.resources.getDrawable(R.drawable.consultant_expert_search_single)
view.tvContent.text = item.name
holder.ll_products.addView(view)
} else if (2 == item.isPackage){
view.tvTitle.text = "套餐"
view.tvTitle.setTextColor(context.resources.getColor(R.color.color_FF9500))
view.tvTitle.background = context.resources.getDrawable(R.drawable.expert_search_menu)
view.tvTitle.setTextColor(context.resources.getColor(R.color.consultant_color_FF9500))
view.tvTitle.background = context.resources.getDrawable(R.drawable.consultant_expert_search_menu)
view.tvContent.text = item.name
holder.ll_products.addView(view)
}else{
......@@ -228,7 +228,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
if (hasMore) {
holder.itemView.visibility = View.VISIBLE
holder.pbLoading.visibility = View.VISIBLE
holder.tvHint.text = context.getString(R.string.loading)
holder.tvHint.text = context.getString(R.string.consultant_loading)
} else {
holder.pbLoading.visibility = View.GONE
holder.tvHint.text = context.getString(R.string.platform_no_more)
......@@ -245,15 +245,15 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): RecyclerView.ViewHolder =
when (viewType) {
NORMAL_VIEW -> {
val view = LayoutInflater.from(context).inflate(R.layout.expert_search_item_view, parent, false)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_expert_search_item_view, parent, false)
NormalViewHolder(view)
}
FOOT_VIEW -> {
val view = LayoutInflater.from(context).inflate(R.layout.item_footer, parent, false)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_item_footer, parent, false)
FooterViewHolder(view)
}
else -> {
val view = LayoutInflater.from(context).inflate(R.layout.item_empty, parent, false)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_item_empty, parent, false)
EmptyViewHolder(view)
}
}
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/RegionRecyclerViewAdapter.kt
......@@ -9,7 +9,7 @@ import android.view.ViewGroup
import com.ydl.ydlcommon.adapter.MyBaseAdapter
import com.yidianling.consultant.R
import com.yidianling.consultant.model.bean.RegionItem
import kotlinx.android.synthetic.main.item_region.view.*
import kotlinx.android.synthetic.main.consultant_item_region.view.*
@Suppress("DEPRECATION")
/**
......@@ -31,7 +31,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList<
//选中状态
holder.itemView.tvRegionName.setTypeface(Typeface.DEFAULT_BOLD)
// holder.itemView.tvRegionName.setBackgroundColor(Color.rgb(255, 255, 255))
holder.itemView.tvRegionName.setTextColor(context.resources.getColor(R.color.main_theme))
holder.itemView.tvRegionName.setTextColor(context.resources.getColor(R.color.consultant_main_theme))
holder.itemView.view_select.visibility = View.VISIBLE
} else {
//未选中状态
......@@ -46,7 +46,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList<
override fun getItemCount(): Int = regionList.size + 1
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
val view = LayoutInflater.from(context).inflate(R.layout.item_region, parent, false)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_item_region, parent, false)
return ViewHolder(view)
}
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/SortRecyclerViewAdapter.kt
......@@ -10,7 +10,7 @@ import android.view.ViewGroup
import com.yidianling.consultant.R
import com.yidianling.consultant.listener.OnSortItemSelectedListener
import com.yidianling.consultant.model.bean.ReorderItem
import kotlinx.android.synthetic.main.item_sort.view.*
import kotlinx.android.synthetic.main.consultant_item_sort.view.*
/**
* Created by zqk on 17-9-20.
......@@ -23,7 +23,7 @@ class SortRecyclerViewAdapter(private val context: Context,
override fun getItemCount(): Int = sortItems.size
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
val itemView = LayoutInflater.from(context).inflate(R.layout.item_sort, parent, false)
val itemView = LayoutInflater.from(context).inflate(R.layout.consultant_item_sort, parent, false)
return ViewHolder(itemView)
}
......@@ -33,7 +33,7 @@ class SortRecyclerViewAdapter(private val context: Context,
holder.tvSort.text = item.value
if (item.key == selectedSort.key) {
holder.tvSort.setTypeface(Typeface.DEFAULT_BOLD)
holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.main_theme))
holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.consultant_main_theme))
// holder.ivCheck.visibility = View.VISIBLE
}
}
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/SubRecyclerViewAdapter.kt
......@@ -10,7 +10,7 @@ import android.view.ViewGroup
import com.ydl.ydlcommon.adapter.MyBaseAdapter
import com.yidianling.consultant.R
import com.yidianling.consultant.model.bean.SubItem
import kotlinx.android.synthetic.main.item_consult_type.view.*
import kotlinx.android.synthetic.main.consultant_item_consult_type.view.*
/**
* 城市列表适配器
......@@ -30,7 +30,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte
if (selectedSub.key == region.key) {
//选中状态
holder.itemView.tvConsultTypeName.setTypeface(Typeface.DEFAULT_BOLD)
holder.itemView.tvConsultTypeName.setTextColor(ContextCompat.getColor(context,R.color.main_theme))
holder.itemView.tvConsultTypeName.setTextColor(ContextCompat.getColor(context,R.color.consultant_main_theme))
// holder.itemView.ivCheckCircle.visibility = View.VISIBLE
} else {
//未选中状态
......@@ -44,7 +44,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte
override fun getItemCount(): Int = subList.size + 1
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
val view = LayoutInflater.from(context).inflate(R.layout.item_consult_type, parent, false)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_item_consult_type, parent, false)
return ViewHolder(view)
}
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/AreaPopupWindow.kt
......@@ -15,7 +15,7 @@ import com.yidianling.consultant.adapter.RegionRecyclerViewAdapter
import com.yidianling.consultant.adapter.SubRecyclerViewAdapter
import com.yidianling.consultant.model.bean.RegionItem
import com.yidianling.consultant.model.bean.SubItem
import kotlinx.android.synthetic.main.ui_region_popup_window.view.*
import kotlinx.android.synthetic.main.consultant_ui_region_popup_window.view.*
/**
* 地区选择弹窗
......@@ -32,7 +32,7 @@ class AreaPopupWindow(val context: Context, regionList: ArrayList<RegionItem>,
init {
subList.addAll(selectedRegion.sub)
val view = LayoutInflater.from(context).inflate(R.layout.ui_region_popup_window, null)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_ui_region_popup_window, null)
this.contentView = view
this.isFocusable = true
@Suppress("DEPRECATION")
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/CategoryPopupWindow.kt
......@@ -13,7 +13,7 @@ import com.yidianling.consultant.R
import com.yidianling.consultant.adapter.CategoryRecyclerViewAdapter
import com.yidianling.consultant.listener.OnCategoriesSelectedListener
import com.yidianling.consultant.model.bean.CateItem
import kotlinx.android.synthetic.main.ui_subject_popup_window.view.*
import kotlinx.android.synthetic.main.consultant_ui_subject_popup_window.view.*
/**
* 主题弹窗
......@@ -24,7 +24,7 @@ class CategoryPopupWindow(context: Context, categories: ArrayList<CateItem>, sel
var onSubjectsSelectedListener: OnCategoriesSelectedListener? = null
init {
val view = LayoutInflater.from(context).inflate(R.layout.ui_subject_popup_window, null)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_ui_subject_popup_window, null)
this.contentView = view
this.isFocusable = true
@Suppress("DEPRECATION")
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/FilterPopupWindow.kt
......@@ -33,9 +33,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.item_filter.view.*
import kotlinx.android.synthetic.main.item_price_range.view.*
import kotlinx.android.synthetic.main.ui_filter_popup.view.*
import kotlinx.android.synthetic.main.consultant_item_filter.view.*
import kotlinx.android.synthetic.main.consultant_item_price_range.view.*
import kotlinx.android.synthetic.main.consultant_ui_filter_popup.view.*
/**
......@@ -67,7 +67,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
var etMaxPrice: EditText? = null
init {
val view = LayoutInflater.from(context).inflate(R.layout.ui_filter_popup, null)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_ui_filter_popup, null)
dp5 = RxImageTool.dip2px(5f)
dp10 = RxImageTool.dip2px(10f)
......@@ -86,7 +86,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
this.setBackgroundDrawable(BitmapDrawable())
this.isOutsideTouchable = true
this.animationStyle = R.style.expert_service_popupwindow_filter_anim_style
this.animationStyle = R.style.consultant_expert_service_popupwindow_filter_anim_style
initShowTypeViews(view)
initEnquiryViews(view)
......@@ -270,12 +270,12 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
//按钮置灰/解除置灰
contentView.btnConfirm.isEnabled = it > 0
if (it > 0) {
contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.confirm_text_color))
contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.bg_radius_5_dark)
// contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.white))
contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_confirm_text_color))
contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.consultant_bg_radius_5_dark)
// contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_white))
} else {
contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.confirm_text_hint_color))
contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.bg_radius_5_light)
contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_confirm_text_hint_color))
contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.consultant_bg_radius_5_light)
// contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.color_999999))
}
......@@ -297,7 +297,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun initOtherViews(view: View) {
val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3
for ((index, other) in filterData!!.other!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView
val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, dp36)
val marginNum = dp5
params.setMargins(marginNum + (dp10 + mWidth) * (index % 3),
......@@ -334,7 +334,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
val mWidth = (popWidth - RxImageTool.dp2px(40f)) / 2
var float = 46f
for ((index, other) in filterData!!.title!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView
val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
// val params = FrameLayout.LayoutParams(mWidth,FrameLayout.LayoutParams.WRAP_CONTENT)
val params = FrameLayout.LayoutParams(mWidth, dp36)
val marginNum = dp5
......@@ -376,7 +376,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun initAgeViews(view: View) {
val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3
for ((index, age) in filterData!!.age!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView
val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(36f))
val marginNum = RxImageTool.dp2px(5f)
params.setMargins(marginNum + (dp10 + mWidth) * (index % 3),
......@@ -412,7 +412,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun initEnquiryViews(view: View) {
val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3
for ((index, enquiry) in filterData!!.enquiry!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView
val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(36f))
val marginNum = RxImageTool.dp2px(5f)
params.setMargins(marginNum + (RxImageTool.dp2px(10f) + mWidth) * (index % 3),
......@@ -445,7 +445,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
}
private fun initPriceViews(view: View) {
val priceRange = View.inflate(context, R.layout.item_price_range, null) as LinearLayout
val priceRange = View.inflate(context, R.layout.consultant_item_price_range, null) as LinearLayout
etMinPrice = priceRange.findViewById<EditText>(R.id.etMinPrice);
etMaxPrice = priceRange.findViewById<EditText>(R.id.etMaxPrice);
......@@ -499,7 +499,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3
for ((index, priceRangesItem) in filterData!!.priceRanges!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView
val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(48f))
val marginNum = RxImageTool.dp2px(2f)
params.setMargins(marginNum + (RxImageTool.dp2px(10f) + mWidth) * (index % 3),
......@@ -578,7 +578,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun initShowTypeViews(view: View) {
val mWidth = (popWidth - RxImageTool.dp2px(42f)) / 2
for ((index, showType) in filterData.showType.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView
val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, dp36)
val marginNum = dp5
var textMarginLeft = marginNum + (dp10 + mWidth) * (index % 2)
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/SortPopupWindow.kt
......@@ -10,7 +10,7 @@ import com.yidianling.consultant.R
import com.yidianling.consultant.adapter.SortRecyclerViewAdapter
import com.yidianling.consultant.listener.OnSortItemSelectedListener
import com.yidianling.consultant.model.bean.ReorderItem
import kotlinx.android.synthetic.main.ui_sort_popup_window.view.*
import kotlinx.android.synthetic.main.consultant_ui_sort_popup_window.view.*
/**
* 排序弹窗
......@@ -22,7 +22,7 @@ class SortPopupWindow(val context: Context, private val sortItems: ArrayList<Reo
private var adapter: SortRecyclerViewAdapter
init {
val view = LayoutInflater.from(context).inflate(R.layout.ui_sort_popup_window, null)
val view = LayoutInflater.from(context).inflate(R.layout.consultant_ui_sort_popup_window, null)
this.contentView = view
this.isFocusable = true
@Suppress("DEPRECATION")
......
m-consultant/src/main/res/color/color_search_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/filter_content_text_color_en" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/filter_content_text_color_un" android:state_enabled="true"/>
</selector>
\ No newline at end of file
m-consultant/src/main/res/color/consultant_color_search_filter_selector.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/consultant_filter_content_text_color_en" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/consultant_filter_content_text_color_un" android:state_enabled="true"/>
</selector>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_blue_but.xml → m-consultant/src/main/res/drawable/consultant_bg_blue_but.xml
......@@ -5,5 +5,5 @@
<solid android:color="#F2faff"/>
<stroke
android:width="1dp"
android:color="@color/main_theme"/>
android:color="@color/consultant_main_theme"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_radius_5_dark.xml → m-consultant/src/main/res/drawable/consultant_bg_radius_5_dark.xml
......@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="@color/confirm_bg_color" />
<solid android:color="@color/consultant_confirm_bg_color" />
<stroke
android:width="1dp"
android:color="@color/confirm_bg_color" />
android:color="@color/consultant_confirm_bg_color" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_radius_5_light.xml → m-consultant/src/main/res/drawable/consultant_bg_radius_5_light.xml
......@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="@color/main_theme_light" />
<solid android:color="@color/consultant_main_theme_light" />
<stroke
android:width="1dp"
android:color="@color/main_theme_light" />
android:color="@color/consultant_main_theme_light" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_radius_line_green_5.xml → m-consultant/src/main/res/drawable/consultant_bg_radius_line_green_5.xml
......@@ -5,5 +5,5 @@
<solid android:color="@color/platform_white" />
<stroke
android:width="1dp"
android:color="@color/main_theme" />
android:color="@color/consultant_main_theme" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_search_filter_selector.xml → m-consultant/src/main/res/drawable/consultant_bg_search_filter_selector.xml
......@@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/main_theme_bright" />
<solid android:color="@color/consultant_main_theme_bright" />
<corners android:radius="4dp"/>
<stroke
android:width="0.5dp"
android:color="@color/main_theme"/>
android:color="@color/consultant_main_theme"/>
</shape>
</item>
<item android:state_enabled="true">
......
m-consultant/src/main/res/drawable/bg_search_filter_selector_radius11.xml → m-consultant/src/main/res/drawable/consultant_bg_search_filter_selector_radius11.xml
......@@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/main_theme_bright" />
<solid android:color="@color/consultant_main_theme_bright" />
<corners android:radius="11dp"/>
<stroke
android:width="0.5dp"
android:color="@color/main_theme"/>
android:color="@color/consultant_main_theme"/>
</shape>
</item>
<item android:state_enabled="true">
......
m-consultant/src/main/res/layout/activity_expert_search_list.xml → m-consultant/src/main/res/layout/consultant_activity_expert_search_list.xml
......@@ -7,7 +7,7 @@
android:orientation="vertical">
<include
layout="@layout/layout_search_toolbar"
layout="@layout/consultant_layout_search_toolbar"
android:layout_width="match_parent"
android:layout_height="48dp" />
......@@ -15,14 +15,14 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBg"
android:background="@color/consultant_colorBg"
tools:ignore="InefficientWeight">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorBg"
android:background="@color/consultant_colorBg"
android:clipChildren="false"
android:clipToPadding="false"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
......@@ -35,13 +35,13 @@
android:clipToPadding="false"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<include layout="@layout/layout_search_head_bg" />
<include layout="@layout/consultant_layout_search_head_bg" />
</android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
<include layout="@layout/layout_search_content" />
<include layout="@layout/consultant_layout_search_content" />
<!--<include layout="@layout/layout_search_head_input"/>-->
......
m-consultant/src/main/res/layout/activity_hot_search.xml → m-consultant/src/main/res/layout/consultant_activity_hot_search.xml
......@@ -15,7 +15,7 @@
<RelativeLayout
android:id="@+id/rl_search"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
android:layout_height="@dimen/consultant_title_bar_height"
android:focusable="true"
android:focusableInTouchMode="true"
android:paddingLeft="15dp"
......@@ -27,7 +27,7 @@
android:layout_height="32dp"
android:layout_centerVertical="true"
android:layout_marginRight="60dp"
android:background="@drawable/bg_hot_search_input"
android:background="@drawable/consultant_bg_hot_search_input"
android:tag="tag_search_input_bg" />
<ImageView
......@@ -38,7 +38,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="10dp"
android:scaleType="centerCrop"
android:src="@drawable/icon_input_search"
android:src="@drawable/consultant_icon_input_search"
android:tag="tag_search_input_img" />
<EditText
......@@ -60,7 +60,7 @@
android:tag="tag_search_input_edit"
android:textColor="#242424"
android:textColorHint="#b3b3b3"
android:textCursorDrawable="@color/main_theme"
android:textCursorDrawable="@color/consultant_main_theme"
android:textSize="13sp" />
<ImageView
......@@ -127,7 +127,7 @@
android:layout_width="28dp"
android:layout_height="28dp"
android:padding="5dp"
android:src="@drawable/hot_search_delete_icon" />
android:src="@drawable/consultant_hot_search_delete_icon" />
</LinearLayout>
......@@ -216,8 +216,8 @@
android:scaleType="centerCrop"
android:tag="overScroll"
app:pa_indicator_different_width="14dp"
app:pa_indicator_drawable_selected="@drawable/banner_indicator_select"
app:pa_indicator_drawable_unselected="@drawable/banner_indicator_unselect"
app:pa_indicator_drawable_selected="@drawable/consultant_banner_indicator_select"
app:pa_indicator_drawable_unselected="@drawable/consultant_banner_indicator_unselect"
app:pa_indicator_height="5dp"
app:pa_indicator_margin="1.25dp"
app:pa_is_selected_same_unselected="false" />
......
m-consultant/src/main/res/layout/expert_search_feedbackrate.xml → m-consultant/src/main/res/layout/consultant_expert_search_feedbackrate.xml
......@@ -5,6 +5,6 @@
android:layout_height="@dimen/platform_dp_11"
android:layout_marginRight="@dimen/platform_dp_2"
android:scaleType="fitXY"
android:background="@drawable/expert_search_full_star">
android:background="@drawable/consultant_expert_search_full_star">
</ImageView>
m-consultant/src/main/res/layout/expert_search_item_view.xml → m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml
......@@ -15,7 +15,7 @@
android:layout_marginTop="@dimen/platform_dp_15"
android:layout_marginLeft="1.5dp"
android:padding="0.5dp"
android:background="@drawable/bg_radius_line_gray_05"
android:background="@drawable/consultant_bg_radius_line_gray_05"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:layout_width="92dp"
......@@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/avatar_def_circle"
android:src="@drawable/consultant_avatar_def_circle"
/>
</android.support.v7.widget.CardView>
</LinearLayout>
......@@ -39,7 +39,7 @@
android:layout_gravity="bottom"
android:scaleType="centerCrop"
android:layout_alignBottom="@+id/cvHead"
app:srcCompat="@drawable/online_yue"
app:srcCompat="@drawable/consultant_online_yue"
tools:visibility="visible"
android:visibility="gone"/>
......@@ -50,7 +50,7 @@
android:layout_gravity="bottom"
android:scaleType="centerCrop"
android:layout_alignBottom="@+id/cvHead"
app:srcCompat="@drawable/online_server"
app:srcCompat="@drawable/consultant_online_server"
tools:visibility="visible"
android:visibility="gone"/>
......@@ -89,7 +89,7 @@
android:layout_height="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_4"
android:scaleType="centerCrop"
tools:background="@drawable/service_free"
tools:background="@drawable/consultant_service_free"
android:layout_marginStart="@dimen/platform_dp_4" />
<!--新驻图标-->
<ImageView
......@@ -98,7 +98,7 @@
android:layout_height="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_4"
android:scaleType="fitCenter"
tools:background="@drawable/new_enter"
tools:background="@drawable/consultant_new_enter"
android:layout_marginStart="@dimen/dp_4" />
<!--优质图标-->
<ImageView
......@@ -107,7 +107,7 @@
android:layout_height="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_4"
android:scaleType="fitCenter"
tools:background="@drawable/expert_search_shixi"
tools:background="@drawable/consultant_expert_search_shixi"
android:layout_marginStart="@dimen/platform_dp_4"
android:visibility="gone"/>
</LinearLayout>
......@@ -346,7 +346,7 @@
android:gravity="center"
android:textSize="@dimen/platform_dp_13"
android:textStyle="bold"
android:background="@drawable/expert_search_chat"
android:background="@drawable/consultant_expert_search_chat"
android:textColor="@color/platform_color_242424"
android:text="私聊"/>
......@@ -360,13 +360,13 @@
android:layout_toRightOf="@+id/cvHead"
android:layout_marginLeft="@dimen/platform_dp_15"
android:visibility="gone"
android:background="@drawable/bg_radius_gray_2">
android:background="@drawable/consultant_bg_radius_gray_2">
<ImageView
android:layout_width="12dp"
android:layout_height="11dp"
android:layout_marginTop="@dimen/platform_dp_6"
android:layout_marginLeft="@dimen/platform_dp_8"
android:src="@drawable/bg_item_desc"/>
android:src="@drawable/consultant_bg_item_desc"/>
<TextView
android:id="@+id/tvDesc"
android:layout_width="match_parent"
......
m-consultant/src/main/res/layout/expert_search_products_item.xml → m-consultant/src/main/res/layout/consultant_expert_search_products_item.xml
......@@ -9,7 +9,7 @@
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/expert_search_single"
android:background="@drawable/consultant_expert_search_single"
android:textColor="@color/platform_color_1DA1F2"
android:layout_gravity="center_vertical"
android:paddingRight="@dimen/platform_dp_3"
......
m-consultant/src/main/res/layout/item_consult_type.xml → m-consultant/src/main/res/layout/consultant_item_consult_type.xml
......@@ -23,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_check"
android:src="@drawable/consultant_ic_check"
android:visibility="invisible"/>
</LinearLayout>
m-consultant/src/main/res/layout/item_empty.xml → m-consultant/src/main/res/layout/consultant_item_empty.xml
......@@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/blank" />
android:src="@drawable/consultant_blank" />
<TextView
android:layout_width="match_parent"
......@@ -28,10 +28,10 @@
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:background="@drawable/bg_radius_line_green_5"
android:background="@drawable/consultant_bg_radius_line_green_5"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/platform_search_by_category"
android:textColor="@color/main_theme" />
android:textColor="@color/consultant_main_theme" />
</LinearLayout>
m-consultant/src/main/res/layout/item_expert_hot_search.xml → m-consultant/src/main/res/layout/consultant_item_expert_hot_search.xml
......@@ -6,7 +6,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginBottom="6dp"
android:background="@drawable/expert_hot_search_bg"
android:background="@drawable/consultant_expert_hot_search_bg"
android:ellipsize="end"
android:gravity="center"
android:maxEms="9"
......
m-consultant/src/main/res/layout/item_filter.xml → m-consultant/src/main/res/layout/consultant_item_filter.xml
......@@ -6,13 +6,13 @@
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_marginBottom="4dp"
android:background="@drawable/bg_search_filter_selector"
android:background="@drawable/consultant_bg_search_filter_selector"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:orientation="vertical"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:textColor="@color/color_search_filter_selector"
android:textColor="@color/consultant_color_search_filter_selector"
android:textSize="13dp"
tools:text="按专家显示" />
m-consultant/src/main/res/layout/item_filter_online.xml → m-consultant/src/main/res/layout/consultant_item_filter_online.xml
......@@ -6,11 +6,11 @@
android:layout_height="22dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/bg_search_filter_selector_radius11"
android:background="@drawable/consultant_bg_search_filter_selector_radius11"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/color_search_filter_selector"
android:textSize="@dimen/text_size_12"
android:textColor="@color/consultant_color_search_filter_selector"
android:textSize="@dimen/consultant_text_size_12"
tools:layout_width="80dp"
tools:text="今天有空今天有空" />
m-consultant/src/main/res/layout/item_footer.xml → m-consultant/src/main/res/layout/consultant_item_footer.xml
......@@ -16,10 +16,10 @@
<TextView
android:id="@+id/tvHint"
android:textSize="@dimen/text_size_12"
android:textSize="@dimen/consultant_text_size_12"
android:textColor="#707070"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading" />
android:text="@string/consultant_loading" />
</LinearLayout>
m-consultant/src/main/res/layout/item_price_range.xml → m-consultant/src/main/res/layout/consultant_item_price_range.xml
......@@ -27,7 +27,7 @@
android:background="@drawable/shape_round_gray_bored"
android:inputType="number"
android:maxLines="1"
android:textCursorDrawable="@color/main_theme"
android:textCursorDrawable="@color/consultant_main_theme"
android:textSize="13sp"
android:maxLength="7"
/>
......@@ -46,7 +46,7 @@
android:background="@drawable/shape_round_gray_bored"
android:inputType="number"
android:maxLines="1"
android:textCursorDrawable="@color/main_theme"
android:textCursorDrawable="@color/consultant_main_theme"
android:textSize="13sp"
android:maxLength="7"
/>
......
m-consultant/src/main/res/layout/item_region.xml → m-consultant/src/main/res/layout/consultant_item_region.xml
......@@ -10,7 +10,7 @@
android:layout_width="4dp"
android:layout_height="21dp"
android:layout_gravity="center_vertical"
android:background="@color/main_theme"
android:background="@color/consultant_main_theme"
android:visibility="invisible"/>
<TextView
android:id="@+id/tvRegionName"
......
m-consultant/src/main/res/layout/item_sort.xml → m-consultant/src/main/res/layout/consultant_item_sort.xml
......@@ -24,7 +24,7 @@
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:contentDescription="@null"
android:src="@drawable/ic_check"
android:src="@drawable/consultant_ic_check"
android:visibility="gone" />
</RelativeLayout>
m-consultant/src/main/res/layout/item_subject.xml → m-consultant/src/main/res/layout/consultant_item_subject.xml
......@@ -5,9 +5,9 @@
android:layout_width="match_parent"
android:layout_height="36dp"
android:gravity="center"
android:textColor="@color/color_search_filter_selector"
android:textColor="@color/consultant_color_search_filter_selector"
android:orientation="vertical"
android:background="@drawable/bg_search_filter_selector"
android:background="@drawable/consultant_bg_search_filter_selector"
android:textSize="14dp"
tools:text="恋爱婚姻" />
m-consultant/src/main/res/layout/item_tag.xml → m-consultant/src/main/res/layout/consultant_item_tag.xml
......@@ -4,7 +4,7 @@
android:id="@+id/tvTag"
android:layout_width="wrap_content"
android:layout_height="14dp"
android:background="@drawable/bg_radius_line_gray_1"
android:background="@drawable/consultant_bg_radius_line_gray_1"
android:gravity="center"
android:paddingLeft="4dp"
android:layout_marginRight="6dp"
......
m-consultant/src/main/res/layout/layout_search_content.xml → m-consultant/src/main/res/layout/consultant_layout_search_content.xml
......@@ -25,7 +25,7 @@
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/tvSubject"
style="@style/FilterTextViewStyle"
style="@style/consultant_FilterTextViewStyle"
android:layout_width="0dp"
android:layout_weight="1"
android:width="0dp"
......@@ -36,7 +36,7 @@
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/tvArea"
style="@style/FilterTextViewStyle"
style="@style/consultant_FilterTextViewStyle"
android:layout_width="0dp"
android:layout_weight="1"
android:width="0dp"
......@@ -47,7 +47,7 @@
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/tvSort"
style="@style/FilterTextViewStyle"
style="@style/consultant_FilterTextViewStyle"
android:layout_width="0dp"
android:layout_weight="1"
android:width="0dp"
......@@ -58,7 +58,7 @@
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/tvFilter"
style="@style/FilterTextViewStyle"
style="@style/consultant_FilterTextViewStyle"
android:layout_width="0dp"
android:layout_weight="1"
android:width="0dp"
......@@ -130,26 +130,26 @@
android:id="@+id/iv_exception"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/img_netwrok_error"/>
android:src="@drawable/consultant_img_netwrok_error"/>
<TextView
android:id="@+id/tv_reload_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reload_hint"/>
android:text="@string/consultant_reload_hint"/>
<TextView
android:id="@+id/tv_reload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_16"
android:background="@drawable/bg_blue_but"
android:background="@drawable/consultant_bg_blue_but"
android:paddingLeft="@dimen/platform_dp_32"
android:paddingTop="@dimen/platform_dp_8"
android:paddingRight="@dimen/platform_dp_32"
android:paddingBottom="@dimen/platform_dp_8"
android:text="重新加载"
android:textColor="@color/main_theme"/>
android:textColor="@color/consultant_main_theme"/>
</LinearLayout>
<ImageButton
......@@ -162,7 +162,7 @@
android:layout_marginBottom="20dp"
android:background="@color/platform_transparent"
android:padding="0dp"
android:src="@drawable/ico_totop"
android:src="@drawable/consultant_ico_totop"
android:visibility="gone"
/>
......
m-consultant/src/main/res/layout/layout_search_head_bg.xml → m-consultant/src/main/res/layout/consultant_layout_search_head_bg.xml
......@@ -28,8 +28,8 @@
android:layout_height="99dp"
android:scaleType="centerCrop"
app:pa_indicator_different_width="14dp"
app:pa_indicator_drawable_selected="@drawable/banner_indicator_select"
app:pa_indicator_drawable_unselected="@drawable/banner_indicator_unselect"
app:pa_indicator_drawable_selected="@drawable/consultant_banner_indicator_select"
app:pa_indicator_drawable_unselected="@drawable/consultant_banner_indicator_unselect"
app:pa_indicator_height="5dp"
app:pa_indicator_margin="1.25dp"
app:pa_is_selected_same_unselected="false"
......
m-consultant/src/main/res/layout/layout_search_toolbar.xml → m-consultant/src/main/res/layout/consultant_layout_search_toolbar.xml
......@@ -15,7 +15,7 @@
android:layout_centerVertical="true"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@null"
app:srcCompat="@drawable/icon_back_black" />
app:srcCompat="@drawable/consultant_icon_back_black" />
<LinearLayout
android:id="@+id/rl_search"
......@@ -25,14 +25,14 @@
android:layout_marginRight="22dp"
android:layout_marginBottom="7dp"
android:layout_weight="1"
android:background="@drawable/bg_radius_line_gray_16"
android:background="@drawable/consultant_bg_radius_line_gray_16"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="12dp"
android:src="@drawable/icon_search_zixun" />
android:src="@drawable/consultant_icon_search_zixun" />
<TextView
android:id="@+id/tv_search_content"
......@@ -55,7 +55,7 @@
android:layout_height="match_parent"
android:layout_marginRight="2dp"
android:background="?android:attr/selectableItemBackground"
android:drawableTop="@drawable/icon_service_black"
android:drawableTop="@drawable/consultant_icon_service_black"
android:gravity="center"
android:paddingTop="7dp"
android:text="客服"
......@@ -68,7 +68,7 @@
android:layout_height="match_parent"
android:layout_marginRight="16dp"
android:background="?android:attr/selectableItemBackground"
android:drawableTop="@drawable/icon_guide_black"
android:drawableTop="@drawable/consultant_icon_guide_black"
android:gravity="center"
android:paddingTop="7dp"
android:text="咨询指南"
......
m-consultant/src/main/res/layout/ui_filter_popup.xml → m-consultant/src/main/res/layout/consultant_ui_filter_popup.xml
......@@ -142,7 +142,7 @@
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_weight="1"
android:background="@drawable/bg_radius_gray_6"
android:background="@drawable/consultant_bg_radius_gray_6"
android:gravity="center"
android:text="@string/platform_reset"
android:textColor="@color/platform_color_999999"
......@@ -155,11 +155,11 @@
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_weight="2"
android:background="@drawable/bg_radius_5_light"
android:background="@drawable/consultant_bg_radius_5_light"
android:gravity="center"
android:hint="暂无匹配咨询师"
android:textColorHint="@color/platform_color_E0E0E0"
android:textColor="@color/confirm_text_color"
android:textColor="@color/consultant_confirm_text_color"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
m-consultant/src/main/res/layout/ui_subject_popup_window.xml → m-consultant/src/main/res/layout/consultant_ui_subject_popup_window.xml
......@@ -32,10 +32,10 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="19dp"
android:background="@drawable/bg_radius_5_dark"
android:background="@drawable/consultant_bg_radius_5_dark"
android:gravity="center"
android:text="@string/platform_confirm"
android:textSize="17dp"
android:textColor="@color/confirm_text_color" />
android:textColor="@color/consultant_confirm_text_color" />
</LinearLayout>
m-consultant/src/main/res/values-hdpi/dimens.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--字体大小部分-->
<dimen name="default_text_size_small">12sp</dimen>
<dimen name="default_text_size">14sp</dimen>
<dimen name="default_text_size_big">16sp</dimen>
<dimen name="default_text_size_large">18sp</dimen>
<dimen name="consultant_default_text_size_small">12sp</dimen>
<dimen name="consultant_default_text_size">14sp</dimen>
<dimen name="consultant_default_text_size_big">16sp</dimen>
<dimen name="consultant_default_text_size_large">18sp</dimen>
<!--距离部分-->
<dimen name="default_dis_size_micro">4dp</dimen>
<dimen name="default_dis_size_small">6dp</dimen>
<dimen name="default_dis_size">8dp</dimen>
<dimen name="default_dis_size_big">10dp</dimen>
<dimen name="default_dis_size_large">12dp</dimen>
<dimen name="default_dis_size_huge">14dp</dimen>
<dimen name="consultant_default_dis_size_micro">4dp</dimen>
<dimen name="consultant_default_dis_size_small">6dp</dimen>
<dimen name="consultant_default_dis_size">8dp</dimen>
<dimen name="consultant_default_dis_size_big">10dp</dimen>
<dimen name="consultant_default_dis_size_large">12dp</dimen>
<dimen name="consultant_default_dis_size_huge">14dp</dimen>
<!--分割线粗细-->
<dimen name="divide_line_stroke_width">1px</dimen>
<dimen name="consultant_divide_line_stroke_width">1px</dimen>
</resources>
m-consultant/src/main/res/values-xhdpi/dimens.xml
......@@ -2,29 +2,29 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!--字体大小部分-->
<dimen name="default_text_size_small">12sp</dimen>
<dimen name="default_text_size">14sp</dimen>
<dimen name="default_text_size_big">16sp</dimen>
<dimen name="default_text_size_large">18sp</dimen>
<dimen name="consultant_default_text_size_small">12sp</dimen>
<dimen name="consultant_default_text_size">14sp</dimen>
<dimen name="consultant_default_text_size_big">16sp</dimen>
<dimen name="consultant_default_text_size_large">18sp</dimen>
<!--距离部分-->
<dimen name="default_dis_size_micro">5dp</dimen>
<dimen name="default_dis_size_small">7.5dp</dimen>
<dimen name="default_dis_size">10dp</dimen>
<dimen name="default_dis_size_big">12.5dp</dimen>
<dimen name="default_dis_size_large">15dp</dimen>
<dimen name="default_dis_size_huge">17.5dp</dimen>
<dimen name="consultant_default_dis_size_micro">5dp</dimen>
<dimen name="consultant_default_dis_size_small">7.5dp</dimen>
<dimen name="consultant_default_dis_size">10dp</dimen>
<dimen name="consultant_default_dis_size_big">12.5dp</dimen>
<dimen name="consultant_default_dis_size_large">15dp</dimen>
<dimen name="consultant_default_dis_size_huge">17.5dp</dimen>
<!--dialog部分-->
<!--分割线粗细-->
<dimen name="divide_line_stroke_width">0.5dp</dimen>
<dimen name="consultant_divide_line_stroke_width">0.5dp</dimen>
<!--TitleBar高度-->
<dimen name="title_bar_height">45dp</dimen>
<dimen name="consultant_title_bar_height">45dp</dimen>
<!--JumpTextView部分-->
<dimen name="jump_text_view_min_height">55dp</dimen>
<dimen name="jump_text_view_icon_size">25dp</dimen>
<dimen name="consultant_jump_text_view_min_height">55dp</dimen>
<dimen name="consultant_jump_text_view_icon_size">25dp</dimen>
<!--JumpDraweeView部分-->
......
m-consultant/src/main/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- google color-->
<color name="google_yellow">#fdbd00</color>
<color name="color_FF9500">#FF9500</color>
<color name="consultant_google_yellow">#fdbd00</color>
<color name="consultant_color_FF9500">#FF9500</color>
<!--app主要颜色-->
<color name="white">#ffffff</color>
<color name="theme_bg">#FAFAFA</color>
<color name="default_text_color">#555555</color>
<color name="default_text_color_hint">#333333</color>
<color name="divide_color">#EDEDED</color>
<color name="place_holder_color">#DDDDDD</color>
<color name="transparent">#00FFFFFF</color>
<color name="price_color">#EC7100</color>
<color name="tag_text">#777777</color>
<color name="f5f5f5">#f5f5f5</color>
<color name="black_deep">#FF000000</color>
<color name="line">#e5e5e5</color>
<color name="consultant_white">#ffffff</color>
<color name="consultant_theme_bg">#FAFAFA</color>
<color name="consultant_default_text_color">#555555</color>
<color name="consultant_default_text_color_hint">#333333</color>
<color name="consultant_divide_color">#EDEDED</color>
<color name="consultant_place_holder_color">#DDDDDD</color>
<color name="consultant_transparent">#00FFFFFF</color>
<color name="consultant_price_color">#EC7100</color>
<color name="consultant_tag_text">#777777</color>
<color name="consultant_f5f5f5">#f5f5f5</color>
<color name="consultant_black_deep">#FF000000</color>
<color name="consultant_line">#e5e5e5</color>
<!--最后删除-->
<color name="colorTextDefault">#555555</color>
<color name="consultant_colorTextDefault">#555555</color>
<!-- main bg color -->
......@@ -30,19 +30,19 @@
<!-- contact -->
<!-- setting -->
<color name="color_black_ff666666">#ff666666</color>
<color name="consultant_color_black_ff666666">#ff666666</color>
<!--云信　ｅｎｄ-->
<color name="text_gray">#B6B6B6</color>
<color name="consultant_text_gray">#B6B6B6</color>
<color name="title_bottom_line_bg">#DDDDDD</color>
<color name="consultant_title_bottom_line_bg">#DDDDDD</color>
<!--动态-->
<!--动态顶部title背景变色-->
<color name="color_black_333333">#333333</color>
<color name="colorBg">#f5f5f5</color>
<color name="consultant_color_black_333333">#333333</color>
<color name="consultant_colorBg">#f5f5f5</color>
</resources>
m-consultant/src/main/res/values/dimens.xml
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="consultant_activity_vertical_margin">16dp</dimen>
<!--动态-->
......@@ -8,9 +8,9 @@
<!-- map -->
<dimen name="text_size_12">12sp</dimen>
<dimen name="text_size_15">15sp</dimen>
<dimen name="consultant_text_size_12">12sp</dimen>
<dimen name="consultant_text_size_15">15sp</dimen>
<dimen name="title_bar_height">48dp</dimen>
<dimen name="consultant_title_bar_height">48dp</dimen>
</resources>
m-consultant/src/main/res/values/strings.xml
<resources>
<string name="app_name">consultant</string>
<string name="attend_course_success">报名成功</string>
<string name="theme">主题</string>
<string name="area">地区</string>
<string name="sort">排序</string>
<string name="filter">筛选</string>
<string name="reset">重置</string>
<string name="confirm">确定</string>
<string name="no_more">没有更多了</string>
<string name="no_search_result">没有符合条件的内容</string>
<string name="search_by_category">按主题搜索看看</string>
<string name="search_hint">搜索话题、咨询师姓名</string>
<string name="need_storage_permission_hint">App正常工作需要内部存储使用权限，请开启</string>
<string name="user_protocol">用户协议</string>
<string name="next_step">下一步</string>
<string name="finish">完成</string>
<string name="nickname_hint">设置一个昵称，方便大家认识你哦(最多10个字)</string>
<string name="please_select_gender">请选择性别</string>
<string name="register_success">注册成功</string>
<string name="private_safe_hint">设置手势密码，保障安全隐私</string>
<string name="gson_parse_error">解析错误</string>
<string name="consultant_app_name">consultant</string>
<string name="consultant_attend_course_success">报名成功</string>
<string name="consultant_theme">主题</string>
<string name="consultant_area">地区</string>
<string name="consultant_sort">排序</string>
<string name="consultant_filter">筛选</string>
<string name="consultant_reset">重置</string>
<string name="consultant_confirm">确定</string>
<string name="consultant_no_more">没有更多了</string>
<string name="consultant_no_search_result">没有符合条件的内容</string>
<string name="consultant_search_by_category">按主题搜索看看</string>
<string name="consultant_search_hint">搜索话题、咨询师姓名</string>
<string name="consultant_need_storage_permission_hint">App正常工作需要内部存储使用权限，请开启</string>
<string name="consultant_user_protocol">用户协议</string>
<string name="consultant_next_step">下一步</string>
<string name="consultant_finish">完成</string>
<string name="consultant_nickname_hint">设置一个昵称，方便大家认识你哦(最多10个字)</string>
<string name="consultant_please_select_gender">请选择性别</string>
<string name="consultant_register_success">注册成功</string>
<string name="consultant_private_safe_hint">设置手势密码，保障安全隐私</string>
<string name="consultant_gson_parse_error">解析错误</string>
<!--网络提示模块-->
<string name="network_error">请检查网络连接！</string>
<string name="timeout">网络超时！</string>
<string name="httperror">请求失败</string>
<string name="consultant_network_error">请检查网络连接！</string>
<string name="consultant_timeout">网络超时！</string>
<string name="consultant_httperror">请求失败</string>
<string name="loading">正在加载中...</string>
<string name="consultant_loading">正在加载中...</string>
<!-- 个人名片 -->
<string name="reload_hint">加载失败，换个网络环境试试吧</string>
<string name="consultant_reload_hint">加载失败，换个网络环境试试吧</string>
</resources>
m-consultant/src/main/res/values/styles.xml
<resources>
<style name="FilterTextViewStyle">
<style name="consultant_FilterTextViewStyle">
<item name="android:layout_height">40dp</item>
<item name="android:textSize">14sp</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:gravity">center</item>
</style>
<style name="NoTitleTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="consultant_NoTitleTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/main_theme</item>
<item name="colorPrimaryDark">@color/main_theme</item>
<item name="colorAccent">@color/main_theme</item>
<item name="colorPrimary">@color/consultant_main_theme</item>
<item name="colorPrimaryDark">@color/consultant_main_theme</item>
<item name="colorAccent">@color/consultant_main_theme</item>
</style>
<style name="expert_service_popupwindow_filter_anim_style">
<style name="consultant_expert_service_popupwindow_filter_anim_style">
<!-- 指定显示的动画xml -->
<item name="android:windowEnterAnimation">@anim/expert_service_popupwindow_filter_show_anim</item>
<item name="android:windowExitAnimation">@anim/expert_service_popupwindow_filter_hide_anim</item>
<item name="android:windowEnterAnimation">@anim/consultant_expert_service_popupwindow_filter_show_anim</item>
<item name="android:windowExitAnimation">@anim/consultant_expert_service_popupwindow_filter_hide_anim</item>
</style>
</resources>
m-consultant/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="main_theme">#fdbd00</color>
<color name="consultant_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="main_theme_light">#FFEC8C</color>
<color name="consultant_main_theme_light">#FFEC8C</color>
<!--主题亮色-->
<color name="main_theme_bright">#fffae0</color>
<color name="consultant_main_theme_bright">#fffae0</color>
<!--确认按钮背景颜色-->
<color name="confirm_bg_color">#FFDD33</color>
<color name="consultant_confirm_bg_color">#FFDD33</color>
<!--确认按钮字体颜色-->
<color name="confirm_text_color">#242424</color>
<color name="consultant_confirm_text_color">#242424</color>
<!--确认按钮提示字体颜色-->
<color name="confirm_text_hint_color">#666666</color>
<color name="consultant_confirm_text_hint_color">#666666</color>
<!--筛选条件选择框字体颜色-->
<color name="filter_content_text_color_en">#242424</color>
<color name="filter_content_text_color_un">#555555</color>
<color name="consultant_filter_content_text_color_en">#242424</color>
<color name="consultant_filter_content_text_color_un">#555555</color>
</resources>
m-consultant/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="main_theme">#1da1f2</color>
<color name="consultant_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="main_theme_light">#60BDF5</color>
<color name="consultant_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="main_theme_bright">#E8F6FF</color>
<color name="consultant_main_theme_bright">#E8F6FF</color>
<!--确认按钮背景颜色-->
<color name="confirm_bg_color">#1da1f2</color>
<color name="consultant_confirm_bg_color">#1da1f2</color>
<!--确认按钮颜色-->
<color name="confirm_text_color">#ffffff</color>
<color name="consultant_confirm_text_color">#ffffff</color>
<!--确认提示颜色-->
<color name="confirm_text_hint_color">#60ffffff</color>
<color name="consultant_confirm_text_hint_color">#60ffffff</color>
<!--筛选条件选择框字体颜色-->
<color name="filter_content_text_color_en">#1da1f2</color>
<color name="filter_content_text_color_un">#242424</color>
<color name="consultant_filter_content_text_color_en">#1da1f2</color>
<color name="consultant_filter_content_text_color_un">#242424</color>
</resources>
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