diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2017-10-21 01:43:33 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-10-21 01:43:33 +0900 |
commit | ae99a077308b699fecc09493c152782d5cd8830d (patch) | |
tree | c1e4d0a1990d73523604289846a4a7b120369cd2 | |
parent | 019637388fdebaca870fa46a88e79b0a16784423 (diff) | |
download | SmileEssence-ae99a077308b699fecc09493c152782d5cd8830d.tar.gz |
rename fragments
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt | 14 | ||||
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/data/Pages.kt | 8 | ||||
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt (renamed from app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt) | 2 | ||||
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt (renamed from app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.kt) | 2 | ||||
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/view/page/MessagesPageFragment.kt (renamed from app/src/main/java/net/lacolaco/smileessence/view/page/MessagesFragment.kt) | 2 | ||||
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt (renamed from app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.kt) | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt index a43b9681..e0fcda19 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt +++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt @@ -32,7 +32,7 @@ import net.lacolaco.smileessence.view.MainFragmentPagerAdapter import net.lacolaco.smileessence.view.confirm import net.lacolaco.smileessence.view.dialog.StatusDetailDialogFragment import net.lacolaco.smileessence.view.dialog.UserDetailDialogFragment -import net.lacolaco.smileessence.view.page.PostFragment +import net.lacolaco.smileessence.view.page.ComposePageFragment import java.io.IOException import java.io.InputStream import java.net.URL @@ -57,21 +57,21 @@ class MainActivity : AppCompatActivity() { fun openPostPageAndReplyTo(tweet: Tweet, prefix: String) { val postPagePosition = world.pages.indexOfFirst { it is PageInfo.ComposePageInfo } assert(postPagePosition != -1) - (pagerAdapter.getPageFragmentAt(postPagePosition) as PostFragment).setInReplyTo(tweet, prefix) + (pagerAdapter.getPageFragmentAt(postPagePosition) as ComposePageFragment).setInReplyTo(tweet, prefix) setSelectedPageIndex(postPagePosition, true) } fun openPostPageAndReplyTo(user: User) { val postPagePosition = world.pages.indexOfFirst { it is PageInfo.ComposePageInfo } assert(postPagePosition != -1) - (pagerAdapter.getPageFragmentAt(postPagePosition) as PostFragment).setInReplyTo(user) + (pagerAdapter.getPageFragmentAt(postPagePosition) as ComposePageFragment).setInReplyTo(user) setSelectedPageIndex(postPagePosition, true) } fun openPostPageAndAppendText(text: String) { val postPagePosition = world.pages.indexOfFirst { it is PageInfo.ComposePageInfo } assert(postPagePosition != -1) - (pagerAdapter.getPageFragmentAt(postPagePosition) as PostFragment).appendText(text) + (pagerAdapter.getPageFragmentAt(postPagePosition) as ComposePageFragment).appendText(text) setSelectedPageIndex(postPagePosition, true) } @@ -152,7 +152,7 @@ class MainActivity : AppCompatActivity() { text += " via @" + via val postPagePosition = world.pages.indexOfFirst { it is PageInfo.ComposePageInfo } assert(postPagePosition != -1) - (pagerAdapter.getPageFragmentAt(postPagePosition) as PostFragment).setText(text) + (pagerAdapter.getPageFragmentAt(postPagePosition) as ComposePageFragment).setText(text) setSelectedPageIndex(postPagePosition, true) return } @@ -191,14 +191,14 @@ class MainActivity : AppCompatActivity() { } val postPagePosition = world.pages.indexOfFirst { it is PageInfo.ComposePageInfo } assert(postPagePosition != -1) - (pagerAdapter.getPageFragmentAt(postPagePosition) as PostFragment).setText(text) + (pagerAdapter.getPageFragmentAt(postPagePosition) as ComposePageFragment).setText(text) setSelectedPageIndex(postPagePosition, true) return } } else if (type != null && type.startsWith("image/")) { val postPagePosition = world.pages.indexOfFirst { it is PageInfo.ComposePageInfo } assert(postPagePosition != -1) - (pagerAdapter.getPageFragmentAt(postPagePosition) as PostFragment) + (pagerAdapter.getPageFragmentAt(postPagePosition) as ComposePageFragment) .setMediaFile(intent.getParcelableExtra(Intent.EXTRA_STREAM)) } } diff --git a/app/src/main/java/net/lacolaco/smileessence/data/Pages.kt b/app/src/main/java/net/lacolaco/smileessence/data/Pages.kt index 7e522079..ffdf09aa 100644 --- a/app/src/main/java/net/lacolaco/smileessence/data/Pages.kt +++ b/app/src/main/java/net/lacolaco/smileessence/data/Pages.kt @@ -9,7 +9,7 @@ sealed class PageInfo(val fragmentClass: Class<out PageFragment<*>>) { abstract fun describe(): String abstract fun toJson(): JsonObject - class ComposePageInfo() : PageInfo(PostFragment::class.java) { + class ComposePageInfo() : PageInfo(ComposePageFragment::class.java) { override val name = "Compose" override fun describe(): String { @@ -40,7 +40,7 @@ sealed class PageInfo(val fragmentClass: Class<out PageFragment<*>>) { } } - class MessagesPageInfo() : PageInfo(MessagesFragment::class.java) { + class MessagesPageInfo() : PageInfo(MessagesPageFragment::class.java) { override val name = "Messages" override fun describe(): String { @@ -68,7 +68,7 @@ sealed class PageInfo(val fragmentClass: Class<out PageFragment<*>>) { } } - class SearchPageInfo(var query: String) : PageInfo(SearchFragment::class.java) { + class SearchPageInfo(var query: String) : PageInfo(SearchPageFragment::class.java) { override val name get() = "Search" @@ -83,7 +83,7 @@ sealed class PageInfo(val fragmentClass: Class<out PageFragment<*>>) { } } - class ListPageInfo(var fullName: String?) : PageInfo(UserListFragment::class.java) { + class ListPageInfo(var fullName: String?) : PageInfo(ListPageFragment::class.java) { override val name get() = "List (${fullName ?: "<not selected>"})" diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt index 94814e0b..e8a4e259 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt @@ -34,7 +34,7 @@ import net.lacolaco.smileessence.view.Partials import twitter4j.StatusUpdate import java.io.File -class PostFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatcher { +class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatcher { private lateinit var postState: PostState fun setMediaFile(uri: Uri) { diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt index 03028fc3..a226266e 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt @@ -16,7 +16,7 @@ import net.lacolaco.smileessence.util.launchUi import net.lacolaco.smileessence.view.Partials import net.lacolaco.smileessence.view.PopupMenu -class UserListFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.ListPageInfo>() { +class ListPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.ListPageInfo>() { override fun refresh() { if (pageInfo.fullName != null) runRefreshTask(world.getListTimelineAsync(pageInfo.fullName!!)) {} diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/MessagesFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/MessagesPageFragment.kt index f235827f..aa5d9b20 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/MessagesFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/MessagesPageFragment.kt @@ -16,7 +16,7 @@ import net.lacolaco.smileessence.util.launchUi import net.lacolaco.smileessence.view.Partials // TODO: Needs rework -class MessagesFragment : RefreshableTimelinePageFragment<DirectMessage, PageInfo.MessagesPageInfo>() { +class MessagesPageFragment : RefreshableTimelinePageFragment<DirectMessage, PageInfo.MessagesPageInfo>() { override fun refresh() { runRefreshTask(world.getReceivedMessagesAsync()) {} runRefreshTask(world.getSentMessagesAsync()) {} diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt index 00e94b91..51102a54 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt @@ -26,7 +26,7 @@ import net.lacolaco.smileessence.view.confirm import twitter4j.Query import java.util.* -class SearchFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.SearchPageInfo>() { +class SearchPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.SearchPageInfo>() { override fun refresh() { if (pageInfo.query.isNotBlank()) startSearch(pageInfo.query) |