diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_manage_pages.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_manage_profiles.xml | 14 | ||||
-rw-r--r-- | app/src/main/res/layout/dialog_app_info.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/dialog_edit_tweets_page.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/layout/dialog_user_detail.xml | 18 | ||||
-rw-r--r-- | app/src/main/res/layout/item_status_base.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/list_item_event.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/page_fragment_compose.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/page_fragment_list.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/page_fragment_search.xml | 4 |
11 files changed, 44 insertions, 44 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 45496511..69b0df45 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,14 +4,14 @@ android:layout_height="match_parent" android:orientation="vertical"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?actionBarSize" android:background="?colorPrimary" android:elevation="4dp" /> - <android.support.v4.view.ViewPager + <androidx.viewpager.widget.ViewPager android:id="@+id/view_pager" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/app/src/main/res/layout/activity_manage_pages.xml b/app/src/main/res/layout/activity_manage_pages.xml index 72bdb0e8..27909d8b 100644 --- a/app/src/main/res/layout/activity_manage_pages.xml +++ b/app/src/main/res/layout/activity_manage_pages.xml @@ -1,4 +1,4 @@ -<android.support.design.widget.CoordinatorLayout +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" @@ -6,31 +6,31 @@ android:layout_height="match_parent" tools:context="net.lacolaco.smileessence.activity.ManagePagesActivity"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" android:layout_height="wrap_content"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?actionBarSize" android:background="?colorPrimary" android:elevation="4dp" /> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - app:layoutManager="android.support.v7.widget.LinearLayoutManager" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" android:src="@drawable/ic_add_black_24dp" /> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/activity_manage_profiles.xml b/app/src/main/res/layout/activity_manage_profiles.xml index 3847f139..fc75afe9 100644 --- a/app/src/main/res/layout/activity_manage_profiles.xml +++ b/app/src/main/res/layout/activity_manage_profiles.xml @@ -1,32 +1,32 @@ -<android.support.design.widget.CoordinatorLayout +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" android:layout_height="wrap_content"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?actionBarSize" android:background="?colorPrimary" android:elevation="4dp" /> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/profiles" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" android:src="@drawable/ic_add_black_24dp" /> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/dialog_app_info.xml b/app/src/main/res/layout/dialog_app_info.xml index 58916dfe..637f3440 100644 --- a/app/src/main/res/layout/dialog_app_info.xml +++ b/app/src/main/res/layout/dialog_app_info.xml @@ -1,4 +1,4 @@ -<android.support.constraint.ConstraintLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" @@ -43,7 +43,7 @@ app:layout_constraintTop_toBottomOf="@+id/app_name" tools:text="!!!VERSION STRING!!!" /> - <android.support.constraint.Barrier + <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -77,5 +77,5 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/copyright_notices_label" /> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/dialog_edit_tweets_page.xml b/app/src/main/res/layout/dialog_edit_tweets_page.xml index 674145ab..f4b7f667 100644 --- a/app/src/main/res/layout/dialog_edit_tweets_page.xml +++ b/app/src/main/res/layout/dialog_edit_tweets_page.xml @@ -1,18 +1,18 @@ -<android.support.design.widget.CoordinatorLayout +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" android:src="@drawable/ic_add_black_24dp" /> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/dialog_user_detail.xml b/app/src/main/res/layout/dialog_user_detail.xml index c5a2268d..68904fee 100644 --- a/app/src/main/res/layout/dialog_user_detail.xml +++ b/app/src/main/res/layout/dialog_user_detail.xml @@ -1,20 +1,20 @@ -<android.support.design.widget.CoordinatorLayout +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" android:layout_height="wrap_content"> - <android.support.design.widget.CollapsingToolbarLayout + <com.google.android.material.appbar.CollapsingToolbarLayout android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_scrollFlags="scroll|exitUntilCollapsed"> - <android.support.constraint.ConstraintLayout + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -265,9 +265,9 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/toggle_follow" /> - </android.support.constraint.ConstraintLayout> - </android.support.design.widget.CollapsingToolbarLayout> - </android.support.design.widget.AppBarLayout> + </androidx.constraintlayout.widget.ConstraintLayout> + </com.google.android.material.appbar.CollapsingToolbarLayout> + </com.google.android.material.appbar.AppBarLayout> <com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout android:id="@+id/user_detail_refresh_layout" @@ -276,9 +276,9 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" app:srl_direction="both"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_timeline" android:layout_width="match_parent" android:layout_height="wrap_content" /> </com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/item_status_base.xml b/app/src/main/res/layout/item_status_base.xml index 1479ca24..fb9fa853 100644 --- a/app/src/main/res/layout/item_status_base.xml +++ b/app/src/main/res/layout/item_status_base.xml @@ -1,4 +1,4 @@ -<android.support.constraint.ConstraintLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" @@ -137,4 +137,4 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/imageview_status_icon" app:layout_constraintTop_toBottomOf="@+id/textview_status_footer" /> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/list_item_event.xml b/app/src/main/res/layout/list_item_event.xml index 4ca345e6..69e7039c 100644 --- a/app/src/main/res/layout/list_item_event.xml +++ b/app/src/main/res/layout/list_item_event.xml @@ -6,7 +6,7 @@ android:descendantFocusability="blocksDescendants" android:foreground="?android:attr/selectableItemBackground"> - <android.support.constraint.ConstraintLayout + <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" @@ -64,5 +64,5 @@ app:layout_constraintTop_toBottomOf="@+id/textview_status_text" app:layout_goneMarginBottom="5dp" tools:text="2017-01-01 00:00:00" /> - </android.support.constraint.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </net.lacolaco.smileessence.view.TweetStateFrameLayout> diff --git a/app/src/main/res/layout/page_fragment_compose.xml b/app/src/main/res/layout/page_fragment_compose.xml index 77542ba9..dd4451c0 100644 --- a/app/src/main/res/layout/page_fragment_compose.xml +++ b/app/src/main/res/layout/page_fragment_compose.xml @@ -1,4 +1,4 @@ -<android.support.constraint.ConstraintLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" @@ -71,7 +71,7 @@ app:layout_constraintEnd_toEndOf="@id/post_edit_text" tools:text="000" /> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/media_recycler_view" android:layout_width="0dp" android:layout_height="wrap_content" @@ -105,4 +105,4 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/attach_media" /> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/page_fragment_list.xml b/app/src/main/res/layout/page_fragment_list.xml index e8133506..0238dad4 100644 --- a/app/src/main/res/layout/page_fragment_list.xml +++ b/app/src/main/res/layout/page_fragment_list.xml @@ -1,4 +1,4 @@ -<android.support.constraint.ConstraintLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" @@ -41,4 +41,4 @@ <include layout="@layout/page_fragment_refreshable_timeline" /> </FrameLayout> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/page_fragment_search.xml b/app/src/main/res/layout/page_fragment_search.xml index 808a6686..9f3eeedc 100644 --- a/app/src/main/res/layout/page_fragment_search.xml +++ b/app/src/main/res/layout/page_fragment_search.xml @@ -1,4 +1,4 @@ -<android.support.constraint.ConstraintLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" @@ -64,4 +64,4 @@ <include layout="@layout/page_fragment_refreshable_timeline" /> </FrameLayout> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> |