diff options
author | Alex Ning <chineseperson5@gmail.com> | 2019-02-21 09:24:23 +0000 |
---|---|---|
committer | Alex Ning <chineseperson5@gmail.com> | 2019-02-21 09:24:23 +0000 |
commit | 82d97cf73208f3f187b965fca4460f68af33f6b7 (patch) | |
tree | 76da6482a83ebc3d09b6a8f0353d057f200ddfde /app/src/main/res | |
parent | 2b0228ab476426531f0f064e80e3cf2019081569 (diff) | |
download | infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.gz infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.bz2 infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.lz infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.xz infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.zst infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.zip |
Migrate to AndroidX
Diffstat (limited to '')
-rw-r--r-- | app/src/main/res/layout/activity_login.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_view_post_detail.xml | 24 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_view_subreddit_detail.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_view_user_detail.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/layout/app_bar_main.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_post.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/item_post.xml | 12 |
8 files changed, 52 insertions, 52 deletions
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index ebe641c7..908efa3c 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" android:layout_width="match_parent" @@ -11,4 +11,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5da5a9d3..6a5a0aff 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawer_layout" @@ -13,14 +13,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <android.support.design.widget.NavigationView + <com.google.android.material.navigation.NavigationView android:id="@+id/nav_view" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true"> - <android.support.v4.widget.NestedScrollView + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical"> @@ -72,7 +72,7 @@ android:layout_margin="16dp" android:visibility="gone"/> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/subscribed_user_recycler_view_main_activity" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -85,15 +85,15 @@ android:layout_margin="16dp" android:visibility="gone"/> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/subscribed_subreddit_recycler_view_main_activity" android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> - </android.support.v4.widget.NestedScrollView> + </androidx.core.widget.NestedScrollView> - </android.support.design.widget.NavigationView> + </com.google.android.material.navigation.NavigationView> -</android.support.v4.widget.DrawerLayout> +</androidx.drawerlayout.widget.DrawerLayout> diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml index 103edf40..0f7c2002 100644 --- a/app/src/main/res/layout/activity_view_post_detail.xml +++ b/app/src/main/res/layout/activity_view_post_detail.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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:id="@+id/coordinator_layout_view_post_detail" @@ -7,7 +7,7 @@ android:layout_height="match_parent" tools:context=".ViewPostDetailActivity"> - <android.support.v4.widget.NestedScrollView + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -17,7 +17,7 @@ android:orientation="vertical" android:descendantFocusability="blocksDescendants"> - <android.support.design.card.MaterialCardView + <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -26,7 +26,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <android.support.constraint.ConstraintLayout + <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/relative_layout_view_post_detail" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -66,7 +66,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> - </android.support.constraint.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> <TextView android:id="@+id/title_text_view_view_post_detail" @@ -94,7 +94,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp"> - <android.support.design.chip.Chip + <com.google.android.material.chip.Chip android:id="@+id/type_text_view_view_post_detail" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -138,7 +138,7 @@ android:tint="@color/colorAccent" android:visibility="gone"/> - <android.support.design.chip.Chip + <com.google.android.material.chip.Chip android:id="@+id/nsfw_text_view_view_post_detail" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -257,7 +257,7 @@ </LinearLayout> - </android.support.design.card.MaterialCardView> + </com.google.android.material.card.MaterialCardView> <com.lsjwzh.widget.materialloadingprogressbar.CircleProgressBar android:id="@+id/comment_progress_bar_view_post_detail" @@ -269,7 +269,7 @@ app:mlpb_progress_color="@color/colorAccent" android:layout_gravity="center_horizontal"/> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/comment_card_view_view_post_detail" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -300,7 +300,7 @@ </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> <LinearLayout android:id="@+id/no_comment_wrapper_linear_layout_view_post_detail" @@ -329,6 +329,6 @@ </LinearLayout> - </android.support.v4.widget.NestedScrollView> + </androidx.core.widget.NestedScrollView> -</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index 51566dbe..5d83b5fa 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -7,13 +7,13 @@ android:id="@+id/coordinator_layout_view_subreddit_detail_activity" tools:context=".ViewSubredditDetailActivity"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:id="@+id/app_bar_layout_view_subreddit_detail_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <android.support.design.widget.CollapsingToolbarLayout + <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@+id/collapsing_toolbar_layout_view_subreddit_detail_activity" android:layout_width="match_parent" android:layout_height="match_parent" @@ -61,7 +61,7 @@ android:textColor="@color/colorAccent" android:layout_gravity="center_horizontal"/> - <android.support.design.chip.Chip + <com.google.android.material.chip.Chip android:id="@+id/subscribe_subreddit_chip_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -103,7 +103,7 @@ </RelativeLayout> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" @@ -112,10 +112,10 @@ app:popupTheme="@style/AppTheme.PopupOverlay" app:navigationIcon="?attr/homeAsUpIndicator" /> - </android.support.design.widget.CollapsingToolbarLayout> + </com.google.android.material.appbar.CollapsingToolbarLayout> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <include layout="@layout/content_view_subreddit_detail" /> -</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index a1fa6dc4..ca8625d3 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -7,13 +7,13 @@ android:id="@+id/coordinator_layout_view_user_detail_activity" tools:context=".ViewUserDetailActivity"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:id="@+id/app_bar_layout_view_user_detail_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <android.support.design.widget.CollapsingToolbarLayout + <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@+id/collapsing_toolbar_layout_view_user_detail_activity" android:layout_width="match_parent" android:layout_height="match_parent" @@ -69,7 +69,7 @@ android:textColor="@android:color/black" android:layout_gravity="center_horizontal"/> - <android.support.design.chip.Chip + <com.google.android.material.chip.Chip android:id="@+id/subscribe_user_chip_view_user_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -82,7 +82,7 @@ </RelativeLayout> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" @@ -91,10 +91,10 @@ app:popupTheme="@style/AppTheme.PopupOverlay" app:navigationIcon="?attr/homeAsUpIndicator"/> - </android.support.design.widget.CollapsingToolbarLayout> + </com.google.android.material.appbar.CollapsingToolbarLayout> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <include layout="@layout/content_view_user_detail" /> -</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index b4df7936..f8894bda 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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="match_parent" tools:context="ml.docilealligator.infinityforreddit.MainActivity"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" /> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <include layout="@layout/content_main" /> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/fragment_post.xml b/app/src/main/res/layout/fragment_post.xml index 1c78fcad..3b073f08 100644 --- a/app/src/main/res/layout/fragment_post.xml +++ b/app/src/main/res/layout/fragment_post.xml @@ -1,4 +1,4 @@ -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" @@ -16,7 +16,7 @@ app:mlpb_progress_color="@color/colorAccent" android:layout_gravity="center_horizontal"/> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view_post_fragment" android:layout_width="match_parent" android:layout_height="match_parent" /> @@ -51,4 +51,4 @@ android:layout_margin="@dimen/fab_margin" app:srcCompat="@drawable/baseline_add_white_24" />--> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index b3d32486..9d94cb2a 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.design.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView 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="wrap_content" @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.constraint.ConstraintLayout + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -65,7 +65,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - </android.support.constraint.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> <TextView android:id="@+id/title_text_view_best_post_item" @@ -82,7 +82,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp"> - <android.support.design.chip.Chip + <com.google.android.material.chip.Chip android:id="@+id/type_text_view_item_best_post" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -129,7 +129,7 @@ android:layout_centerVertical="true" android:visibility="gone"/> - <android.support.design.chip.Chip + <com.google.android.material.chip.Chip android:id="@+id/nsfw_text_view_item_best_post" android:text="@string/nsfw" android:layout_width="wrap_content" @@ -250,4 +250,4 @@ </LinearLayout> -</android.support.design.card.MaterialCardView>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file |