aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorpacien2019-10-13 01:09:17 +0200
committerpacien2019-10-13 01:09:17 +0200
commitc25f024320abf58d0831f10fa877f6a58635cd53 (patch)
tree4ca3b5dca47ccb8eb23aa37b8163117310e48b56 /app/src/main/res
parent2c566d2bf3c3f4663426cc9bb0d3917e5989635b (diff)
downloadtincapp-c25f024320abf58d0831f10fa877f6a58635cd53.tar.gz
target sdk 28
switching from android.support to androidx
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/base_activity.xml4
-rw-r--r--app/src/main/res/layout/status_activity.xml8
2 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/res/layout/base_activity.xml b/app/src/main/res/layout/base_activity.xml
index e61fea4..5227657 100644
--- a/app/src/main/res/layout/base_activity.xml
+++ b/app/src/main/res/layout/base_activity.xml
@@ -2,7 +2,7 @@
2 2
3<!-- 3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 5 * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
18 * along with this program. If not, see <https://www.gnu.org/licenses/>. 18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19--> 19-->
20 20
21<android.support.design.widget.CoordinatorLayout 21<androidx.coordinatorlayout.widget.CoordinatorLayout
22 xmlns:android="http://schemas.android.com/apk/res/android" 22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:id="@+id/base_activity_frame" 23 android:id="@+id/base_activity_frame"
24 android:layout_width="match_parent" 24 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/status_activity.xml b/app/src/main/res/layout/status_activity.xml
index 5da6d21..e7aa98a 100644
--- a/app/src/main/res/layout/status_activity.xml
+++ b/app/src/main/res/layout/status_activity.xml
@@ -2,7 +2,7 @@
2 2
3<!-- 3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 5 * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -18,13 +18,13 @@
18 * along with this program. If not, see <https://www.gnu.org/licenses/>. 18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19--> 19-->
20 20
21<android.support.v4.view.ViewPager 21<androidx.viewpager.widget.ViewPager
22 xmlns:android="http://schemas.android.com/apk/res/android" 22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:id="@+id/status_activity_pager" 23 android:id="@+id/status_activity_pager"
24 android:layout_width="match_parent" 24 android:layout_width="match_parent"
25 android:layout_height="match_parent"> 25 android:layout_height="match_parent">
26 26
27 <android.support.design.widget.TabLayout 27 <com.google.android.material.tabs.TabLayout
28 style="@style/AppTheme.TabLayout"/> 28 style="@style/AppTheme.TabLayout"/>
29 29
30</android.support.v4.view.ViewPager> 30</androidx.viewpager.widget.ViewPager>