Commit ebd274a3 authored by Mygod's avatar Mygod

Fix usages of fragment tags, 2nd attempt

parent 24c17344
...@@ -28,7 +28,7 @@ buildscript { ...@@ -28,7 +28,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0-beta04' classpath 'com.android.tools.build:gradle:4.1.0-alpha06'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0'
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2' classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta04' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta04'
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<include layout="@layout/toolbar_light_dark" /> <include layout="@layout/toolbar_light_dark" />
<fragment <androidx.fragment.app.FragmentContainerView
android:id="@+id/content" android:id="@+id/content"
class="com.github.shadowsocks.GlobalSettingsPreferenceFragment" android:name="com.github.shadowsocks.GlobalSettingsPreferenceFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"/> android:layout_weight="1"/>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<include layout="@layout/toolbar_light_dark" /> <include layout="@layout/toolbar_light_dark" />
<fragment <androidx.fragment.app.FragmentContainerView
android:id="@+id/content" android:id="@+id/content"
android:name="com.github.shadowsocks.ProfileConfigFragment" android:name="com.github.shadowsocks.ProfileConfigFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android" <androidx.fragment.app.FragmentContainerView
xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_browse_fragment" xmlns:tools="http://schemas.android.com/tools"
android:name="com.github.shadowsocks.tv.MainFragment" android:id="@+id/main_browse_fragment"
android:layout_width="match_parent" android:name="com.github.shadowsocks.tv.MainFragment"
android:layout_height="match_parent" android:layout_width="match_parent"
tools:context=".MainActivity" android:layout_height="match_parent"
tools:deviceIds="tv" tools:context=".MainActivity"
tools:ignore="MergeRootFrame"/> tools:deviceIds="tv"
tools:ignore="MergeRootFrame"/>
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