|
|
|
|
@ -214,24 +214,51 @@ |
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
|
android:id="@+id/player" |
|
|
|
|
android:layout_width="match_parent" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginTop="16dp" |
|
|
|
|
android:background="@drawable/selector_item" |
|
|
|
|
android:focusable="true" |
|
|
|
|
android:focusableInTouchMode="true" |
|
|
|
|
android:nextFocusDown="@id/danmu" |
|
|
|
|
android:orientation="horizontal"> |
|
|
|
|
|
|
|
|
|
<TextView |
|
|
|
|
android:layout_width="wrap_content" |
|
|
|
|
<LinearLayout |
|
|
|
|
android:id="@+id/player" |
|
|
|
|
android:layout_width="0dp" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:text="@string/setting_player" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" /> |
|
|
|
|
android:layout_weight="1" |
|
|
|
|
android:background="@drawable/selector_item" |
|
|
|
|
android:focusable="true" |
|
|
|
|
android:focusableInTouchMode="true" |
|
|
|
|
android:orientation="horizontal"> |
|
|
|
|
|
|
|
|
|
<TextView |
|
|
|
|
android:layout_width="wrap_content" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:text="@string/setting_player" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" /> |
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
|
android:id="@+id/danmu" |
|
|
|
|
android:layout_width="0dp" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_weight="1" |
|
|
|
|
android:background="@drawable/selector_item" |
|
|
|
|
android:focusable="true" |
|
|
|
|
android:focusableInTouchMode="true" |
|
|
|
|
android:orientation="horizontal"> |
|
|
|
|
|
|
|
|
|
<TextView |
|
|
|
|
android:layout_width="wrap_content" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:text="@string/setting_danmu" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" /> |
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
|
@ -241,11 +268,11 @@ |
|
|
|
|
android:orientation="horizontal"> |
|
|
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
|
android:id="@+id/danmu" |
|
|
|
|
android:id="@+id/custom" |
|
|
|
|
android:layout_width="0dp" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:layout_weight="1" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:background="@drawable/selector_item" |
|
|
|
|
android:focusable="true" |
|
|
|
|
android:focusableInTouchMode="true" |
|
|
|
|
@ -255,14 +282,14 @@ |
|
|
|
|
android:layout_width="wrap_content" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:text="@string/setting_danmu" |
|
|
|
|
android:text="@string/setting_custom" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" /> |
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
|
android:id="@+id/custom" |
|
|
|
|
android:id="@+id/proxy" |
|
|
|
|
android:layout_width="0dp" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_weight="1" |
|
|
|
|
@ -275,10 +302,19 @@ |
|
|
|
|
android:layout_width="wrap_content" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:text="@string/setting_custom" |
|
|
|
|
android:text="@string/setting_proxy" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" /> |
|
|
|
|
|
|
|
|
|
<TextView |
|
|
|
|
android:id="@+id/proxyText" |
|
|
|
|
android:layout_width="match_parent" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:gravity="end" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" |
|
|
|
|
tools:text="http" /> |
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
@ -320,7 +356,7 @@ |
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
|
android:id="@+id/proxy" |
|
|
|
|
android:id="@+id/backup" |
|
|
|
|
android:layout_width="0dp" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_weight="1" |
|
|
|
|
@ -333,18 +369,18 @@ |
|
|
|
|
android:layout_width="wrap_content" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:text="@string/setting_proxy" |
|
|
|
|
android:text="@string/setting_backup" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" /> |
|
|
|
|
|
|
|
|
|
<TextView |
|
|
|
|
android:id="@+id/proxyText" |
|
|
|
|
android:id="@+id/backupText" |
|
|
|
|
android:layout_width="match_parent" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:gravity="end" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" |
|
|
|
|
tools:text="http" /> |
|
|
|
|
tools:text="20231103" /> |
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
</LinearLayout> |
|
|
|
|
@ -386,7 +422,7 @@ |
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
|
android:id="@+id/backup" |
|
|
|
|
android:id="@+id/version" |
|
|
|
|
android:layout_width="0dp" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_weight="1" |
|
|
|
|
@ -399,49 +435,20 @@ |
|
|
|
|
android:layout_width="wrap_content" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:text="@string/setting_backup" |
|
|
|
|
android:text="@string/setting_version" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" /> |
|
|
|
|
|
|
|
|
|
<TextView |
|
|
|
|
android:id="@+id/backupText" |
|
|
|
|
android:id="@+id/versionText" |
|
|
|
|
android:layout_width="match_parent" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:gravity="end" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" |
|
|
|
|
tools:text="20231103" /> |
|
|
|
|
tools:text="1.2.1" /> |
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
|
android:id="@+id/version" |
|
|
|
|
android:layout_width="match_parent" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginTop="16dp" |
|
|
|
|
android:background="@drawable/selector_item" |
|
|
|
|
android:focusable="true" |
|
|
|
|
android:focusableInTouchMode="true" |
|
|
|
|
android:orientation="horizontal"> |
|
|
|
|
|
|
|
|
|
<TextView |
|
|
|
|
android:layout_width="wrap_content" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:layout_marginEnd="16dp" |
|
|
|
|
android:text="@string/setting_version" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" /> |
|
|
|
|
|
|
|
|
|
<TextView |
|
|
|
|
android:id="@+id/versionText" |
|
|
|
|
android:layout_width="match_parent" |
|
|
|
|
android:layout_height="wrap_content" |
|
|
|
|
android:gravity="end" |
|
|
|
|
android:textColor="@color/white" |
|
|
|
|
android:textSize="18sp" |
|
|
|
|
tools:text="1.2.1" /> |
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
</LinearLayout> |
|
|
|
|
</androidx.core.widget.NestedScrollView> |