Skip to content

Commit bdb861a

Browse files
committed
Update DemoApp (kotlin) to AndroidX
1 parent 74c6793 commit bdb861a

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

demoappkotlin/src/main/java/com/datatheorem/android/trustkit/demoappkotlin/DemoMainActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package com.datatheorem.android.trustkit.demoappkotlin
33
import android.content.IntentFilter
44
import android.os.AsyncTask
55
import android.os.Bundle
6-
import android.support.v4.content.LocalBroadcastManager
7-
import android.support.v7.app.AppCompatActivity
8-
import android.support.v7.widget.Toolbar
6+
import androidx.localbroadcastmanager.content.LocalBroadcastManager
7+
import androidx.appcompat.app.AppCompatActivity
8+
import androidx.appcompat.widget.Toolbar
99
import android.util.Log
1010
import android.view.Menu
1111
import android.view.MenuItem
@@ -44,7 +44,7 @@ class DemoMainActivity : AppCompatActivity() {
4444
pinningFailureReportBroadcastReceiver = PinningFailureReportBroadcastReceiver()
4545
val intentFilter = IntentFilter(BackgroundReporter.REPORT_VALIDATION_EVENT)
4646
LocalBroadcastManager.getInstance(this.applicationContext)
47-
.registerReceiver(pinningFailureReportBroadcastReceiver,intentFilter)
47+
.registerReceiver(pinningFailureReportBroadcastReceiver,intentFilter)
4848
}
4949

5050
override fun onDestroy() {
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:fitsSystemWindows="true"
77
tools:applicationContext="com.datatheorem.android.trustkit.demoapp.DemoMainActivity">
88

9-
<android.support.design.widget.AppBarLayout
9+
<com.google.android.material.appbar.AppBarLayout
1010
android:layout_width="match_parent"
1111
android:layout_height="wrap_content"
1212
>
1313

14-
<android.support.v7.widget.Toolbar
14+
<androidx.appcompat.widget.Toolbar
1515
android:id="@+id/toolbar"
1616
android:layout_width="match_parent"
1717
android:layout_height="50dp"
1818
android:background="@color/colorPrimary"
1919
/>
2020

21-
</android.support.design.widget.AppBarLayout>
21+
</com.google.android.material.appbar.AppBarLayout>
2222

2323
<include layout="@layout/content_demo_main"/>
2424

25-
<android.support.design.widget.FloatingActionButton
25+
<com.google.android.material.floatingactionbutton.FloatingActionButton
2626
android:id="@+id/fab"
2727
android:layout_width="wrap_content"
2828
android:layout_height="wrap_content"
2929
android:layout_gravity="bottom|end"
3030
android:layout_margin="16dp"
3131
android:src="@android:drawable/ic_dialog_email"/>
3232

33-
</android.support.design.widget.CoordinatorLayout>
33+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)