setting page
Se han modificado 4 ficheros con 106 adiciones y 10 borrados
+ 0
- 4
.idea/modules.xml
@@ -3,12 +3,8 @@ |
||
| 3 | 3 |
<component name="ProjectModuleManager"> |
| 4 | 4 |
<modules> |
| 5 | 5 |
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> |
| 6 |
- <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> |
|
| 7 |
- <module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" /> |
|
| 8 | 6 |
<module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" /> |
| 9 | 7 |
<module fileurl="file://$PROJECT_DIR$/lensman_ssh.iml" filepath="$PROJECT_DIR$/lensman_ssh.iml" /> |
| 10 |
- <module fileurl="file://$PROJECT_DIR$/lensman_ssh.iml" filepath="$PROJECT_DIR$/lensman_ssh.iml" /> |
|
| 11 |
- <module fileurl="file://$PROJECT_DIR$/views/views.iml" filepath="$PROJECT_DIR$/views/views.iml" /> |
|
| 12 | 8 |
<module fileurl="file://$PROJECT_DIR$/views/views.iml" filepath="$PROJECT_DIR$/views/views.iml" /> |
| 13 | 9 |
</modules> |
| 14 | 10 |
</component> |
+ 13
- 6
app/src/main/java/ai/pai/lensman/settings/SettingsActivity.java
@@ -9,9 +9,7 @@ import ai.pai.lensman.base.BaseActivity; |
||
| 9 | 9 |
import butterknife.ButterKnife; |
| 10 | 10 |
import butterknife.OnClick; |
| 11 | 11 |
|
| 12 |
-/** |
|
| 13 |
- * Created by chengzhenyu on 2016/7/21. |
|
| 14 |
- */ |
|
| 12 |
+ |
|
| 15 | 13 |
public class SettingsActivity extends BaseActivity {
|
| 16 | 14 |
|
| 17 | 15 |
|
@@ -19,7 +17,6 @@ public class SettingsActivity extends BaseActivity {
|
||
| 19 | 17 |
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
| 20 | 18 |
super.onCreate(savedInstanceState); |
| 21 | 19 |
setContentView(R.layout.activity_settings); |
| 22 |
- |
|
| 23 | 20 |
unbinder = ButterKnife.bind(this); |
| 24 | 21 |
} |
| 25 | 22 |
|
@@ -28,8 +25,18 @@ public class SettingsActivity extends BaseActivity {
|
||
| 28 | 25 |
finish(); |
| 29 | 26 |
} |
| 30 | 27 |
|
| 31 |
- @OnClick(R.id.iv_options) |
|
| 32 |
- void clickOptionBtn(){
|
|
| 28 |
+ @OnClick(R.id.layout_about_us) |
|
| 29 |
+ void go2About(){
|
|
| 30 |
+ |
|
| 31 |
+ } |
|
| 32 |
+ |
|
| 33 |
+ @OnClick(R.id.layout_contact) |
|
| 34 |
+ void go2Contact(){
|
|
| 35 |
+ |
|
| 36 |
+ } |
|
| 37 |
+ |
|
| 38 |
+ @OnClick(R.id.layout_feedback) |
|
| 39 |
+ void go2Feedback(){
|
|
| 33 | 40 |
|
| 34 | 41 |
} |
| 35 | 42 |
|
+ 87
- 0
app/src/main/res/layout/activity_settings.xml
@@ -43,6 +43,7 @@ |
||
| 43 | 43 |
android:layout_width="70dp" |
| 44 | 44 |
android:layout_height="match_parent" |
| 45 | 45 |
android:gravity="center_vertical|right" |
| 46 |
+ android:visibility="invisible" |
|
| 46 | 47 |
android:orientation="horizontal" |
| 47 | 48 |
android:paddingRight="9dp"> |
| 48 | 49 |
|
@@ -64,10 +65,96 @@ |
||
| 64 | 65 |
android:layout_height="match_parent"> |
| 65 | 66 |
|
| 66 | 67 |
<LinearLayout |
| 68 |
+ android:layout_marginTop="8dp" |
|
| 67 | 69 |
android:layout_width="match_parent" |
| 68 | 70 |
android:layout_height="wrap_content" |
| 71 |
+ android:background="@color/background_white" |
|
| 69 | 72 |
android:orientation="vertical"> |
| 70 | 73 |
|
| 74 |
+ <LinearLayout |
|
| 75 |
+ android:id="@+id/layout_feedback" |
|
| 76 |
+ android:layout_width="match_parent" |
|
| 77 |
+ android:layout_height="44dp" |
|
| 78 |
+ android:paddingRight="6dp" |
|
| 79 |
+ android:orientation="horizontal"> |
|
| 80 |
+ |
|
| 81 |
+ <TextView |
|
| 82 |
+ android:layout_width="0dp" |
|
| 83 |
+ android:layout_height="wrap_content" |
|
| 84 |
+ android:layout_gravity="center_vertical" |
|
| 85 |
+ android:text="@string/feedback" |
|
| 86 |
+ android:paddingLeft="10dp" |
|
| 87 |
+ android:textColor="@color/dark_grey" |
|
| 88 |
+ android:textSize="16sp" |
|
| 89 |
+ android:layout_weight="1"/> |
|
| 90 |
+ |
|
| 91 |
+ <ImageView |
|
| 92 |
+ android:layout_width="10dp" |
|
| 93 |
+ android:layout_height="18dp" |
|
| 94 |
+ android:layout_gravity="center_vertical" |
|
| 95 |
+ android:src="@drawable/arrow_right"/> |
|
| 96 |
+ |
|
| 97 |
+ </LinearLayout> |
|
| 98 |
+ |
|
| 99 |
+ <View |
|
| 100 |
+ android:layout_width="match_parent" |
|
| 101 |
+ android:layout_height="1px" |
|
| 102 |
+ android:background="@color/text_hint_grey_color"/> |
|
| 103 |
+ |
|
| 104 |
+ <LinearLayout |
|
| 105 |
+ android:id="@+id/layout_contact" |
|
| 106 |
+ android:layout_width="match_parent" |
|
| 107 |
+ android:layout_height="44dp" |
|
| 108 |
+ android:paddingRight="6dp" |
|
| 109 |
+ android:orientation="horizontal"> |
|
| 110 |
+ |
|
| 111 |
+ <TextView |
|
| 112 |
+ android:layout_width="0dp" |
|
| 113 |
+ android:layout_height="wrap_content" |
|
| 114 |
+ android:layout_gravity="center_vertical" |
|
| 115 |
+ android:text="@string/contact_us" |
|
| 116 |
+ android:paddingLeft="10dp" |
|
| 117 |
+ android:textColor="@color/dark_grey" |
|
| 118 |
+ android:textSize="16sp" |
|
| 119 |
+ android:layout_weight="1"/> |
|
| 120 |
+ |
|
| 121 |
+ <ImageView |
|
| 122 |
+ android:layout_width="10dp" |
|
| 123 |
+ android:layout_height="18dp" |
|
| 124 |
+ android:layout_gravity="center_vertical" |
|
| 125 |
+ android:src="@drawable/arrow_right"/> |
|
| 126 |
+ |
|
| 127 |
+ </LinearLayout> |
|
| 128 |
+ |
|
| 129 |
+ <View |
|
| 130 |
+ android:layout_width="match_parent" |
|
| 131 |
+ android:layout_height="1px" |
|
| 132 |
+ android:background="@color/text_hint_grey_color"/> |
|
| 133 |
+ |
|
| 134 |
+ <LinearLayout |
|
| 135 |
+ android:id="@+id/layout_about_us" |
|
| 136 |
+ android:layout_width="match_parent" |
|
| 137 |
+ android:layout_height="44dp" |
|
| 138 |
+ android:paddingRight="6dp" |
|
| 139 |
+ android:orientation="horizontal"> |
|
| 140 |
+ |
|
| 141 |
+ <TextView |
|
| 142 |
+ android:layout_width="0dp" |
|
| 143 |
+ android:layout_height="wrap_content" |
|
| 144 |
+ android:layout_gravity="center_vertical" |
|
| 145 |
+ android:text="@string/about_us" |
|
| 146 |
+ android:paddingLeft="10dp" |
|
| 147 |
+ android:textColor="@color/dark_grey" |
|
| 148 |
+ android:textSize="16sp" |
|
| 149 |
+ android:layout_weight="1"/> |
|
| 150 |
+ |
|
| 151 |
+ <ImageView |
|
| 152 |
+ android:layout_width="10dp" |
|
| 153 |
+ android:layout_height="18dp" |
|
| 154 |
+ android:layout_gravity="center_vertical" |
|
| 155 |
+ android:src="@drawable/arrow_right"/> |
|
| 156 |
+ |
|
| 157 |
+ </LinearLayout> |
|
| 71 | 158 |
|
| 72 | 159 |
</LinearLayout> |
| 73 | 160 |
</ScrollView> |
+ 6
- 0
app/src/main/res/values/strings.xml
@@ -118,4 +118,10 @@ |
||
| 118 | 118 |
<string name="price_manage">价格管理</string> |
| 119 | 119 |
|
| 120 | 120 |
<string name="platform_price_rule">分成及结算规则</string> |
| 121 |
+ |
|
| 122 |
+ <string name="feedback">意见反馈</string> |
|
| 123 |
+ |
|
| 124 |
+ <string name="contact_us">联系我们</string> |
|
| 125 |
+ |
|
| 126 |
+ <string name="about_us">关于我们</string> |
|
| 121 | 127 |
</resources> |