Commit cc09aa55b689b60976e54399ef13878dbacc9381
1 parent
217deceb
Exists in
yxb_dev
and in
2 other branches
no message
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
app/src/main/AndroidManifest.xml
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | android:label="@string/app_name" | 43 | android:label="@string/app_name" |
| 44 | android:roundIcon="@mipmap/ic_launcher_round" | 44 | android:roundIcon="@mipmap/ic_launcher_round" |
| 45 | android:supportsRtl="true" | 45 | android:supportsRtl="true" |
| 46 | - android:theme="@style/AppTheme"> | 46 | + android:theme="@style/Theme.AppCompat.Light.NoActionBar"> |
| 47 | 47 | ||
| 48 | <activity android:name=".ui.MainActivity"> | 48 | <activity android:name=".ui.MainActivity"> |
| 49 | <intent-filter> | 49 | <intent-filter> |
app/src/main/res/layout/fragment_ce_ping.xml
| @@ -114,8 +114,8 @@ | @@ -114,8 +114,8 @@ | ||
| 114 | android:layout_weight="1" | 114 | android:layout_weight="1" |
| 115 | android:layout_height="match_parent" | 115 | android:layout_height="match_parent" |
| 116 | android:layout_marginBottom="@dimen/size_dp_20" | 116 | android:layout_marginBottom="@dimen/size_dp_20" |
| 117 | - android:layout_marginRight="@dimen/size_dp_10" | ||
| 118 | - android:layout_marginLeft="@dimen/textSize20" | 117 | + android:layout_marginRight="@dimen/size_dp_5" |
| 118 | + android:layout_marginLeft="@dimen/size_dp_10" | ||
| 119 | android:layout_marginTop="@dimen/size_dp_20" | 119 | android:layout_marginTop="@dimen/size_dp_20" |
| 120 | android:background="@drawable/shape_xueqing_radius8" | 120 | android:background="@drawable/shape_xueqing_radius8" |
| 121 | android:padding="@dimen/size_dp_20"> | 121 | android:padding="@dimen/size_dp_20"> |
| @@ -135,10 +135,10 @@ | @@ -135,10 +135,10 @@ | ||
| 135 | android:layout_weight="1" | 135 | android:layout_weight="1" |
| 136 | android:layout_height="match_parent" | 136 | android:layout_height="match_parent" |
| 137 | android:layout_marginBottom="@dimen/size_dp_20" | 137 | android:layout_marginBottom="@dimen/size_dp_20" |
| 138 | - android:layout_marginLeft="@dimen/size_dp_10" | 138 | + android:layout_marginLeft="@dimen/size_dp_5" |
| 139 | android:layout_marginTop="@dimen/size_dp_20" | 139 | android:layout_marginTop="@dimen/size_dp_20" |
| 140 | android:background="@drawable/shape_zxlx_radius8" | 140 | android:background="@drawable/shape_zxlx_radius8" |
| 141 | - android:layout_marginRight="@dimen/textSize20" | 141 | + android:layout_marginRight="@dimen/size_dp_10" |
| 142 | android:padding="@dimen/size_dp_20"> | 142 | android:padding="@dimen/size_dp_20"> |
| 143 | 143 | ||
| 144 | <com.shunzhi.parent.views.TextAndImgShowView | 144 | <com.shunzhi.parent.views.TextAndImgShowView |