diff --git a/app/build.gradle b/app/build.gradle index 53e0d126..1a3e6338 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,10 +54,10 @@ greendao { } dependencies { - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' implementation 'org.greenrobot:eventbus:3.0.0' implementation 'org.greenrobot:greendao:3.2.2' annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.1.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 03e47a87..ed2c3dda 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -93,7 +93,7 @@ - + @@ -149,7 +149,7 @@ android:exported="false" /> diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/data/ListAdapter.java b/app/src/main/java/fr/gaulupeau/apps/Poche/data/ListAdapter.java index 6f151e25..7b633fd6 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/data/ListAdapter.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/data/ListAdapter.java @@ -1,7 +1,7 @@ package fr.gaulupeau.apps.Poche.data; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/data/StorageHelper.java b/app/src/main/java/fr/gaulupeau/apps/Poche/data/StorageHelper.java index bd041c41..40fda880 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/data/StorageHelper.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/data/StorageHelper.java @@ -1,6 +1,6 @@ package fr.gaulupeau.apps.Poche.data; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import java.io.File; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/data/TagListAdapter.java b/app/src/main/java/fr/gaulupeau/apps/Poche/data/TagListAdapter.java index e897499b..a9551f49 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/data/TagListAdapter.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/data/TagListAdapter.java @@ -1,7 +1,7 @@ package fr.gaulupeau.apps.Poche.data; -import android.support.annotation.LayoutRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.LayoutRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/events/EventProcessor.java b/app/src/main/java/fr/gaulupeau/apps/Poche/events/EventProcessor.java index ecbc2d4d..0bf13d29 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/events/EventProcessor.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/events/EventProcessor.java @@ -8,8 +8,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Handler; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.FileProvider; +import androidx.core.app.NotificationCompat; +import androidx.core.content.FileProvider; import android.util.Log; import android.webkit.MimeTypeMap; import android.widget.Toast; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/service/WallabagJobService.java b/app/src/main/java/fr/gaulupeau/apps/Poche/service/WallabagJobService.java index b7061ed2..a4a1df28 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/service/WallabagJobService.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/service/WallabagJobService.java @@ -7,7 +7,7 @@ import android.app.job.JobService; import android.content.ComponentName; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsFragment.java b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsFragment.java index 3610a0ca..1230fd64 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsFragment.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsFragment.java @@ -17,9 +17,9 @@ import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.speech.tts.TextToSpeech; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; import android.support.v4.media.session.MediaControllerCompat; import android.support.v4.media.session.PlaybackStateCompat; import android.util.Log; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java index 46109998..b1705890 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java @@ -19,16 +19,17 @@ import android.os.Handler; import android.os.IBinder; import android.os.SystemClock; import android.speech.tts.TextToSpeech; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationManagerCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import android.support.v4.media.MediaDescriptionCompat; import android.support.v4.media.MediaMetadataCompat; -import android.support.v4.media.session.MediaButtonReceiver; + +import androidx.media.session.MediaButtonReceiver; import android.support.v4.media.session.MediaControllerCompat; import android.support.v4.media.session.MediaSessionCompat; import android.support.v4.media.session.PlaybackStateCompat; -import android.support.v4.app.NotificationCompat; import android.util.Log; import android.view.KeyEvent; @@ -814,7 +815,7 @@ public class TtsService } builder.addAction(generateAction(android.R.drawable.ic_media_ff, "Fast Forward", KeyEvent.KEYCODE_MEDIA_FAST_FORWARD)); builder.addAction(generateAction(android.R.drawable.ic_media_next, "Next", KeyEvent.KEYCODE_MEDIA_NEXT)); - builder.setStyle(new android.support.v4.media.app.NotificationCompat.MediaStyle() + builder.setStyle(new androidx.media.app.NotificationCompat.MediaStyle() .setShowActionsInCompactView(0, 1, 2, 3) //FIXME: max number of setShowActionsInCompactView depends on Android VERSION .setMediaSession(mediaSession.getSessionToken()) diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/AddUrlProxyActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/AddUrlProxyActivity.java index 8b696640..b424b6d7 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/AddUrlProxyActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/AddUrlProxyActivity.java @@ -3,8 +3,8 @@ package fr.gaulupeau.apps.Poche.ui; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.util.Patterns; import android.widget.Toast; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListFragment.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListFragment.java index b40c99a0..74185ddd 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListFragment.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListFragment.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.Menu; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsFragment.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsFragment.java index 16d92e33..e2e6133c 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsFragment.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsFragment.java @@ -1,13 +1,13 @@ package fr.gaulupeau.apps.Poche.ui; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.LinearLayoutManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.LinearLayoutManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsPagerAdapter.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsPagerAdapter.java index 913459ac..546d77b3 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsPagerAdapter.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsPagerAdapter.java @@ -1,7 +1,7 @@ package fr.gaulupeau.apps.Poche.ui; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import fr.gaulupeau.apps.InThePoche.R; import fr.gaulupeau.apps.Poche.App; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/BaseActionBarActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/BaseActionBarActivity.java index ea2d50a2..e872b10b 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/BaseActionBarActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/BaseActionBarActivity.java @@ -1,8 +1,8 @@ package fr.gaulupeau.apps.Poche.ui; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; public abstract class BaseActionBarActivity extends AppCompatActivity { diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/CachingPagerAdapter.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/CachingPagerAdapter.java index c76ababb..4e2fa6b0 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/CachingPagerAdapter.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/CachingPagerAdapter.java @@ -1,8 +1,8 @@ package fr.gaulupeau.apps.Poche.ui; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import android.util.Log; import android.view.ViewGroup; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/EndlessRecyclerViewScrollListener.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/EndlessRecyclerViewScrollListener.java index 3802204f..cc0d751d 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/EndlessRecyclerViewScrollListener.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/EndlessRecyclerViewScrollListener.java @@ -1,9 +1,9 @@ package fr.gaulupeau.apps.Poche.ui; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; /** * Sources: diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/HttpSchemeHandlerActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/HttpSchemeHandlerActivity.java index 1250b9dd..df538259 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/HttpSchemeHandlerActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/HttpSchemeHandlerActivity.java @@ -3,7 +3,7 @@ package fr.gaulupeau.apps.Poche.ui; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; public class HttpSchemeHandlerActivity extends AppCompatActivity { diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java index 573cfed2..c189a459 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java @@ -9,18 +9,18 @@ import android.content.res.ColorStateList; import android.content.res.XmlResourceParser; import android.os.Build; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.design.widget.NavigationView; -import android.support.v4.app.Fragment; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.MenuItemCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import com.google.android.material.navigation.NavigationView; +import androidx.fragment.app.Fragment; +import androidx.core.view.GravityCompat; +import androidx.core.view.MenuItemCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ManageArticleTagsActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ManageArticleTagsActivity.java index 8a287068..4f7a3084 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ManageArticleTagsActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ManageArticleTagsActivity.java @@ -2,10 +2,10 @@ package fr.gaulupeau.apps.Poche.ui; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java index 8559eecf..a5fe772b 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java @@ -11,8 +11,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.util.Log; import android.view.GestureDetector; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/RecyclerViewListFragment.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/RecyclerViewListFragment.java index 27c5c557..db8c9759 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/RecyclerViewListFragment.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/RecyclerViewListFragment.java @@ -1,13 +1,13 @@ package fr.gaulupeau.apps.Poche.ui; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/TagListFragment.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/TagListFragment.java index 91f5cd3b..b53fc013 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/TagListFragment.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/TagListFragment.java @@ -2,8 +2,8 @@ package fr.gaulupeau.apps.Poche.ui; import android.content.Context; import android.os.Bundle; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/Themes.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/Themes.java index 4c025c13..5eff184b 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/Themes.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/Themes.java @@ -1,8 +1,8 @@ package fr.gaulupeau.apps.Poche.ui; import android.app.Activity; -import android.support.annotation.StringRes; -import android.support.annotation.StyleRes; +import androidx.annotation.StringRes; +import androidx.annotation.StyleRes; import java.util.Map; import java.util.WeakHashMap; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConfigurationTestHelper.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConfigurationTestHelper.java index 8636b721..95b51d19 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConfigurationTestHelper.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConfigurationTestHelper.java @@ -6,7 +6,7 @@ import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java index ef65d9ea..446ae65e 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java @@ -4,9 +4,9 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/SettingsActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/SettingsActivity.java index 5939b2ee..7e630741 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/SettingsActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/SettingsActivity.java @@ -9,7 +9,7 @@ import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceFragment; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2a93467a..07aba89f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/activity_main_appbar.xml b/app/src/main/res/layout/activity_main_appbar.xml index 83fcee61..790fc484 100644 --- a/app/src/main/res/layout/activity_main_appbar.xml +++ b/app/src/main/res/layout/activity_main_appbar.xml @@ -1,5 +1,5 @@ - - @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + - + diff --git a/app/src/main/res/layout/activity_manage_article_tags.xml b/app/src/main/res/layout/activity_manage_article_tags.xml index 87055deb..f9731e49 100644 --- a/app/src/main/res/layout/activity_manage_article_tags.xml +++ b/app/src/main/res/layout/activity_manage_article_tags.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - +