调整暗黑模式

app/src/main/java/cn/dankal/client/adapter/shop/GridImageAdapter.java

@@ -26,6 +26,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.dankal.basiclib.DankalApplication;
 import cn.dankal.client.R;
 
 /**
@@ -119,7 +120,11 @@ public class GridImageAdapter extends
     public void onBindViewHolder(final ViewHolder viewHolder, final int position) {
         //少于8张，显示继续添加的图标
         if (getItemViewType(position) == TYPE_CAMERA) {
-            viewHolder.mImg.setImageResource(R.mipmap.pic_mall_order_comment);
+            if (DankalApplication.isDarkMode()){
+                viewHolder.mImg.setImageResource(R.mipmap.ic_evaluation_increase);
+            }else {
+                viewHolder.mImg.setImageResource(R.mipmap.ic_evaluation_increase_s);
+            }
             viewHolder.mImg.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {

app/src/main/java/cn/dankal/client/ui/home/MenuItemFragment.java

@@ -208,7 +208,7 @@ public class MenuItemFragment extends BaseFragment {
 
         if (TextUtils.isEmpty(lat)) {
             if (bottomItemAdapter != null && rlRoundList != null)
-                bottomItemAdapter.setEmptyView(UIUtile.getView(R.layout.adapter_layout_empty_data, rlRoundList));
+                bottomItemAdapter.setEmptyView(UIUtile.getView(R.layout.adapter_layout_empty_data_one, rlRoundList));
             return;
         }
         //请求附近商家信息
@@ -223,7 +223,7 @@ public class MenuItemFragment extends BaseFragment {
                 dataBeans.clear();
                 if (bottomAroundEntity.getData() == null || bottomAroundEntity.getData().size() == 0) {
                     if (bottomItemAdapter != null && rlRoundList != null) {
-                        bottomItemAdapter.setEmptyView(UIUtile.getView(R.layout.adapter_layout_empty_data, rlRoundList));
+                        bottomItemAdapter.setEmptyView(UIUtile.getView(R.layout.adapter_layout_empty_data_one, rlRoundList));
                     }
                 } else {
                     dataBeans.addAll(bottomAroundEntity.getData());
@@ -244,7 +244,6 @@ public class MenuItemFragment extends BaseFragment {
                 startActivity(new Intent(getActivity(), RecommendMerchantActivity.class).putExtra(RecommendMerchantActivity.UUID, uuid));
                 break;
             case R.id.tv_item_filter:
-
                 showTopDialog();
                 break;
         }
@@ -352,12 +351,9 @@ public class MenuItemFragment extends BaseFragment {
         popupWindow = new MyPopupWindow(view, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, true);
         popupWindow.setBackgroundDrawable(new ColorDrawable(0x00000000));
         popupWindow.setAnimationStyle(R.style.take_pop_window_anim_top);
-        if (DankalApplication.isDarkMode()) {
-            popupWindow.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.BOTTOM, 0, 0);
-        } else {
-            popupWindow.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.CENTER, 0, 0);
 
-        }
+        popupWindow.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.BOTTOM, 0, 0);
+
         setBackgroundAlpha(0.5f);
         popupWindow.update();
         popupWindow.setOnDismissListener(() -> {

app/src/main/java/cn/dankal/client/ui/personal/order/food/OrderDetailsActivity.kt

@@ -8,6 +8,7 @@ import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.base.callback.DKCallBackBoolean
 import cn.dankal.basiclib.base.callback.DKCallBackBooleanObject
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
+import cn.dankal.basiclib.rx.AbstractNoDialogSubscriber
 import cn.dankal.basiclib.util.ToastUtils
 import cn.dankal.basiclib.widget.dialog.CallListDialog
 import cn.dankal.entities.personal.OrderHotelDetail
@@ -137,6 +138,8 @@ class OrderDetailsActivity : BaseActivity(), View.OnClickListener, CallListDialo
 
         listDialog = CallListDialog(this, R.layout.dialog_item_list, intArrayOf(R.id.btn_commit, R.id.iv_dialog_close), 0)
         listDialog?.setOnCenterItemClickListener(this)
+
+        showLoadingDialog()
     }
 
     override fun onResume() {
@@ -147,7 +150,7 @@ class OrderDetailsActivity : BaseActivity(), View.OnClickListener, CallListDialo
     }
 
     private fun requestData(it: String) {
-        UserServiceFactory.orderHotelDetail(it).subscribe(object : AbstractDialogSubscriber<OrderHotelDetail>(this) {
+        UserServiceFactory.orderHotelDetail(it).subscribe(object : AbstractNoDialogSubscriber<OrderHotelDetail>(this) {
             override fun onNext(t: OrderHotelDetail) {
                 orderHotelDetail = t
                 t.apply {

app/src/main/res/layout-night/activity_dishes_details.xml

@@ -22,7 +22,7 @@
             android:orientation="vertical">
 
 
-            <cn.dankal.basiclib.widget.banner.DkBanner
+            <cn.dankal.basiclib.widget.banner.DkBannerTow
                 android:id="@+id/banner"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />

app/src/main/res/layout-night/activity_home.xml

@@ -30,13 +30,15 @@
 
 
     <android.support.v7.widget.LinearLayoutCompat
-        android:id="@+id/ll_home_layout"
         android:layout_width="match_parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_height="0dp"
+        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_state_bar"
-        android:layout_height="0dp">
+        app:layout_constraintVertical_bias="0.0">
 
 
         <RelativeLayout
@@ -76,6 +78,7 @@
                 android:overScrollMode="never"
                 android:scrollbars="none">
 
+
                 <android.support.v7.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -84,7 +87,7 @@
                     <com.flyco.tablayout.SlidingTabLayout
                         android:id="@+id/sliding_tabs"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="30dp"
                         android:layout_marginLeft="@dimen/dp_10"
                         android:layout_marginTop="@dimen/dp_17"
                         tl:tl_indicator_color="@color/color_fffbbc39"
@@ -92,8 +95,8 @@
                         tl:tl_indicator_width_equal_title="true"
                         tl:tl_tab_padding="@dimen/dp_8"
                         tl:tl_tab_space_equal="false"
-                        tl:tl_textSelectColor="@color/color33"
-                        tl:tl_textUnselectColor="#686868"
+                        tl:tl_textSelectColor="@color/white"
+                        tl:tl_textUnselectColor="@color/color_d3d3d3"
                         tl:tl_textsize="17sp"
                         tl:tl_underline_color="@color/white"
                         tl:tl_underline_height="0dp" />

app/src/main/res/layout-night/activity_merchant_details.xml

@@ -253,7 +253,7 @@
                     tl:tl_textSelectColor="@color/white"
                     tl:tl_textUnselectColor="@color/color_a6a6a6"
                     tl:tl_textsize="@dimen/sp_15"
-                    tl:tl_underline_color="@color/color_d3d3d3"
+                    tl:tl_underline_color="@color/color_3d3d3d"
                     tl:tl_underline_height="@dimen/dp_1" />
 
             </LinearLayout>

app/src/main/res/layout-night/activity_order_details.xml

@@ -160,7 +160,7 @@
                     android:layout_marginTop="@dimen/dp_15"
                     android:layout_marginRight="@dimen/dp_20"
                     android:layout_marginBottom="@dimen/dp_15"
-                    android:background="@color/line_one" />
+                    android:background="@color/color_29ebebeb" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -268,7 +268,7 @@
                     android:layout_marginLeft="@dimen/dp_20"
                     android:layout_marginRight="@dimen/dp_20"
                     android:layout_marginBottom="@dimen/dp_15"
-                    android:background="@drawable/bg_remark"
+                    android:background="@drawable/bg_remark_night"
                     android:paddingLeft="@dimen/dp_16"
                     android:paddingTop="@dimen/dp_9"
                     android:paddingRight="@dimen/dp_16"

app/src/main/res/layout-night/activity_order_result.xml

@@ -69,7 +69,7 @@
                 android:layout_height="@dimen/dimen_1_dp"
                 android:layout_marginLeft="@dimen/dp_18"
                 android:layout_marginRight="@dimen/dp_18"
-                android:background="@color/line_one" />
+                android:background="@color/color_29ebebeb" />
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/rv_order_result"
@@ -98,7 +98,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/dp_18"
-                    android:textColor="@color/font_313131"
+                    android:textColor="@color/color_d3d3d3"
                     android:textSize="@dimen/sp_16" />
             </LinearLayout>
 
@@ -109,6 +109,7 @@
                 android:orientation="horizontal"
                 android:paddingLeft="@dimen/dp_20"
                 android:paddingTop="@dimen/dp_14"
+                android:visibility="gone"
                 android:paddingRight="@dimen/dp_20"
                 android:paddingBottom="@dimen/dp_14">
 
@@ -141,7 +142,7 @@
                 android:layout_height="@dimen/dimen_1_dp"
                 android:layout_marginLeft="@dimen/dp_23"
                 android:layout_marginRight="@dimen/dp_23"
-                android:background="@color/line_one" />
+                android:background="@color/color_29ebebeb" />
 
             <LinearLayout
                 android:id="@+id/ll_remark"
@@ -157,7 +158,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableLeft="@mipmap/ic_home_order_details_remarks"
+                    android:drawableLeft="@mipmap/ic_complete_note"
                     android:drawablePadding="@dimen/dp_10"
                     android:text="@string/remarks"
                     android:textColor="@color/color_a6a6a6"
@@ -183,7 +184,7 @@
                 android:layout_height="@dimen/dimen_1_dp"
                 android:layout_marginLeft="@dimen/dp_23"
                 android:layout_marginRight="@dimen/dp_23"
-                android:background="@color/line_one" />
+                android:background="@color/color_29ebebeb" />
 
             <LinearLayout
                 android:layout_width="match_parent"

app/src/main/res/layout-night/dialog_item_call.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_32"
+        android:background="@drawable/bg_shop_item_night"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_39"
+            android:text="@string/whether_to_dial_the_customer_service_hotline"
+            android:textColor="@color/color_a6a6a6"
+            android:textSize="@dimen/sp_18" />
+
+        <TextView
+            android:id="@+id/tv_store_phone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_6"
+            android:layout_marginBottom="@dimen/dp_15"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_19" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dimen_1_dp"
+            android:background="@color/colorE5" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_50"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_cancel"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="@string/cancel"
+                android:textColor="@color/color_a6a6a6"
+                android:textSize="@dimen/sp_18" />
+
+            <TextView
+                android:layout_width="@dimen/dimen_1_dp"
+                android:layout_height="match_parent"
+                android:background="@color/colorE5" />
+
+            <TextView
+                android:id="@+id/tv_item_call"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="@string/dial"
+                android:textColor="@color/btn_bg"
+                android:textSize="@dimen/sp_18" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/ic_details_phone"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout-night/fragment_details_info.xml

@@ -25,7 +25,6 @@
                 android:layout_marginTop="@dimen/dp_4"
                  android:paddingLeft="@dimen/dp_4"
                 android:paddingRight="@dimen/dp_4"
-                android:visibility="gone"
                 android:src="@mipmap/ic_home_details_location_1" />
 
             <TextView

app/src/main/res/layout-night/item_order_child.xml

@@ -84,7 +84,7 @@
         android:layout_height="@dimen/dimen_1_dp"
         android:layout_marginLeft="@dimen/dp_18"
         android:layout_marginRight="@dimen/dp_18"
-        android:background="@color/line_one"
+        android:background="@color/color_29ebebeb"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>

baselib/src/main/java/cn/dankal/basiclib/domain/TokenInterceptor.java

@@ -27,6 +27,13 @@ public class TokenInterceptor implements Interceptor {
                 break;
             case 1:
                 language = "ko";
+                break;
+            case 2:
+                language = "en";
+                break;
+            case 3:
+                language = "jpn";
+                break;
         }
         Request originalRequest = chain.request();
 //        originalRequest.newBuilder().header("Content-Type", "application/json;charset=UTF-8").build();

baselib/src/main/java/cn/dankal/basiclib/rx/AbstractNoDialogSubscriber.java

+package cn.dankal.basiclib.rx;
+
+import cn.dankal.basiclib.base.BaseView;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * @author Dankal Android Developer
+ * @since 2018/7/18
+ */
+
+public abstract class AbstractNoDialogSubscriber<T> extends AbstractSubscriber<T> {
+
+    public AbstractNoDialogSubscriber(BaseView view) {
+        super(view);
+    }
+
+
+    @Override
+    public void onError(Throwable e) {
+        super.onError(e);
+        if (view != null) view.dismissLoadingDialog();
+    }
+
+
+    @Override
+    public void onComplete() {
+        if (view != null) view.dismissLoadingDialog();
+        super.onComplete();
+    }
+
+    @Override
+    public void onSubscribe(Disposable d) {
+        super.onSubscribe(d);
+    }
+
+}

