diff options
author | Andrew Dolgov <[email protected]> | 2019-02-08 10:29:41 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2019-02-08 10:29:41 +0300 |
commit | db32a684712369baa46216f9710dea6cb77799c5 (patch) | |
tree | d6f5b958eff5e593bf91b1bfb1e3a24f809a4149 /org.fox.ttrss/src/main/res | |
parent | 406bf377c20606541ab6dc5464ca2009e41d9ffa (diff) |
migrate from android support library to androidx
set target sdk 28
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/activity_logcat.xml | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/activity_master.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/article_pager.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/fragment_cats.xml | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/fragment_feeds.xml | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/fragment_headlines.xml | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/toolbar.xml | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml index 39275c03..f6cccd22 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml @@ -6,7 +6,7 @@ <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/logcat_swipe_container" android:layout_below="@+id/toolbar" android:layout_alignParentBottom="true" @@ -21,6 +21,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </RelativeLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 69ef2c15..3cd0a62a 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -1,4 +1,4 @@ - <android.support.v4.widget.DrawerLayout + <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:id="@+id/headlines_drawer" @@ -41,4 +41,4 @@ </org.fox.ttrss.util.ScrimInsetsFrameLayout> - </android.support.v4.widget.DrawerLayout> + </androidx.drawerlayout.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/article_pager.xml index ff17fb0c..5144f823 100755 --- a/org.fox.ttrss/src/main/res/layout/article_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_pager.xml @@ -5,12 +5,12 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <android.support.v4.view.ViewPager + <androidx.viewpager.widget.ViewPager android:id="@+id/article_pager" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@+id/article_pager_indicator" - android:layout_alignParentTop="true"></android.support.v4.view.ViewPager> + android:layout_alignParentTop="true"/> <com.viewpagerindicator.UnderlinePageIndicator android:id="@+id/article_pager_indicator" diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml index e871a4a2..86875240 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml @@ -36,7 +36,7 @@ android:textColor="?feedlistTextColor" android:textSize="14sp" /> - <android.support.v7.widget.SwitchCompat + <androidx.appcompat.widget.SwitchCompat android:id="@+id/row_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml index ff2e8307..64240be6 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="fill_parent" > - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/feeds_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -16,5 +16,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" > </ListView> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml index eec49bc6..2d8d963b 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml @@ -4,7 +4,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/feeds_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -18,5 +18,5 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true"> </ListView> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </RelativeLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml index d8b70aee..177ef32f 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml @@ -6,7 +6,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/headlines_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -17,7 +17,7 @@ android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" /> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> <com.shamanland.fab.FloatingActionButton android:id="@+id/headlines_fab" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml index c263c852..56a1137a 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml @@ -6,7 +6,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/headlines_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -16,7 +16,7 @@ android:drawSelectorOnTop="true" android:layout_width="match_parent" android:layout_height="match_parent" /> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> <com.shamanland.fab.FloatingActionButton android:id="@+id/headlines_fab" diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index 5093a342..99235ca2 100755 --- a/org.fox.ttrss/src/main/res/layout/toolbar.xml +++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v7.widget.Toolbar +<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar" |