From f7dfffa762c6bb7188e986b3141c7322c92795d5 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 25 Feb 2022 18:57:31 +0100 Subject: [PATCH] merge ModalTimelineActivity & ViewTagActivity into StatusListActivity (#2332) * Rename .java to .kt * merge ModalTimelineActivity & ViewTagActivity into StatusListActivity * fix crash when opening hashtag --- .../com/keylesspalace/tusky/ListsActivity.kt | 3 +- .../tusky/ModalTimelineActivity.kt | 62 --------------- .../keylesspalace/tusky/StatusListActivity.kt | 45 ++++++++--- .../keylesspalace/tusky/ViewTagActivity.java | 79 ------------------- .../components/account/AccountActivity.kt | 5 +- .../announcements/AnnouncementsActivity.kt | 19 ++--- .../conversation/ConversationsFragment.kt | 6 +- .../fragments/ReportStatusesFragment.kt | 6 +- .../search/fragments/SearchFragment.kt | 4 +- .../tusky/di/ActivitiesModule.kt | 8 -- .../tusky/fragment/SFragment.java | 5 +- .../{LinkListener.java => LinkListener.kt} | 10 +-- .../res/layout/activity_modal_timeline.xml | 21 ----- .../main/res/layout/activity_statuslist.xml | 4 +- app/src/main/res/layout/activity_view_tag.xml | 19 ----- 15 files changed, 59 insertions(+), 237 deletions(-) delete mode 100644 app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt delete mode 100644 app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java rename app/src/main/java/com/keylesspalace/tusky/interfaces/{LinkListener.java => LinkListener.kt} (80%) delete mode 100644 app/src/main/res/layout/activity_modal_timeline.xml delete mode 100644 app/src/main/res/layout/activity_view_tag.xml diff --git a/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt index 3bd0d4981..f2f7b38e7 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt @@ -40,7 +40,6 @@ import at.connyduck.sparkbutton.helpers.Utils import autodispose2.androidx.lifecycle.AndroidLifecycleScopeProvider.from import autodispose2.autoDispose import com.google.android.material.snackbar.Snackbar -import com.keylesspalace.tusky.components.timeline.viewmodel.TimelineViewModel import com.keylesspalace.tusky.databinding.ActivityListsBinding import com.keylesspalace.tusky.di.Injectable import com.keylesspalace.tusky.di.ViewModelFactory @@ -201,7 +200,7 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector { private fun onListSelected(listId: String) { startActivityWithSlideInAnimation( - ModalTimelineActivity.newIntent(this, TimelineViewModel.Kind.LIST, listId) + StatusListActivity.newListIntent(this, listId) ) } diff --git a/app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt b/app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt deleted file mode 100644 index 044349b9d..000000000 --- a/app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.keylesspalace.tusky - -import android.content.Context -import android.content.Intent -import android.os.Bundle -import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.keylesspalace.tusky.components.timeline.TimelineFragment -import com.keylesspalace.tusky.components.timeline.viewmodel.TimelineViewModel -import com.keylesspalace.tusky.databinding.ActivityModalTimelineBinding -import com.keylesspalace.tusky.interfaces.ActionButtonActivity -import dagger.android.DispatchingAndroidInjector -import dagger.android.HasAndroidInjector -import javax.inject.Inject - -class ModalTimelineActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInjector { - - @Inject - lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - val binding = ActivityModalTimelineBinding.inflate(layoutInflater) - setContentView(binding.root) - - setSupportActionBar(binding.includedToolbar.toolbar) - supportActionBar?.apply { - title = getString(R.string.title_list_timeline) - setDisplayHomeAsUpEnabled(true) - setDisplayShowHomeEnabled(true) - } - - if (supportFragmentManager.findFragmentById(R.id.contentFrame) == null) { - val kind = intent?.getSerializableExtra(ARG_KIND) as? TimelineViewModel.Kind - ?: TimelineViewModel.Kind.HOME - val argument = intent?.getStringExtra(ARG_ARG) - supportFragmentManager.beginTransaction() - .replace(R.id.contentFrame, TimelineFragment.newInstance(kind, argument)) - .commit() - } - } - - override fun getActionButton(): FloatingActionButton? = null - - override fun androidInjector() = dispatchingAndroidInjector - - companion object { - private const val ARG_KIND = "kind" - private const val ARG_ARG = "arg" - - @JvmStatic - fun newIntent( - context: Context, - kind: TimelineViewModel.Kind, - argument: String? - ): Intent { - val intent = Intent(context, ModalTimelineActivity::class.java) - intent.putExtra(ARG_KIND, kind) - intent.putExtra(ARG_ARG, argument) - return intent - } - } -} diff --git a/app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt b/app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt index ebe6c63e0..82604022d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt @@ -31,9 +31,6 @@ class StatusListActivity : BottomSheetActivity(), HasAndroidInjector { @Inject lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector - private val kind: Kind - get() = Kind.valueOf(intent.getStringExtra(EXTRA_KIND)!!) - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val binding = ActivityStatuslistBinding.inflate(layoutInflater) @@ -41,10 +38,15 @@ class StatusListActivity : BottomSheetActivity(), HasAndroidInjector { setSupportActionBar(binding.includedToolbar.toolbar) - val title = if (kind == Kind.FAVOURITES) { - R.string.title_favourites - } else { - R.string.title_bookmarks + val kind = Kind.valueOf(intent.getStringExtra(EXTRA_KIND)!!) + val listId = intent.getStringExtra(EXTRA_LIST_ID) + val hashtag = intent.getStringExtra(EXTRA_HASHTAG) + + val title = when (kind) { + Kind.FAVOURITES -> getString(R.string.title_favourites) + Kind.BOOKMARKS -> getString(R.string.title_bookmarks) + Kind.TAG -> getString(R.string.title_tag).format(hashtag) + else -> getString(R.string.title_list_timeline) } supportActionBar?.run { @@ -53,9 +55,15 @@ class StatusListActivity : BottomSheetActivity(), HasAndroidInjector { setDisplayShowHomeEnabled(true) } - supportFragmentManager.commit { - val fragment = TimelineFragment.newInstance(kind) - replace(R.id.fragment_container, fragment) + if (supportFragmentManager.findFragmentById(R.id.fragmentContainer) == null) { + supportFragmentManager.commit { + val fragment = if (kind == Kind.TAG) { + TimelineFragment.newHashtagInstance(listOf(hashtag!!)) + } else { + TimelineFragment.newInstance(kind, listId) + } + replace(R.id.fragmentContainer, fragment) + } } } @@ -64,17 +72,30 @@ class StatusListActivity : BottomSheetActivity(), HasAndroidInjector { companion object { private const val EXTRA_KIND = "kind" + private const val EXTRA_LIST_ID = "id" + private const val EXTRA_HASHTAG = "tag" - @JvmStatic fun newFavouritesIntent(context: Context) = Intent(context, StatusListActivity::class.java).apply { putExtra(EXTRA_KIND, Kind.FAVOURITES.name) } - @JvmStatic fun newBookmarksIntent(context: Context) = Intent(context, StatusListActivity::class.java).apply { putExtra(EXTRA_KIND, Kind.BOOKMARKS.name) } + + fun newListIntent(context: Context, listId: String) = + Intent(context, StatusListActivity::class.java).apply { + putExtra(EXTRA_KIND, Kind.LIST.name) + putExtra(EXTRA_LIST_ID, listId) + } + + @JvmStatic + fun newHashtagIntent(context: Context, hashtag: String) = + Intent(context, StatusListActivity::class.java).apply { + putExtra(EXTRA_KIND, Kind.TAG.name) + putExtra(EXTRA_HASHTAG, hashtag) + } } } diff --git a/app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java b/app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java deleted file mode 100644 index 0071924bc..000000000 --- a/app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright 2017 Andrew Dawson - * - * This file is a part of Tusky. - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU General Public License as published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. - * - * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even - * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. - * - * You should have received a copy of the GNU General Public License along with Tusky; if not, - * see . */ - -package com.keylesspalace.tusky; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.widget.Toolbar; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentTransaction; - -import com.keylesspalace.tusky.components.timeline.TimelineFragment; - -import java.util.Collections; - -import javax.inject.Inject; - -import dagger.android.AndroidInjector; -import dagger.android.DispatchingAndroidInjector; -import dagger.android.HasAndroidInjector; - -public class ViewTagActivity extends BottomSheetActivity implements HasAndroidInjector { - - private static final String HASHTAG = "hashtag"; - - @Inject - public DispatchingAndroidInjector dispatchingAndroidInjector; - - public static Intent getIntent(Context context, String tag){ - Intent intent = new Intent(context,ViewTagActivity.class); - intent.putExtra(HASHTAG,tag); - return intent; - } - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_view_tag); - - String hashtag = getIntent().getStringExtra(HASHTAG); - - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - ActionBar bar = getSupportActionBar(); - - if (bar != null) { - bar.setTitle(String.format(getString(R.string.title_tag), hashtag)); - bar.setDisplayHomeAsUpEnabled(true); - bar.setDisplayShowHomeEnabled(true); - } - - FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); - Fragment fragment = TimelineFragment.newHashtagInstance(Collections.singletonList(hashtag)); - fragmentTransaction.replace(R.id.fragment_container, fragment); - fragmentTransaction.commit(); - } - - @Override - public AndroidInjector androidInjector() { - return dispatchingAndroidInjector; - } - -} diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt index 8ed642b84..65cc4e84c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt @@ -55,8 +55,8 @@ import com.keylesspalace.tusky.AccountListActivity import com.keylesspalace.tusky.BottomSheetActivity import com.keylesspalace.tusky.EditProfileActivity import com.keylesspalace.tusky.R +import com.keylesspalace.tusky.StatusListActivity import com.keylesspalace.tusky.ViewMediaActivity -import com.keylesspalace.tusky.ViewTagActivity import com.keylesspalace.tusky.components.compose.ComposeActivity import com.keylesspalace.tusky.components.report.ReportActivity import com.keylesspalace.tusky.databinding.ActivityAccountBinding @@ -817,8 +817,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI } override fun onViewTag(tag: String) { - val intent = Intent(this, ViewTagActivity::class.java) - intent.putExtra("hashtag", tag) + val intent = StatusListActivity.newHashtagIntent(this, tag) startActivityWithSlideInAnimation(intent) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt index 738476f5d..b0c6653b7 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt @@ -27,7 +27,7 @@ import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import com.keylesspalace.tusky.BottomSheetActivity import com.keylesspalace.tusky.R -import com.keylesspalace.tusky.ViewTagActivity +import com.keylesspalace.tusky.StatusListActivity import com.keylesspalace.tusky.adapter.EmojiAdapter import com.keylesspalace.tusky.adapter.OnEmojiSelectedListener import com.keylesspalace.tusky.databinding.ActivityAnnouncementsBinding @@ -152,22 +152,17 @@ class AnnouncementsActivity : BottomSheetActivity(), AnnouncementActionListener, viewModel.removeReaction(announcementId, name) } - override fun onViewTag(tag: String?) { - val intent = Intent(this, ViewTagActivity::class.java) - intent.putExtra("hashtag", tag) + override fun onViewTag(tag: String) { + val intent = StatusListActivity.newHashtagIntent(this, tag) startActivityWithSlideInAnimation(intent) } - override fun onViewAccount(id: String?) { - if (id != null) { - viewAccount(id) - } + override fun onViewAccount(id: String) { + viewAccount(id) } - override fun onViewUrl(url: String?) { - if (url != null) { - viewUrl(url) - } + override fun onViewUrl(url: String) { + viewUrl(url) } companion object { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt index 958a9c996..684144556 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt @@ -15,7 +15,6 @@ package com.keylesspalace.tusky.components.conversation -import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -31,7 +30,7 @@ import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import com.keylesspalace.tusky.R -import com.keylesspalace.tusky.ViewTagActivity +import com.keylesspalace.tusky.StatusListActivity import com.keylesspalace.tusky.components.account.AccountActivity import com.keylesspalace.tusky.databinding.FragmentTimelineBinding import com.keylesspalace.tusky.di.Injectable @@ -233,8 +232,7 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res } override fun onViewTag(tag: String) { - val intent = Intent(context, ViewTagActivity::class.java) - intent.putExtra("hashtag", tag) + val intent = StatusListActivity.newHashtagIntent(requireContext(), tag) startActivity(intent) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt index e08b01750..20f4f86a0 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt @@ -29,8 +29,8 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.R +import com.keylesspalace.tusky.StatusListActivity import com.keylesspalace.tusky.ViewMediaActivity -import com.keylesspalace.tusky.ViewTagActivity import com.keylesspalace.tusky.components.account.AccountActivity import com.keylesspalace.tusky.components.report.ReportViewModel import com.keylesspalace.tusky.components.report.Screen @@ -180,9 +180,9 @@ class ReportStatusesFragment : Fragment(R.layout.fragment_report_statuses), Inje override fun onViewAccount(id: String) = startActivity(AccountActivity.getIntent(requireContext(), id)) - override fun onViewTag(tag: String) = startActivity(ViewTagActivity.getIntent(requireContext(), tag)) + override fun onViewTag(tag: String) = startActivity(StatusListActivity.newHashtagIntent(requireContext(), tag)) - override fun onViewUrl(url: String?) = viewModel.checkClickedUrl(url) + override fun onViewUrl(url: String) = viewModel.checkClickedUrl(url) companion object { fun newInstance() = ReportStatusesFragment() diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt index 4707cc09e..aeb989b00 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt @@ -15,7 +15,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.BottomSheetActivity import com.keylesspalace.tusky.R -import com.keylesspalace.tusky.ViewTagActivity +import com.keylesspalace.tusky.StatusListActivity import com.keylesspalace.tusky.components.account.AccountActivity import com.keylesspalace.tusky.components.search.SearchViewModel import com.keylesspalace.tusky.databinding.FragmentSearchBinding @@ -113,7 +113,7 @@ abstract class SearchFragment : override fun onViewAccount(id: String) = startActivity(AccountActivity.getIntent(requireContext(), id)) - override fun onViewTag(tag: String) = startActivity(ViewTagActivity.getIntent(requireContext(), tag)) + override fun onViewTag(tag: String) = startActivity(StatusListActivity.newHashtagIntent(requireContext(), tag)) override fun onViewUrl(url: String) { bottomSheetActivity?.viewUrl(url) diff --git a/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt b/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt index 6a440d26d..7d68f75f7 100644 --- a/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt +++ b/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt @@ -24,12 +24,10 @@ import com.keylesspalace.tusky.LicenseActivity import com.keylesspalace.tusky.ListsActivity import com.keylesspalace.tusky.LoginActivity import com.keylesspalace.tusky.MainActivity -import com.keylesspalace.tusky.ModalTimelineActivity import com.keylesspalace.tusky.SplashActivity import com.keylesspalace.tusky.StatusListActivity import com.keylesspalace.tusky.TabPreferenceActivity import com.keylesspalace.tusky.ViewMediaActivity -import com.keylesspalace.tusky.ViewTagActivity import com.keylesspalace.tusky.ViewThreadActivity import com.keylesspalace.tusky.components.account.AccountActivity import com.keylesspalace.tusky.components.announcements.AnnouncementsActivity @@ -71,12 +69,6 @@ abstract class ActivitiesModule { @ContributesAndroidInjector(modules = [FragmentBuildersModule::class]) abstract fun contributesAccountListActivity(): AccountListActivity - @ContributesAndroidInjector(modules = [FragmentBuildersModule::class]) - abstract fun contributesModalTimelineActivity(): ModalTimelineActivity - - @ContributesAndroidInjector(modules = [FragmentBuildersModule::class]) - abstract fun contributesViewTagActivity(): ViewTagActivity - @ContributesAndroidInjector(modules = [FragmentBuildersModule::class]) abstract fun contributesViewThreadActivity(): ViewThreadActivity diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java index 93b169b3c..41b98f68c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java @@ -43,8 +43,8 @@ import com.keylesspalace.tusky.BaseActivity; import com.keylesspalace.tusky.BottomSheetActivity; import com.keylesspalace.tusky.PostLookupFallbackBehavior; import com.keylesspalace.tusky.R; +import com.keylesspalace.tusky.StatusListActivity; import com.keylesspalace.tusky.ViewMediaActivity; -import com.keylesspalace.tusky.ViewTagActivity; import com.keylesspalace.tusky.components.compose.ComposeActivity; import com.keylesspalace.tusky.components.compose.ComposeActivity.ComposeOptions; import com.keylesspalace.tusky.components.report.ReportActivity; @@ -370,8 +370,7 @@ public abstract class SFragment extends Fragment implements Injectable { } protected void viewTag(String tag) { - Intent intent = new Intent(getContext(), ViewTagActivity.class); - intent.putExtra("hashtag", tag); + Intent intent = StatusListActivity.newHashtagIntent(requireContext(), tag); startActivity(intent); } diff --git a/app/src/main/java/com/keylesspalace/tusky/interfaces/LinkListener.java b/app/src/main/java/com/keylesspalace/tusky/interfaces/LinkListener.kt similarity index 80% rename from app/src/main/java/com/keylesspalace/tusky/interfaces/LinkListener.java rename to app/src/main/java/com/keylesspalace/tusky/interfaces/LinkListener.kt index 90599b22f..56faefaf5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/interfaces/LinkListener.java +++ b/app/src/main/java/com/keylesspalace/tusky/interfaces/LinkListener.kt @@ -13,10 +13,10 @@ * You should have received a copy of the GNU General Public License along with Tusky; if not, * see . */ -package com.keylesspalace.tusky.interfaces; +package com.keylesspalace.tusky.interfaces -public interface LinkListener { - void onViewTag(String tag); - void onViewAccount(String id); - void onViewUrl(String url); +interface LinkListener { + fun onViewTag(tag: String) + fun onViewAccount(id: String) + fun onViewUrl(url: String) } diff --git a/app/src/main/res/layout/activity_modal_timeline.xml b/app/src/main/res/layout/activity_modal_timeline.xml deleted file mode 100644 index 05de634d0..000000000 --- a/app/src/main/res/layout/activity_modal_timeline.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_statuslist.xml b/app/src/main/res/layout/activity_statuslist.xml index 17707623b..883253aa2 100644 --- a/app/src/main/res/layout/activity_statuslist.xml +++ b/app/src/main/res/layout/activity_statuslist.xml @@ -11,11 +11,11 @@ layout="@layout/toolbar_basic" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_tag.xml b/app/src/main/res/layout/activity_view_tag.xml deleted file mode 100644 index e9833824e..000000000 --- a/app/src/main/res/layout/activity_view_tag.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - \ No newline at end of file