baselib/src/main/java/cn/dankal/basiclib/util/language/LocalManageUtil.java

@@ -31,6 +31,10 @@ public class LocalManageUtil {
                 return Locale.SIMPLIFIED_CHINESE;
             case 1:
                 return Locale.KOREA;
+            case 2:
+                return Locale.ENGLISH;
+            case 3:
+                return Locale.JAPANESE;
             default:
                 return Locale.getDefault();
         }

baselib/src/main/res/drawable/bg_remark_night.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="@dimen/dp_1"
+        android:color="#29ebebeb" />
+</shape>
\ No newline at end of file

baselib/src/main/res/layout-night/adapter_layout_empty_food_car.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_200"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="@dimen/dp_100"
+        android:layout_height="@dimen/dp_100"
+        android:src="@mipmap/ic_order_confirmation" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_13"
+        android:text="@string/no_merchandise_yet"
+        android:textColor="@color/color_a6a6a6"
+        android:textSize="@dimen/sp_13" />
+
+</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file

baselib/src/main/res/layout-night/dialog_home_filter.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ll_bg"
+    android:gravity="bottom"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -143,7 +144,7 @@
                 android:background="@color/color_ff2f2f2f"
                 android:gravity="center"
                 android:text="@string/reset"
-                android:textColor="@color/bg_7B7B7F"
+                android:textColor="@color/color_d3d3d3"
                 android:textSize="@dimen/sp_17" />
 
             <TextView

