# Conflicts: # app/src/main/java/io/legado/app/base/BaseActivity.ktpull/32/head
						commit
						ad8c42ba63
					
				@ -1,13 +1,17 @@ | 
				
			|||||||
package io.legado.app.ui.main.bookshelf | 
					package io.legado.app.ui.main.bookshelf | 
				
			||||||
 | 
					
 | 
				
			||||||
import android.os.Bundle | 
					import android.os.Bundle | 
				
			||||||
 | 
					import android.util.Log | 
				
			||||||
import android.view.View | 
					import android.view.View | 
				
			||||||
import androidx.fragment.app.Fragment | 
					import androidx.fragment.app.Fragment | 
				
			||||||
 | 
					import io.legado.app.R | 
				
			||||||
 | 
					
 | 
				
			||||||
class BookshelfFragment(contentLayoutId: Int) : Fragment(contentLayoutId) { | 
					class BookshelfFragment : Fragment(R.layout.fragment_bookshelf) { | 
				
			||||||
 | 
					
 | 
				
			||||||
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | 
					    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | 
				
			||||||
        super.onViewCreated(view, savedInstanceState) | 
					        super.onViewCreated(view, savedInstanceState) | 
				
			||||||
 | 
					        Log.e("TAG", "BookshelfFragment") | 
				
			||||||
 | 
					
 | 
				
			||||||
    } | 
					    } | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -1,13 +1,16 @@ | 
				
			|||||||
package io.legado.app.ui.main.booksource | 
					package io.legado.app.ui.main.booksource | 
				
			||||||
 | 
					
 | 
				
			||||||
import android.os.Bundle | 
					import android.os.Bundle | 
				
			||||||
 | 
					import android.util.Log | 
				
			||||||
import android.view.View | 
					import android.view.View | 
				
			||||||
import androidx.fragment.app.Fragment | 
					import androidx.fragment.app.Fragment | 
				
			||||||
 | 
					import io.legado.app.R | 
				
			||||||
 | 
					
 | 
				
			||||||
class BookSourceFragment(contentLayoutId: Int) : Fragment(contentLayoutId) { | 
					class BookSourceFragment : Fragment(R.layout.fragment_book_source) { | 
				
			||||||
 | 
					
 | 
				
			||||||
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | 
					    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | 
				
			||||||
        super.onViewCreated(view, savedInstanceState) | 
					        super.onViewCreated(view, savedInstanceState) | 
				
			||||||
 | 
					         Log.e("TAG", "BookSourceFragment") | 
				
			||||||
    } | 
					    } | 
				
			||||||
 | 
					
 | 
				
			||||||
} | 
					} | 
				
			||||||
@ -1,13 +1,16 @@ | 
				
			|||||||
package io.legado.app.ui.main.findbook | 
					package io.legado.app.ui.main.findbook | 
				
			||||||
 | 
					
 | 
				
			||||||
import android.os.Bundle | 
					import android.os.Bundle | 
				
			||||||
 | 
					import android.util.Log | 
				
			||||||
import android.view.View | 
					import android.view.View | 
				
			||||||
import androidx.fragment.app.Fragment | 
					import androidx.fragment.app.Fragment | 
				
			||||||
 | 
					import io.legado.app.R | 
				
			||||||
 | 
					
 | 
				
			||||||
class FindBookFragment(contentLayoutId: Int) : Fragment(contentLayoutId) { | 
					class FindBookFragment : Fragment(R.layout.fragment_find_book) { | 
				
			||||||
 | 
					
 | 
				
			||||||
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | 
					    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | 
				
			||||||
        super.onViewCreated(view, savedInstanceState) | 
					        super.onViewCreated(view, savedInstanceState) | 
				
			||||||
 | 
					        Log.e("TAG", "FindBookFragment") | 
				
			||||||
    } | 
					    } | 
				
			||||||
 | 
					
 | 
				
			||||||
} | 
					} | 
				
			||||||
@ -1,13 +1,16 @@ | 
				
			|||||||
package io.legado.app.ui.main.myconfig | 
					package io.legado.app.ui.main.myconfig | 
				
			||||||
 | 
					
 | 
				
			||||||
import android.os.Bundle | 
					import android.os.Bundle | 
				
			||||||
 | 
					import android.util.Log | 
				
			||||||
import android.view.View | 
					import android.view.View | 
				
			||||||
import androidx.fragment.app.Fragment | 
					import androidx.fragment.app.Fragment | 
				
			||||||
 | 
					import io.legado.app.R | 
				
			||||||
 | 
					
 | 
				
			||||||
class MyConfigFragment(contentLayoutId: Int) : Fragment(contentLayoutId) { | 
					class MyConfigFragment : Fragment(R.layout.fragment_my_config) { | 
				
			||||||
 | 
					
 | 
				
			||||||
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | 
					    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | 
				
			||||||
        super.onViewCreated(view, savedInstanceState) | 
					        super.onViewCreated(view, savedInstanceState) | 
				
			||||||
 | 
					        Log.e("TAG", "MyConfigFragment") | 
				
			||||||
    } | 
					    } | 
				
			||||||
 | 
					
 | 
				
			||||||
} | 
					} | 
				
			||||||
@ -1,15 +1,17 @@ | 
				
			|||||||
<?xml version="1.0" encoding="utf-8"?> | 
					<?xml version="1.0" encoding="utf-8"?> | 
				
			||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 
					<androidx.constraintlayout.widget.ConstraintLayout | 
				
			||||||
              xmlns:app="http://schemas.android.com/apk/res-auto" | 
					        xmlns:android="http://schemas.android.com/apk/res/android" | 
				
			||||||
              android:orientation="vertical" | 
					        xmlns:app="http://schemas.android.com/apk/res-auto" | 
				
			||||||
              android:layout_width="match_parent" | 
					        android:orientation="vertical" | 
				
			||||||
              android:layout_height="match_parent"> | 
					        android:layout_width="match_parent" | 
				
			||||||
 | 
					        android:layout_height="match_parent"> | 
				
			||||||
 | 
					
 | 
				
			||||||
    <io.legado.app.ui.widget.TitleBar | 
					    <io.legado.app.ui.widget.TitleBar | 
				
			||||||
            android:id="@+id/title_bar" | 
					            android:id="@+id/title_bar" | 
				
			||||||
            android:layout_width="match_parent" | 
					            android:layout_width="match_parent" | 
				
			||||||
            android:layout_height="wrap_content" | 
					            android:layout_height="wrap_content" | 
				
			||||||
 | 
					            app:attachToActivity="false" | 
				
			||||||
            app:layout_constraintTop_toTopOf="parent" | 
					            app:layout_constraintTop_toTopOf="parent" | 
				
			||||||
            app:title="@string/bookshelf"/> | 
					            app:title="@string/bookshelf"/> | 
				
			||||||
 | 
					
 | 
				
			||||||
</LinearLayout> | 
					</androidx.constraintlayout.widget.ConstraintLayout> | 
				
			||||||
					Loading…
					
					
				
		Reference in new issue