cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate to androidx

Browse Source
This commit is contained in:
Vincent Breitmoser
2019-11-15 12:09:08 +01:00
parent 5cd210831b
commit 5172002f0e
343 changed files with 946 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -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:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -8,7 +8,7 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
android:fitsSystemWindows="true"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<android.support.design.widget.FixedCollapsingToolbarLayout
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -145,7 +145,7 @@
android:visibility="invisible"
tools:visibility="visible" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/view_key_qr_code_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -168,11 +168,11 @@
android:id="@+id/view_key_qr_code"
android:layout_width="96dp"
android:layout_height="96dp" />
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</RelativeLayout>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -183,11 +183,11 @@
app:layout_collapseMode="pin"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute" />
</android.support.design.widget.FixedCollapsingToolbarLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<android.support.v4.widget.FlingNestedScrollView
<androidx.core.widget.NestedScrollView
android:id="@+id/scroll"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -216,9 +216,9 @@
</LinearLayout>
</android.support.v4.widget.FlingNestedScrollView>
</androidx.core.widget.NestedScrollView>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:contentDescription="@string/cd_exchange_keys"
android:layout_width="wrap_content"
@@ -230,4 +230,4 @@
app:layout_anchorGravity="bottom|right|end"
tools:visibility="visible" />
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>