baselib/src/main/res/layout-night/dialog_input_remark.xml

@@ -56,6 +56,7 @@
                 android:background="@null"
                 android:gravity="start"
                 android:hint="@string/please_enter_your_comments"
+                android:textColorHint="#595959"
                 android:lines="8"
                 android:textColor="@color/color_595959"
                 android:maxLength="100"

baselib/src/main/res/layout/adapter_layout_empty_food_car.xml

@@ -6,9 +6,9 @@
     android:orientation="vertical">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/pic_my_home_no_order" />
+        android:layout_width="@dimen/dp_100"
+        android:layout_height="@dimen/dp_100"
+        android:src="@mipmap/ic_order_confirmation" />
 
     <TextView
         android:layout_width="wrap_content"

baselib/src/main/res/layout/dialog_home_filter.xml

@@ -5,6 +5,7 @@
     android:id="@+id/ll_bg"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="bottom"
     android:orientation="vertical">
 
     <android.support.v7.widget.LinearLayoutCompat
@@ -24,6 +25,7 @@
             android:id="@+id/cl_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_45"
+            android:visibility="gone"
             android:background="@color/btn_bg"
             android:orientation="horizontal">
 

baselib/src/main/res/layout/gv_filter_image.xml

@@ -23,7 +23,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                android:src="@mipmap/ic_evaluation_increase" />
+                android:src="@mipmap/ic_evaluation_increase_s" />
 
             <TextView
                 android:id="@+id/tv_tip_text"

