Skip to content

Commit 9da5d0c

Browse files
KhushbuShah25KhushbuShah25
committed
Migrated to AndroidX.
1 parent 7ccfc2e commit 9da5d0c

40 files changed

+144
-143
lines changed

‎app/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
targetSdkVersion 28
1919
versionCode 12
2020
versionName "2.0"
21-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
21+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2222
signingConfig signingConfigs.config
2323
}
2424
buildTypes {
@@ -92,12 +92,12 @@ protobuf {
9292

9393
dependencies {
9494
implementation fileTree(include: ['*.jar'], dir: 'libs')
95-
implementation 'com.android.support:appcompat-v7:28.0.0'
96-
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
97-
implementation 'com.android.support:design:28.0.0'
95+
implementation 'androidx.appcompat:appcompat:1.0.0'
96+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
97+
implementation 'com.google.android.material:material:1.0.0'
9898
testImplementation 'junit:junit:4.12'
99-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
100-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
99+
androidTestImplementation 'androidx.test:runner:1.1.0'
100+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
101101
implementation 'com.google.protobuf:protobuf-lite:3.0.1'
102102
implementation files('../login-with-amazon-sdk.jar')
103103
implementation 'com.google.crypto.tink:tink-android:1.1.0'

‎app/src/androidTest/java/com/espressif/espressif/ExampleInstrumentedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
package com.espressif.espressif;
1515

1616
import android.content.Context;
17-
import android.support.test.InstrumentationRegistry;
18-
import android.support.test.runner.AndroidJUnit4;
17+
import androidx.test.InstrumentationRegistry;
18+
import androidx.test.runner.AndroidJUnit4;
1919

2020
import org.junit.Test;
2121
import org.junit.runner.RunWith;

‎app/src/main/java/com/espressif/ui/activities/AlexaActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.net.Uri;
55
import android.os.Bundle;
66
import android.os.Vibrator;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.text.SpannableString;
1010
import android.text.Spanned;
1111
import android.text.TextPaint;

‎app/src/main/java/com/espressif/ui/activities/AppInfoActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.pm.PackageInfo;
44
import android.content.pm.PackageManager;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
6+
import androidx.annotation.Nullable;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.widget.TextView;
1010

1111
import com.espressif.provision.R;

‎app/src/main/java/com/espressif/ui/activities/BLEProvisionLanding.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import android.os.Handler;
3131
import android.os.ParcelUuid;
3232
import android.os.Vibrator;
33-
import android.support.v7.app.AlertDialog;
34-
import android.support.v7.app.AppCompatActivity;
35-
import android.support.v7.widget.Toolbar;
33+
import androidx.appcompat.app.AlertDialog;
34+
import androidx.appcompat.app.AppCompatActivity;
35+
import androidx.appcompat.widget.Toolbar;
3636
import android.util.Log;
3737
import android.view.HapticFeedbackConstants;
3838
import android.view.View;

‎app/src/main/java/com/espressif/ui/activities/DeviceActivity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import android.content.Intent;
55
import android.graphics.Color;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.v7.app.AlertDialog;
9-
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.widget.Toolbar;
7+
import androidx.annotation.Nullable;
8+
import androidx.appcompat.app.AlertDialog;
9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.appcompat.widget.Toolbar;
1111
import android.text.TextUtils;
1212
import android.util.Log;
1313
import android.view.LayoutInflater;

‎app/src/main/java/com/espressif/ui/activities/DeviceInfoActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
6-
import android.support.v7.app.AppCompatActivity;
7-
import android.support.v7.widget.Toolbar;
5+
import androidx.annotation.Nullable;
6+
import androidx.appcompat.app.AppCompatActivity;
7+
import androidx.appcompat.widget.Toolbar;
88
import android.widget.TextView;
99

1010
import com.espressif.AppConstants;

‎app/src/main/java/com/espressif/ui/activities/EspMainActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import android.os.Bundle;
2424
import android.os.Vibrator;
2525
import android.provider.Settings;
26-
import android.support.v7.app.AlertDialog;
27-
import android.support.v7.app.AppCompatActivity;
28-
import android.support.v7.widget.Toolbar;
26+
import androidx.appcompat.app.AlertDialog;
27+
import androidx.appcompat.app.AppCompatActivity;
28+
import androidx.appcompat.widget.Toolbar;
2929
import android.text.TextUtils;
3030
import android.util.Log;
3131
import android.view.HapticFeedbackConstants;

‎app/src/main/java/com/espressif/ui/activities/LanguageListActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.Intent;
44
import android.graphics.Color;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
6+
import androidx.annotation.Nullable;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.util.Log;
1010
import android.view.View;
1111
import android.widget.AdapterView;

‎app/src/main/java/com/espressif/ui/activities/LoginWithAmazon.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import android.graphics.Color;
1818
import android.os.Bundle;
1919
import android.os.Vibrator;
20-
import android.support.design.widget.Snackbar;
21-
import android.support.v7.app.AppCompatActivity;
22-
import android.support.v7.widget.Toolbar;
20+
import com.google.android.material.snackbar.Snackbar;
21+
import androidx.appcompat.app.AppCompatActivity;
22+
import androidx.appcompat.widget.Toolbar;
2323
import android.text.TextUtils;
2424
import android.util.Log;
2525
import android.view.HapticFeedbackConstants;
@@ -28,7 +28,6 @@
2828
import android.view.View;
2929
import android.view.WindowManager;
3030
import android.widget.Button;
31-
import android.widget.ProgressBar;
3231
import android.widget.TextView;
3332
import android.widget.Toast;
3433

‎app/src/main/java/com/espressif/ui/activities/ManageDevices.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
6-
import android.support.v7.widget.Toolbar;
5+
import androidx.appcompat.app.AppCompatActivity;
6+
import androidx.appcompat.widget.Toolbar;
77
import android.util.Log;
88
import android.view.View;
99
import android.widget.Button;

‎app/src/main/java/com/espressif/ui/activities/ProofOfPossessionActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
6-
import android.support.v7.widget.Toolbar;
5+
import androidx.appcompat.app.AppCompatActivity;
6+
import androidx.appcompat.widget.Toolbar;
77
import android.text.Editable;
88
import android.text.TextUtils;
99
import android.text.TextWatcher;

‎app/src/main/java/com/espressif/ui/activities/ProvisionActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import android.graphics.Color;
1818
import android.os.Bundle;
1919
import android.os.Vibrator;
20-
import android.support.v7.app.AppCompatActivity;
21-
import android.support.v7.widget.Toolbar;
20+
import androidx.appcompat.app.AppCompatActivity;
21+
import androidx.appcompat.widget.Toolbar;
2222
import android.text.Editable;
2323
import android.text.TextUtils;
2424
import android.text.TextWatcher;

‎app/src/main/java/com/espressif/ui/activities/ProvisionLanding.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import android.os.Bundle;
2626
import android.os.Vibrator;
2727
import android.provider.Settings;
28-
import android.support.v4.app.ActivityCompat;
29-
import android.support.v4.content.ContextCompat;
30-
import android.support.v7.app.AppCompatActivity;
31-
import android.support.v7.widget.Toolbar;
28+
import androidx.core.app.ActivityCompat;
29+
import androidx.core.content.ContextCompat;
30+
import androidx.appcompat.app.AppCompatActivity;
31+
import androidx.appcompat.widget.Toolbar;
3232
import android.text.Spannable;
3333
import android.text.SpannableStringBuilder;
3434
import android.text.TextUtils;

‎app/src/main/java/com/espressif/ui/activities/ProvisionSuccessActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import android.content.Intent;
1717
import android.os.Bundle;
1818
import android.os.Vibrator;
19-
import android.support.v7.app.AppCompatActivity;
20-
import android.support.v7.widget.Toolbar;
19+
import androidx.appcompat.app.AppCompatActivity;
20+
import androidx.appcompat.widget.Toolbar;
2121
import android.view.HapticFeedbackConstants;
2222
import android.view.View;
2323
import android.widget.Button;

‎app/src/main/java/com/espressif/ui/activities/ScanLocalDevices.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import android.os.Bundle;
77
import android.os.Handler;
88
import android.os.Vibrator;
9-
import android.support.v7.app.AlertDialog;
10-
import android.support.v7.app.AppCompatActivity;
11-
import android.support.v7.widget.Toolbar;
9+
import androidx.appcompat.app.AlertDialog;
10+
import androidx.appcompat.app.AppCompatActivity;
11+
import androidx.appcompat.widget.Toolbar;
1212
import android.util.Log;
1313
import android.view.HapticFeedbackConstants;
1414
import android.view.View;

‎app/src/main/java/com/espressif/ui/activities/SoundActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.Intent;
44
import android.graphics.Color;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
6+
import androidx.annotation.Nullable;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.util.Log;
1010
import android.widget.CompoundButton;
1111
import android.widget.Switch;

‎app/src/main/java/com/espressif/ui/activities/WiFiScanActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.content.Intent;
44
import android.os.Bundle;
55
import android.os.Handler;
6-
import android.support.v7.app.AppCompatActivity;
7-
import android.support.v7.widget.Toolbar;
6+
import androidx.appcompat.app.AppCompatActivity;
7+
import androidx.appcompat.widget.Toolbar;
88
import android.util.Log;
99
import android.view.View;
1010
import android.widget.AdapterView;

‎app/src/main/java/com/espressif/ui/widgets/AvsEmberLightText.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.graphics.Typeface;
55
import android.util.AttributeSet;
66

7-
public class AvsEmberLightText extends android.support.v7.widget.AppCompatTextView {
7+
public class AvsEmberLightText extends androidx.appcompat.widget.AppCompatTextView {
88

99
public AvsEmberLightText(Context context, AttributeSet attrs) {
1010
super(context, attrs);

‎app/src/main/java/com/espressif/ui/widgets/BookerlyItalicText.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.graphics.Typeface;
55
import android.util.AttributeSet;
66

7-
public class BookerlyItalicText extends android.support.v7.widget.AppCompatTextView {
7+
public class BookerlyItalicText extends androidx.appcompat.widget.AppCompatTextView {
88

99
public BookerlyItalicText(Context context, AttributeSet attrs) {
1010
super(context, attrs);

‎app/src/main/res/layout/activity_alexa.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
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:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
tools:context="com.espressif.ui.activities.AlexaActivity">
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
android:theme="@style/AppTheme.AppBarOverlay">
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="?attr/actionBarSize"
1818
android:background="?attr/colorPrimary"
1919
app:popupTheme="@style/AppTheme.PopupOverlay" />
2020

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

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

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

‎app/src/main/res/layout/activity_app_info.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
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:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
tools:context="com.espressif.ui.activities.AppInfoActivity">
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
android:theme="@style/AppTheme.AppBarOverlay">
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="?attr/actionBarSize"
1818
android:background="?attr/colorPrimary"
1919
app:popupTheme="@style/AppTheme.PopupOverlay" />
2020

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

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

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

‎app/src/main/res/layout/activity_bleprovision_landing.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
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:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
tools:context="com.espressif.ui.activities.BLEProvisionLanding">
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
android:theme="@style/AppTheme.AppBarOverlay">
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="?attr/actionBarSize"
1818
android:background="?attr/colorPrimary"
1919
app:popupTheme="@style/AppTheme.PopupOverlay" />
2020

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

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

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

‎app/src/main/res/layout/activity_device.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
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:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
tools:context="com.espressif.ui.activities.DeviceActivity">
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
android:theme="@style/AppTheme.AppBarOverlay">
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="?attr/actionBarSize"
1818
android:background="?attr/colorPrimary"
1919
app:popupTheme="@style/AppTheme.PopupOverlay" />
2020

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

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

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

0 commit comments

Comments
 (0)