Skip to content

Changing to androidx for issues #2242 #2244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 10, 2021
Merged

Changing to androidx for issues #2242 #2244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a77155e
add configs to dependabot yml
MohitGupta121 Oct 2, 2021
e892aed
some minor changes
MohitGupta121 Oct 4, 2021
b11d919
ressolve conflict
MohitGupta121 Oct 9, 2021
ec6e30c
change to AndroidX
MohitGupta121 Oct 9, 2021
49ba88b
Update app/src/main/res/layout/activity_compass_main.xml
MohitGupta121 Oct 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions app/src/main/res/layout-hdpi/activity_multimeter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/top_app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:theme="@style/AppTheme.AppBarOverlay"
app:layout_constraintTop_toTopOf="parent">

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/multimeter_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="Multimeter" />

</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>

<androidx.constraintlayout.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_zero_dp"
android:layout_marginBottom="@dimen/multimeter_constraint_1"
Expand Down Expand Up @@ -82,7 +83,7 @@
app:layout_constraintStart_toStartOf="parent" />


<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_zero_dp"
android:layout_marginBottom="@dimen/multimeter_constraint_1"
Expand Down Expand Up @@ -226,7 +227,7 @@
app:layout_constraintEnd_toEndOf="@+id/lower_left_box"
app:layout_constraintStart_toStartOf="@+id/lower_left_box">

<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/selector"
android:layout_width="@dimen/multimeter_length_0"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -425,7 +426,7 @@
app:layout_constraintEnd_toEndOf="@+id/lower_right_box"
app:layout_constraintStart_toStartOf="@+id/lower_right_box" />

</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<View
android:id="@+id/bottom_view"
Expand All @@ -434,6 +435,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
6 changes: 3 additions & 3 deletions app/src/main/res/layout-sw600dp/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -13,7 +13,7 @@
android:orientation="horizontal">


<android.support.design.widget.NavigationView
<com.google.android.material.navigation.NavigationView
android:id="@+id/nav_view"
android:layout_width="@dimen/navigation_drawer_width"
android:layout_height="match_parent"
Expand All @@ -29,4 +29,4 @@

</LinearLayout>

</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
23 changes: 12 additions & 11 deletions app/src/main/res/layout-sw600dp/activity_multimeter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/top_app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:theme="@style/AppTheme.AppBarOverlay"
app:layout_constraintTop_toTopOf="parent">

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/multimeter_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="Multimeter" />

</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>

<androidx.constraintlayout.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_zero_dp"
android:layout_marginTop="@dimen/multimeter_constraint_1"
Expand Down Expand Up @@ -83,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent" />


<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_zero_dp"
android:layout_marginTop="@dimen/multimeter_view_top_margin"
Expand Down Expand Up @@ -233,7 +234,7 @@
app:layout_constraintEnd_toEndOf="@+id/lower_left_box"
app:layout_constraintStart_toStartOf="@+id/lower_left_box">

<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat


android:id="@+id/selector"
Expand Down Expand Up @@ -465,7 +466,7 @@
app:layout_constraintEnd_toEndOf="@+id/lower_right_box"
app:layout_constraintStart_toStartOf="@+id/lower_right_box" />

</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<View
android:id="@+id/bottom_view"
Expand All @@ -474,6 +475,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
20 changes: 10 additions & 10 deletions app/src/main/res/layout-xhdpi/activity_multimeter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/top_app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/multimeter_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="Multimeter" />

</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>

<androidx.constraintlayout.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_zero_dp"
android:layout_marginTop="@dimen/multimeter_constraint_1"
Expand Down Expand Up @@ -83,7 +83,7 @@
app:layout_constraintStart_toStartOf="parent" />


<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_zero_dp"
android:layout_marginTop="@dimen/multimeter_view_top_margin"
Expand Down Expand Up @@ -229,7 +229,7 @@
app:layout_constraintEnd_toEndOf="@+id/lower_left_box"
app:layout_constraintStart_toStartOf="@+id/lower_left_box">

<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/selector"
android:layout_width="@dimen/multimeter_length_0"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -432,7 +432,7 @@
app:layout_constraintEnd_toEndOf="@+id/lower_right_box"
app:layout_constraintStart_toStartOf="@+id/lower_right_box" />

</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<View
android:id="@+id/bottom_view"
Expand All @@ -441,6 +441,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
8 changes: 4 additions & 4 deletions app/src/main/res/layout/accelerometer_list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/first_chart"
Expand Down Expand Up @@ -96,7 +96,7 @@

</RelativeLayout>

<androidx.constraintlayout.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/accelerometer_chart_y_axis_layout_hmc"
android:layout_width="@dimen/tv_chart_height"
android:layout_height="match_parent"
Expand Down Expand Up @@ -125,7 +125,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<com.github.mikephil.charting.charts.LineChart
android:id="@+id/chart_accelerometer"
Expand All @@ -138,4 +138,4 @@

</RelativeLayout>

</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
16 changes: 8 additions & 8 deletions app/src/main/res/layout/activity_compass.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
Expand All @@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">

<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/compass_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -45,9 +45,9 @@

</LinearLayout>

</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/card_compass_raw_values"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -137,9 +137,9 @@

</LinearLayout>

</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/card_select_axes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -188,10 +188,10 @@

</LinearLayout>

</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

</LinearLayout>

</ScrollView>

</androidx.constraintlayout.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
17 changes: 10 additions & 7 deletions app/src/main/res/layout/activity_compass_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/compass_coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:theme="@style/AppTheme.AppBarOverlay"
app:layout_constraintTop_toTopOf="parent">

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/compass_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/compass" />

</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>

<include layout="@layout/activity_compass" />
<include
android:id="@+id/activity_compass_include"
layout="@layout/activity_compass" />

<View
android:id="@+id/shadow"
Expand All @@ -32,4 +35,4 @@

<include layout="@layout/bottomsheet_compass" />

</android.support.design.widget.CoordinatorLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:layout_above="@+id/navigation"
android:animateLayoutChanges="true" />

<android.support.design.widget.BottomNavigationView
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
Loading