baselib/src/main/res/values/colors.xml

@@ -97,4 +97,5 @@
     <color name="color_999999">#999999</color>
     <color name="color_686868">#686868</color>
     <color name="color_ebebeb">#EBEBEB</color>
+    <color name="color_29ebebeb">#29EBEBEB</color>
 </resources>
\ No newline at end of file

baselib/src/main/res/values/styles.xml

@@ -127,7 +127,7 @@
     <!--TabLayout_tow-->
     <style name="MyCustomTabLayoutTow" parent="Widget.Design.TabLayout">
         <item name="tabIndicatorColor">@color/btn_bg</item>
-        <item name="tabIndicatorHeight">5dp</item>
+        <item name="tabIndicatorHeight">3dp</item>
         <item name="tabPaddingStart">12dp</item>
         <item name="tabPaddingEnd">12dp</item>
         <item name="tabBackground">?attr/selectableItemBackground</item>
@@ -137,8 +137,8 @@
 
     <!--TabLayout_tow-->
     <style name="MyCustomTabLayoutNight" parent="Widget.Design.TabLayout">
-        <item name="tabIndicatorColor">@color/color_ff6b5c</item>
-        <item name="tabIndicatorHeight">5dp</item>
+        <item name="tabIndicatorColor">@color/btn_bg</item>
+        <item name="tabIndicatorHeight">3dp</item>
         <item name="tabPaddingStart">12dp</item>
         <item name="tabPaddingEnd">12dp</item>
         <item name="tabBackground">?attr/selectableItemBackground</item>

