diff options
Diffstat (limited to 'app/src/main/res')
8 files changed, 18 insertions, 22 deletions
diff --git a/app/src/main/res/layout/app_list_dialog_fragment.xml b/app/src/main/res/layout/app_list_dialog_fragment.xml index c975778a..50e795d5 100644 --- a/app/src/main/res/layout/app_list_dialog_fragment.xml +++ b/app/src/main/res/layout/app_list_dialog_fragment.xml @@ -30,7 +30,7 @@ android:indeterminate="true" android:visibility="@{appData.isEmpty() ? View.VISIBLE : View.GONE}" /> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/app_list" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/config_naming_dialog_fragment.xml b/app/src/main/res/layout/config_naming_dialog_fragment.xml index bf8b4267..a7017804 100644 --- a/app/src/main/res/layout/config_naming_dialog_fragment.xml +++ b/app/src/main/res/layout/config_naming_dialog_fragment.xml @@ -12,7 +12,7 @@ android:layout_height="match_parent" android:padding="16dp"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/tunnel_name_text_layout" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -25,7 +25,7 @@ android:inputType="textNoSuggestions|textVisiblePassword" app:filter="@{NameInputFilter.newInstance()}" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </FrameLayout> diff --git a/app/src/main/res/layout/tunnel_detail_fragment.xml b/app/src/main/res/layout/tunnel_detail_fragment.xml index 9b06ddd4..34332c2f 100644 --- a/app/src/main/res/layout/tunnel_detail_fragment.xml +++ b/app/src/main/res/layout/tunnel_detail_fragment.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" @@ -122,7 +122,7 @@ android:contentDescription="@string/addresses" android:text="@{config.interface.addresses}" /> </RelativeLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/tunnel_detail_peer.xml b/app/src/main/res/layout/tunnel_detail_peer.xml index 767e0383..f528a8df 100644 --- a/app/src/main/res/layout/tunnel_detail_peer.xml +++ b/app/src/main/res/layout/tunnel_detail_peer.xml @@ -11,7 +11,7 @@ type="com.wireguard.config.Peer" /> </data> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" @@ -90,5 +90,5 @@ android:layout_below="@+id/endpoint_label" android:text="@{item.endpoint}" /> </RelativeLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </layout> diff --git a/app/src/main/res/layout/tunnel_editor_fragment.xml b/app/src/main/res/layout/tunnel_editor_fragment.xml index 3945fffc..db91df2b 100644 --- a/app/src/main/res/layout/tunnel_editor_fragment.xml +++ b/app/src/main/res/layout/tunnel_editor_fragment.xml @@ -24,7 +24,7 @@ type="String" /> </data> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/main_container" android:layout_width="match_parent" android:layout_height="match_parent" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" @@ -228,7 +228,7 @@ android:onClick="@{fragment::onRequestSetExcludedApplications}" android:text="@{@plurals/set_excluded_applications(config.interface.excludedApplications.size, config.interface.excludedApplications.size)}" /> </RelativeLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> <LinearLayout android:layout_width="match_parent" @@ -250,5 +250,5 @@ android:text="@string/add_peer" /> </LinearLayout> </ScrollView> - </android.support.design.widget.CoordinatorLayout> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </layout> diff --git a/app/src/main/res/layout/tunnel_editor_peer.xml b/app/src/main/res/layout/tunnel_editor_peer.xml index 1224ddd3..175c174e 100644 --- a/app/src/main/res/layout/tunnel_editor_peer.xml +++ b/app/src/main/res/layout/tunnel_editor_peer.xml @@ -10,14 +10,14 @@ <variable name="collection" - type="android.databinding.ObservableList<com.wireguard.android.viewmodel.PeerProxy>" /> + type="androidx.databinding.ObservableList<com.wireguard.android.viewmodel.PeerProxy>" /> <variable name="item" type="com.wireguard.android.viewmodel.PeerProxy" /> </data> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp" @@ -157,5 +157,5 @@ android:text="@={item.persistentKeepalive}" android:textAlignment="center" /> </RelativeLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </layout> diff --git a/app/src/main/res/layout/tunnel_list_fragment.xml b/app/src/main/res/layout/tunnel_list_fragment.xml index 38d0dcbd..3a7c1c7a 100644 --- a/app/src/main/res/layout/tunnel_list_fragment.xml +++ b/app/src/main/res/layout/tunnel_list_fragment.xml @@ -19,14 +19,14 @@ type="com.wireguard.android.util.ObservableKeyedList<String, Tunnel>" /> </data> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/main_container" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?android:attr/colorBackground" android:clipChildren="false"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/tunnel_list" android:layout_width="match_parent" android:layout_height="match_parent" @@ -45,7 +45,7 @@ android:orientation="vertical" android:visibility="@{tunnels.size() == 0 ? android.view.View.VISIBLE : android.view.View.GONE}"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/logo_placeholder" android:layout_width="140dp" android:layout_height="140dp" @@ -101,5 +101,5 @@ app:fab_title="@string/create_empty" app:srcCompat="@drawable/ic_action_edit_white" /> </com.wireguard.android.widget.fab.FloatingActionsMenu> - </android.support.design.widget.CoordinatorLayout> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </layout> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0f2685d3..2605691d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -5,10 +5,6 @@ <item name="colorAccent">@color/accent</item> </style> - <style name="SettingsTheme" parent="AppTheme"> - <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> - </style> - <style name="fab_label" parent="TextAppearance.AppCompat.Inverse"> <item name="android:background">@drawable/fab_label_background</item> <item name="android:textColor">@color/fab_label_text_color</item> |