From c73c39d7c1a5bc75428824f7e49775b6f712261f Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Sep 2019 09:43:38 +0800 Subject: [PATCH] up --- app/src/main/AndroidManifest.xml | 3 ++- .../io/legado/app/ui/main/rss/RssFragment.kt | 2 +- .../rss/source/edit/RssSourceEditActivity.kt | 19 +++++++++++++++++++ .../rss/source/edit/RssSourceEditViewModel.kt | 9 +++++++++ .../source/{ => manage}/RssSourceActivity.kt | 2 +- .../source/{ => manage}/RssSourceAdapter.kt | 2 +- .../source/{ => manage}/RssSourceViewModel.kt | 2 +- .../res/layout/activity_rss_source_edit.xml | 17 +++++++++++++++++ app/src/main/res/values/strings.xml | 1 + 9 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt create mode 100644 app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt rename app/src/main/java/io/legado/app/ui/rss/source/{ => manage}/RssSourceActivity.kt (97%) rename app/src/main/java/io/legado/app/ui/rss/source/{ => manage}/RssSourceAdapter.kt (97%) rename app/src/main/java/io/legado/app/ui/rss/source/{ => manage}/RssSourceViewModel.kt (78%) create mode 100644 app/src/main/res/layout/activity_rss_source_edit.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9bb422ffa..a53e2130d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,7 +65,8 @@ - + + diff --git a/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt index 2126b3929..79c82bf1d 100644 --- a/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt @@ -10,7 +10,7 @@ import io.legado.app.App import io.legado.app.R import io.legado.app.base.BaseFragment import io.legado.app.lib.theme.ATH -import io.legado.app.ui.rss.source.RssSourceActivity +import io.legado.app.ui.rss.source.manage.RssSourceActivity import io.legado.app.utils.startActivity import kotlinx.android.synthetic.main.fragment_rss.* import kotlinx.android.synthetic.main.view_title_bar.* diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt new file mode 100644 index 000000000..b94dc1279 --- /dev/null +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt @@ -0,0 +1,19 @@ +package io.legado.app.ui.rss.source.edit + +import android.os.Bundle +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.utils.getViewModel + +class RssSourceEditActivity : + VMBaseActivity(R.layout.activity_rss_source_edit) { + + override val viewModel: RssSourceEditViewModel + get() = getViewModel(RssSourceEditViewModel::class.java) + + override fun onActivityCreated(savedInstanceState: Bundle?) { + + } + + +} \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt new file mode 100644 index 000000000..fdb353c69 --- /dev/null +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt @@ -0,0 +1,9 @@ +package io.legado.app.ui.rss.source.edit + +import android.app.Application +import io.legado.app.base.BaseViewModel + +class RssSourceEditViewModel(application: Application) : BaseViewModel(application) { + + +} \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/rss/source/RssSourceActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt similarity index 97% rename from app/src/main/java/io/legado/app/ui/rss/source/RssSourceActivity.kt rename to app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt index 1c38b1c25..4d56fb6d7 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/RssSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.rss.source +package io.legado.app.ui.rss.source.manage import android.os.Bundle import androidx.core.content.ContextCompat diff --git a/app/src/main/java/io/legado/app/ui/rss/source/RssSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt similarity index 97% rename from app/src/main/java/io/legado/app/ui/rss/source/RssSourceAdapter.kt rename to app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt index a6ef803c4..85aebdb18 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/RssSourceAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.rss.source +package io.legado.app.ui.rss.source.manage import android.content.Context import io.legado.app.R diff --git a/app/src/main/java/io/legado/app/ui/rss/source/RssSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt similarity index 78% rename from app/src/main/java/io/legado/app/ui/rss/source/RssSourceViewModel.kt rename to app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt index ec006964e..c91f73ef7 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/RssSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.rss.source +package io.legado.app.ui.rss.source.manage import android.app.Application import io.legado.app.base.BaseViewModel diff --git a/app/src/main/res/layout/activity_rss_source_edit.xml b/app/src/main/res/layout/activity_rss_source_edit.xml new file mode 100644 index 000000000..437330f50 --- /dev/null +++ b/app/src/main/res/layout/activity_rss_source_edit.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a143f2e50..16adb03bd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -505,6 +505,7 @@ 输入你的服务器地址 输入你的WebDav账号 订阅源 + 编辑订阅源 筛选 筛选发现