增加设置功能
增加设置功能
fix xxxx
Merge pull request #15 from ticmy/master

add settings functionality
refactor settings
Merge pull request #17 from ticmy/master

refactor settings
add tip when no search result
Merge pull request #18 from weejulius/master

add tip when no search result
我的微博列表页面
我的微博列表页
Merge branch 'master' of github.com:xinwei76/android-practice
Merge pull request #19 from xinwei76/master

个人微博列表
Merge remote-tracking branch 'remotes/main/master'

Conflicts:
	src/main/AndroidManifest.xml
	src/main/res/values/strings.xml
edit confilct