- 设置页面UI对齐(by okjack)

pull/52/merge
okjackcaptain 3 years ago
parent 9ccbeb96ba
commit 57a5a675ef
  1. 2
      app/src/main/java/com/github/tvbox/osc/server/ControlManager.java
  2. 2
      app/src/main/java/com/github/tvbox/osc/ui/activity/PushActivity.java
  3. 11
      app/src/main/res/layout/fragment_model.xml

@ -80,7 +80,7 @@ public class ControlManager {
@Override
public void onPushReceived(String url) {
Matcher m = Pattern.compile("(https?://[A-Za-z0-9:_@$#\\|\\/\\.\\?\\=\\&\\%\\-]+)").matcher(url);
Matcher m = Pattern.compile("(https?://[A-Za-z0-9:_@$#\\+\\|\\/\\.\\?\\=\\&\\%\\-]+)").matcher(url);
String finalUrl = url;
if (m.find()) {
finalUrl = m.group(1);

@ -46,7 +46,7 @@ public class PushActivity extends BaseActivity {
if (manager.hasPrimaryClip() && manager.getPrimaryClip() != null && manager.getPrimaryClip().getItemCount() > 0) {
ClipData.Item addedText = manager.getPrimaryClip().getItemAt(0);
String clipText = addedText.getText().toString().trim();
Matcher m = Pattern.compile("(https?://[A-Za-z0-9:_@$#\\|\\/\\.\\?\\=\\&\\%\\-]+)").matcher(clipText);
Matcher m = Pattern.compile("(https?://[A-Za-z0-9:_@$#\\+\\|\\/\\.\\?\\=\\&\\%\\-]+)").matcher(clipText);
if (m.find()) {
clipText = m.group(1);
}

@ -641,17 +641,18 @@
<LinearLayout
android:layout_width="@dimen/vs_0"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/vs_5"
android:layout_marginRight="@dimen/vs_5"
android:layout_marginStart="@dimen/vs_5"
android:layout_marginLeft="@dimen/vs_5"
android:layout_weight="1"
android:focusable="false"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/llSearchTv"
android:layout_width="@dimen/vs_0"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/vs_5"
android:layout_marginLeft="@dimen/vs_5"
android:layout_marginEnd="@dimen/vs_5"
android:layout_marginRight="@dimen/vs_5"
android:layout_weight="1"
android:background="@drawable/shape_setting_model_focus"
android:focusable="true"
@ -659,12 +660,14 @@
android:orientation="horizontal"
android:paddingLeft="@dimen/vs_20"
android:paddingRight="@dimen/vs_20">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="搜索附近TVBox"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"

Loading…
Cancel
Save