Skip to content

B
beyond-clouds-android
Commit 1b31687c by 段启岩
Options

替换颜色值

parent 617226c9
Showing with 88 additions and 65 deletions
app/src/main/java/cn/yunliyunwai/beyondclouds/view/ScaleTransitionPagerTitleView.java
......@@ -50,8 +50,8 @@ public class ScaleTransitionPagerTitleView extends ColorTransitionPagerTitleView
int paddingLeft = (int) (6 * density);
int paddingRight = (int) (6 * density);
scaleTransitionPagerTitleView.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
scaleTransitionPagerTitleView.setNormalColor(context.getResources().getColor(R.color.colorText));
scaleTransitionPagerTitleView.setSelectedColor(context.getResources().getColor(R.color.colorTextAccent));
scaleTransitionPagerTitleView.setNormalColor(context.getResources().getColor(R.color.colorTextLevel5));
scaleTransitionPagerTitleView.setSelectedColor(context.getResources().getColor(R.color.colorTextLevel3));
scaleTransitionPagerTitleView.setGravity(Gravity.CENTER_VERTICAL);
return scaleTransitionPagerTitleView;
}
......
app/src/main/res/drawable/background_icon_touchable.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/colorIconTouched" android:state_pressed="true" />
<item android:drawable="@color/colorIcon" />
<item android:drawable="@color/colorIconTouchedBgTouched" android:state_pressed="true" />
<item android:drawable="@color/colorIconBg" />
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_login.xml
......@@ -9,7 +9,7 @@
<cn.yunliyunwai.beyondclouds.view.BeyondToolBar
android:id="@+id/tool_bar_login"
app:rightIcon="@string/icon_close"
app:title="登录"
app:title="@string/title_login"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -27,23 +27,23 @@
android:id="@+id/txt_password_login_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="密码登录"
android:text="@string/login_way_password"
android:layout_marginTop="46dp"
android:textColor="#2f2f2f"
android:textColor="@color/colorTextLevel2"
android:textSize="16sp"
android:background="@null"
android:onClick="passwordLogin"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintEnd_toStartOf="@id/txt_login_method_separator"
app:layout_constraintEnd_toStartOf="@id/txt_login_way_separator"
app:layout_constraintStart_toStartOf="@id/login_left_guide_line"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/txt_login_method_separator"
android:id="@+id/txt_login_way_separator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="46dp"
android:text=" · "
android:textColor="#999999"
android:text="@string/login_way_separator"
android:textColor="@color/colorTextLevel5"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/txt_sms_login_title"
app:layout_constraintStart_toEndOf="@id/txt_password_login_title"
......@@ -55,18 +55,18 @@
android:layout_height="wrap_content"
android:layout_marginTop="46dp"
android:background="@null"
android:text="短信登陆"
android:textColor="#999999"
android:text="@string/login_way_sms"
android:textColor="@color/colorTextLevel5"
android:textSize="16sp"
android:onClick="messageLogin"
app:layout_constraintEnd_toStartOf="@id/login_right_guide_line"
app:layout_constraintStart_toEndOf="@id/txt_login_method_separator"
app:layout_constraintStart_toEndOf="@id/txt_login_way_separator"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_login_way_bottom"
app:barrierDirection="bottom"
app:constraint_referenced_ids="txt_password_login_title,txt_login_method_separator,txt_sms_login_title"
app:constraint_referenced_ids="txt_password_login_title,txt_login_way_separator,txt_sms_login_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
......@@ -78,9 +78,9 @@
android:paddingLeft="69dp"
android:layout_marginTop="34dp"
android:background="@drawable/background_edit_text_login"
android:hint="请输入手机号或邮箱"
android:hint="@string/hint_mobile_or_email"
android:textSize="12dp"
android:textColor="#333333"
android:textColor="@color/colorTextLevel3"
android:singleLine="true"
app:layout_constraintTop_toBottomOf="@id/barrier_login_way_bottom"
app:layout_constraintStart_toStartOf="@id/login_left_guide_line"
......@@ -94,8 +94,8 @@
android:layout_height="0dp"
android:layout_marginLeft="15dp"
android:gravity="center_vertical"
android:text="账 号："
android:textColor="#999999"
android:text="@string/title_account"
android:textColor="@color/colorTextLevel5"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="@id/login_account_edit_text"
app:layout_constraintBottom_toBottomOf="@id/login_account_edit_text"
......@@ -111,9 +111,9 @@
android:paddingStart="69dp"
android:paddingLeft="69dp"
android:background="@drawable/background_edit_text_login"
android:hint="请输入密码"
android:hint="@string/hint_enter_password"
android:textSize="12sp"
android:textColor="#333333"
android:textColor="@color/colorTextLevel3"
android:inputType="textPassword"
android:singleLine="true"
android:layout_marginTop="32dp"
......@@ -125,8 +125,8 @@
android:id="@+id/login_password_border_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="密 码："
android:textColor="#999999"
android:text="@string/title_password"
android:textColor="@color/colorTextLevel5"
android:textSize="13sp"
android:layout_marginStart="15dp"
app:layout_constraintBottom_toBottomOf="@id/login_password_edit_text"
......@@ -149,8 +149,8 @@
android:id="@+id/forget_password_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="忘记密码"
android:textColor="#999999"
android:text="@string/forgot_password"
android:textColor="@color/colorTextLevel5"
android:textSize="13sp"
android:minWidth="0dp"
android:minHeight="0dp"
......@@ -163,11 +163,11 @@
android:id="@+id/login_auth_code_edit_text"
android:layout_width="0dp"
android:layout_height="42dp"
android:hint="请输入验证码"
android:hint="@string/hint_enter_verify_code"
android:paddingStart="69dp"
android:paddingLeft="69dp"
android:textSize="12sp"
android:textColor="#333333"
android:textColor="@color/colorTextLevel3"
android:singleLine="true"
android:visibility="gone"
android:background="@drawable/background_edit_text_login"
......@@ -179,8 +179,8 @@
android:id="@+id/login_auth_code_border_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="验证码："
android:textColor="#999999"
android:text="@string/title_verify_code"
android:textColor="@color/colorTextLevel5"
android:textSize="13sp"
android:layout_marginStart="15dp"
android:visibility="gone"
......@@ -191,9 +191,9 @@
android:id="@+id/login_send_auth_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="发送验证码"
android:text="@string/send_verify_code"
android:textSize="13sp"
android:textColor="#75d098"
android:textColor="@color/colorSendVerifyCode"
android:background="@android:color/transparent"
android:visibility="gone"
app:layout_constraintTop_toTopOf="@id/login_auth_code_edit_text"
......@@ -204,8 +204,8 @@
android:id="@+id/login_button"
android:layout_width="314dp"
android:layout_height="42dp"
android:text="登录"
android:textColor="#ffffff"
android:text="@string/title_login"
android:textColor="@color/colorWhite"
android:textSize="15sp"
android:layout_marginTop="52dp"
android:background="@drawable/background_button_login"
......@@ -228,7 +228,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="还没有账号?"
android:textColor="#999999"
android:textColor="@color/colorTextLevel5"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/account_not_exist_register_button"
app:layout_constraintTop_toTopOf="@id/account_not_exist_register_button"
......@@ -238,8 +238,8 @@
android:id="@+id/account_not_exist_register_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="去注册"
android:textColor="#00aae6"
android:text="@string/to_register"
android:textColor="@color/colorPrimary"
android:textSize="13sp"
android:minWidth="0dp"
android:minHeight="0dp"
......@@ -277,8 +277,8 @@
android:id="@+id/third_party_login_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="第三方登录"
android:textColor="#bec7cb"
android:text="@string/third_party_login"
android:textColor="@color/colorTextLevel6"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
......@@ -326,9 +326,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Copyright © 2019 云里云外开源社区 All Rights Reserved"
android:text="@string/copyright"
android:textSize="10sp"
android:textColor="#999999"
android:textColor="@color/colorTextLevel5"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
app/src/main/res/layout/beyond_search_bar.xml
......@@ -53,7 +53,7 @@
android:layout_marginRight="4dp"
android:textSize="16dp"
android:background="@drawable/background_icon_touchable"
android:textColor="@color/colorGray"
android:textColor="@color/colorTextLevel4"
android:gravity="center"
android:layout_width="40dp"
android:layout_height="40dp" />
......
app/src/main/res/layout/beyond_tool_bar.xml
......@@ -8,7 +8,7 @@
<cn.yunliyunwai.beyondclouds.view.BeyondTextIcon
android:id="@+id/icon_left"
android:textSize="16dp"
android:textColor="@color/colorGray"
android:textColor="@color/colorTextLevel4"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
app:layout_constraintStart_toStartOf="parent"
......@@ -23,7 +23,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textSize="16sp"
android:textColor="#000000"
android:textColor="@color/colorTextLevel1"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
......@@ -34,7 +34,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textSize="14dp"
android:textColor="#666666"
android:textColor="@color/colorTextLevel4"
android:background="@null"
android:layout_marginEnd="12dp"
android:layout_marginRight="12dp"
......@@ -44,7 +44,7 @@
<View
android:id="@+id/line_bottom"
app:layout_constraintBottom_toBottomOf="parent"
android:background="#efefef"
android:background="@color/colorSplitLine"
android:layout_width="match_parent"
android:layout_height="1dp" />
......
app/src/main/res/layout/blog_item.xml
......@@ -18,7 +18,7 @@
android:layout_height="22dp"
android:text="SpringBoot迭代发布JRA瘦身配置"
android:textSize="16sp"
android:textColor="@color/colorTextAccent"
android:textColor="@color/colorTextLevel3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -70,7 +70,7 @@
android:layout_marginTop="10dp"
android:text="段启岩"
android:textSize="10sp"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
android:layout_width="wrap_content"
......@@ -81,7 +81,7 @@
android:layout_marginTop="10dp"
android:textSize="10sp"
android:textStyle="bold"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
app:layout_constraintStart_toEndOf="@id/txt_author"
android:paddingStart="6dp"
......@@ -94,7 +94,7 @@
android:id="@+id/txt_create_time"
android:layout_marginTop="10dp"
android:textSize="10sp"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
android:text="2020-2-18 10:24:00"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
app:layout_constraintStart_toEndOf="@id/txt_dot"
......
app/src/main/res/layout/post_item.xml
......@@ -27,7 +27,7 @@
android:layout_marginStart="48dp"
android:layout_marginLeft="48dp"
app:layout_constraintTop_toTopOf="parent"
android:textColor="@color/colorTextAccent"
android:textColor="@color/colorTextLevel3"
android:textSize="15sp"
android:gravity="center_vertical"
android:layout_width="wrap_content"
......@@ -67,7 +67,7 @@
android:linksClickable="true"
android:textColorHighlight="@color/colorBackgroundTopicTouched"
android:textColorLink="@color/color_topic_link"
android:textColor="@color/colorTextAccent"
android:textColor="@color/colorTextLevel3"
app:layout_constraintTop_toBottomOf="@id/barrier_user_info"
app:layout_constraintStart_toStartOf="parent"
/>
......
app/src/main/res/layout/project_item.xml
......@@ -18,7 +18,7 @@
android:layout_height="22dp"
android:text="SpringBoot迭代发布JRA瘦身配置"
android:textSize="16sp"
android:textColor="@color/colorTextAccent"
android:textColor="@color/colorTextLevel3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -70,7 +70,7 @@
android:layout_marginTop="10dp"
android:text="段启岩"
android:textSize="10sp"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
android:layout_width="wrap_content"
......@@ -81,7 +81,7 @@
android:layout_marginTop="10dp"
android:textSize="10sp"
android:textStyle="bold"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
app:layout_constraintStart_toEndOf="@id/txt_author"
android:paddingStart="6dp"
......@@ -94,7 +94,7 @@
android:id="@+id/txt_create_time"
android:layout_marginTop="10dp"
android:textSize="10sp"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
android:text="2020-2-18 10:24:00"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
app:layout_constraintStart_toEndOf="@id/txt_dot"
......
app/src/main/res/layout/question_item.xml
......@@ -18,7 +18,7 @@
android:layout_height="22dp"
android:text="SpringBoot迭代发布JRA瘦身配置"
android:textSize="16sp"
android:textColor="@color/colorTextAccent"
android:textColor="@color/colorTextLevel3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -57,7 +57,7 @@
android:layout_marginTop="10dp"
android:text="段启岩"
android:textSize="10sp"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
android:layout_width="wrap_content"
......@@ -68,7 +68,7 @@
android:layout_marginTop="10dp"
android:textSize="10sp"
android:textStyle="bold"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
app:layout_constraintStart_toEndOf="@id/txt_author"
android:paddingStart="6dp"
......@@ -81,7 +81,7 @@
android:id="@+id/txt_create_time"
android:layout_marginTop="10dp"
android:textSize="10sp"
android:textColor="@color/colorText"
android:textColor="@color/colorTextLevel5"
android:text="2020-2-18 10:24:00"
app:layout_constraintTop_toBottomOf="@id/barrier_content"
app:layout_constraintStart_toEndOf="@id/txt_dot"
......
app/src/main/res/values/colors.xml
......@@ -4,20 +4,26 @@
<color name="colorPrimaryTouched">#00AAFF</color>
<color name="colorPrimaryDark">#333333</color>
<color name="colorAccent">#03DAC5</color>
<!-- <color name="colorBackground">#EDF5F8</color>-->
<!-- <color name="colorBackground">#EDF5F8</color>-->
<color name="colorBackground">#F7F5F5</color>
<color name="colorWhite">#FFFFFF</color>
<color name="colorWhiteTouched">#a0eeeeee</color>
<color name="colorStatusBar">#ffffff</color>
<color name="colorText">#999999</color>
<color name="colorGray">#666666</color>
<color name="colorTextAccent">#333333</color>
<color name="colorTextLevel1">#000000</color>
<color name="colorTextLevel2">#2f2f2f</color>
<color name="colorTextLevel3">#333333</color>
<color name="colorTextLevel4">#666666</color>
<color name="colorTextLevel5">#999999</color>
<color name="colorTextLevel6">#bec7cb</color>
<color name="colorBackgroundTopicTouched">#3000AAE6</color>
<color name="colorPopupMenuItemTouched">#475256</color>
<color name="colorPopupMenuItem">#374246</color>
<color name="colorIconTouched">#E7E5E5</color>
<color name="colorIcon">#00000000</color>
<color name="colorIconTouchedBgTouched">#E7E5E5</color>
<color name="colorIconBg">#00000000</color>
<color name="colorSplitLine">#efefef</color>
<color name="button_on_focus">#2f2f2f</color>
<color name="button_lose_focus">#999999</color>
<color name="colorSendVerifyCode">#75d098</color>
</resources>
app/src/main/res/values/strings.xml
......@@ -3,6 +3,15 @@
<!-- fragment_my.xml start -->
<string name="click_to_login">点击登录</string>
<string name="title_login">登录</string>
<string name="login_way_password">密码登录</string>
<string name="login_way_sms">短信登录</string>
<string name="login_way_separator"> · </string>
<string name="hint_mobile_or_email">请输入手机号或邮箱</string>
<string name="title_account">账 号：</string>
<string name="title_password">密 码：</string>
<string name="title_verify_code">验证码：</string>
<!-- fragment_my.xml end -->
<!-- icons start -->
......@@ -36,5 +45,12 @@
<string name="icon_qr_code">&#xe61d;</string>
<string name="icon_eye_slash">&#xe621;</string>
<string name="icon_close">&#xe622;</string>
<string name="hint_enter_password">请输入密码</string>
<string name="forgot_password">忘记密码</string>
<string name="hint_enter_verify_code">请输入验证码</string>
<string name="send_verify_code">发送验证码</string>
<string name="copyright">Copyright © 2019 云里云外开源社区 All Rights Reserved</string>
<string name="third_party_login">第三方登录</string>
<string name="to_register">去注册</string>
<!-- icons end -->
</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