module-user/src/main/java/cn/dankal/user/login/LanguageSelectActivity.kt

@@ -62,29 +62,12 @@ class LanguageSelectActivity : BaseActivity() {
               changeLanguage(language)*/
             selectLanguage(1)
         }
-    }
-
-    /**
-     * 如果是7.0以下，我们需要调用changeAppLanguage方法，
-     * 如果是7.0及以上系统，直接把我们想要切换的语言类型保存在SharedPreferences中即可
-     * 然后重新启动MainActivity
-     * @param language
-     */
-    private fun changeLanguage(language: String?) {
-        LanguageUtil.setApplicationLanguage(this, language)
-        //ToastUtils.showLong(getString(R.string.switch_success))
-        EventBus.getDefault().post(UpdateLanguageEvent(Constant.EVENT_REFRESH_LANGUAGE))
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            LanguageUtil.changeAppLanguage(DankalApplication.getContext(), language)
+        btn_user_select_english.setOnClickListener{
+            selectLanguage(2)
+        }
+        btn_user_select_japanese.setOnClickListener {
+            selectLanguage(3)
         }
-        SPUtils.put(Constant.EVENT_REFRESH_LANGUAGE, language)
-        SPUtils.put(Constant.FIRST_IN, false)
-
-        val intent = Intent(this, LoginActivity::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
-        startActivity(intent)
-
     }
 
     private fun selectLanguage(select: Int) {

module-user/src/main/res/layout/activity_language_select.xml

@@ -64,5 +64,29 @@
         android:textColor="@color/white"
         android:textSize="@dimen/font_16_sp" />
 
+    <Button
+        android:id="@+id/btn_user_select_english"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_90"
+        android:layout_marginTop="@dimen/dp_14"
+        android:layout_marginRight="@dimen/dp_90"
+        android:background="@drawable/bg_button_select_language"
+        android:text="English"
+        android:textColor="@color/white"
+        android:textSize="@dimen/font_16_sp" />
+
+    <Button
+        android:id="@+id/btn_user_select_japanese"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_90"
+        android:layout_marginTop="@dimen/dp_14"
+        android:layout_marginRight="@dimen/dp_90"
+        android:background="@drawable/bg_button_select_language"
+        android:text="日本語"
+        android:textColor="@color/white"
+        android:textSize="@dimen/font_16_sp" />
+
 
 </android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file