Skip to content

Commit b5aa46b

Browse files
greyson-signalgreyson-signal
committed
Convert to AndroidX.
1 parent 2dc68ed commit b5aa46b

File tree

722 files changed

+1728
-1876
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

722 files changed

+1728
-1876
lines changed

‎AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@
580580
android:exported="false"
581581
android:authorities="org.thoughtcrime.provider.securesms.mms" />
582582

583-
<provider android:name="android.support.v4.content.FileProvider"
583+
<provider android:name="androidx.core.content.FileProvider"
584584
android:authorities="org.thoughtcrime.securesms.fileprovider"
585585
android:exported="false"
586586
android:grantUriPermissions="true">

‎build.gradle

+74-73
Large diffs are not rendered by default.

‎gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
org.gradle.jvmargs=-Xmx2048m
1+
org.gradle.jvmargs=-Xmx2048m
2+
android.useAndroidX=true
3+
android.enableJetifier=true

‎res/layout/activity_contact_name_edit.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:layout_height="match_parent"
88
android:orientation="vertical">
99

10-
<android.support.v7.widget.Toolbar
10+
<androidx.appcompat.widget.Toolbar
1111
android:id="@+id/toolbar"
1212
android:layout_width="match_parent"
1313
android:layout_height="?attr/actionBarSize"

‎res/layout/activity_contact_share_edit.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent">
66

7-
<android.support.v7.widget.RecyclerView
7+
<androidx.recyclerview.widget.RecyclerView
88
android:id="@+id/contact_share_edit_list"
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent"
1111
android:paddingBottom="80dp"
1212
android:clipToPadding="false"/>
1313

14-
<android.support.design.widget.FloatingActionButton
14+
<com.google.android.material.floatingactionbutton.FloatingActionButton
1515
android:id="@+id/contact_share_edit_send"
1616
android:layout_width="wrap_content"
1717
android:layout_height="wrap_content"

‎res/layout/activity_shared_contact_details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
55
xmlns:app="http://schemas.android.com/apk/res-auto"
66
android:id="@+id/root"
77
android:layout_width="match_parent"
88
android:layout_height="match_parent">
99

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

14-
<android.support.design.widget.CollapsingToolbarLayout
14+
<com.google.android.material.appbar.CollapsingToolbarLayout
1515
android:layout_width="match_parent"
1616
android:layout_height="wrap_content"
1717
android:background="?attr/shared_contact_details_header_background">
@@ -138,22 +138,22 @@
138138

139139
</LinearLayout>
140140

141-
<android.support.v7.widget.Toolbar
141+
<androidx.appcompat.widget.Toolbar
142142
android:id="@+id/toolbar"
143143
android:layout_width="match_parent"
144144
android:layout_height="?attr/actionBarSize"
145145
android:theme="@style/TextSecure.LightActionBar.DarkText"
146146
android:background="@color/transparent"
147147
app:layout_collapseMode="pin" />
148148

149-
</android.support.design.widget.CollapsingToolbarLayout>
149+
</com.google.android.material.appbar.CollapsingToolbarLayout>
150150

151-
</android.support.design.widget.AppBarLayout>
151+
</com.google.android.material.appbar.AppBarLayout>
152152

153-
<android.support.v7.widget.RecyclerView
153+
<androidx.recyclerview.widget.RecyclerView
154154
android:id="@+id/contact_details_fields"
155155
android:layout_width="match_parent"
156156
android:layout_height="match_parent"
157157
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
158158

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

‎res/layout/captcha_activity.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout
2+
<androidx.constraintlayout.widget.ConstraintLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -34,4 +34,4 @@
3434
app:layout_constraintStart_toStartOf="parent"
3535
app:layout_constraintTop_toBottomOf="@+id/registration_captcha_title" />
3636

37-
</android.support.constraint.ConstraintLayout>
37+
</androidx.constraintlayout.widget.ConstraintLayout>

‎res/layout/change_passphrase_activity.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:visibility="visible"
1919
android:orientation="vertical">
2020

21-
<android.support.design.widget.TextInputLayout
21+
<com.google.android.material.textfield.TextInputLayout
2222
android:layout_width="match_parent"
2323
android:layout_height="wrap_content">
2424

@@ -30,9 +30,9 @@
3030
android:hint="@string/change_passphrase_activity__old_passphrase"
3131
android:singleLine="true"/>
3232

33-
</android.support.design.widget.TextInputLayout>
33+
</com.google.android.material.textfield.TextInputLayout>
3434

35-
<android.support.design.widget.TextInputLayout
35+
<com.google.android.material.textfield.TextInputLayout
3636
android:layout_width="match_parent"
3737
android:layout_height="wrap_content">
3838

@@ -43,9 +43,9 @@
4343
android:hint="@string/change_passphrase_activity__new_passphrase"
4444
android:singleLine="true"/>
4545

46-
</android.support.design.widget.TextInputLayout>
46+
</com.google.android.material.textfield.TextInputLayout>
4747

48-
<android.support.design.widget.TextInputLayout
48+
<com.google.android.material.textfield.TextInputLayout
4949
android:layout_width="match_parent"
5050
android:layout_height="wrap_content">
5151

@@ -56,7 +56,7 @@
5656
android:hint="@string/change_passphrase_activity__repeat_new_passphrase"
5757
android:singleLine="true" />
5858

59-
</android.support.design.widget.TextInputLayout>
59+
</com.google.android.material.textfield.TextInputLayout>
6060

6161
<LinearLayout android:orientation="horizontal"
6262
android:layout_width="fill_parent"

‎res/layout/contact_selection_list_fragment.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
xmlns:tools="http://schemas.android.com/tools"
66
android:orientation="vertical">
77

8-
<android.support.v4.widget.SwipeRefreshLayout
8+
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
99
android:id="@+id/swipe_refresh"
1010
android:layout_width="match_parent"
1111
android:layout_height="wrap_content">
1212

13-
<android.support.v7.widget.RecyclerView
13+
<androidx.recyclerview.widget.RecyclerView
1414
android:id="@+id/recycler_view"
1515
android:layout_width="match_parent"
1616
android:layout_height="match_parent"
@@ -25,7 +25,7 @@
2525
android:text="@string/contact_selection_group_activity__finding_contacts"
2626
android:textSize="20sp" />
2727

28-
</android.support.v4.widget.SwipeRefreshLayout>
28+
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
2929

3030
<org.thoughtcrime.securesms.components.RecyclerViewFastScroller
3131
android:id="@+id/fast_scroller"

‎res/layout/conversation_activity.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

8-
<android.support.v7.widget.Toolbar
8+
<androidx.appcompat.widget.Toolbar
99
android:id="@+id/toolbar"
1010
android:layout_width="match_parent"
1111
android:layout_height="?attr/actionBarSize"
@@ -20,7 +20,7 @@
2020

2121
<include layout="@layout/conversation_title_view" />
2222

23-
</android.support.v7.widget.Toolbar>
23+
</androidx.appcompat.widget.Toolbar>
2424

2525
<org.thoughtcrime.securesms.components.InputAwareLayout
2626
android:id="@+id/layout_container"

‎res/layout/conversation_fragment.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_width="fill_parent"
66
android:layout_height="match_parent">
77

8-
<android.support.v7.widget.RecyclerView
8+
<androidx.recyclerview.widget.RecyclerView
99
android:id="@android:id/list"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"

‎res/layout/conversation_input_panel.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:clipChildren="false"
1111
android:clipToPadding="false">
1212

13-
<android.support.v7.widget.RecyclerView
13+
<androidx.recyclerview.widget.RecyclerView
1414
android:id="@+id/input_panel_sticker_suggestion"
1515
android:layout_width="match_parent"
1616
android:layout_height="90dp"

‎res/layout/conversation_list_activity.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:layout_width="match_parent"
88
android:layout_height="match_parent">
99

10-
<android.support.v7.widget.Toolbar
10+
<androidx.appcompat.widget.Toolbar
1111
android:id="@+id/toolbar"
1212
android:layout_alignParentTop="true"
1313
android:layout_width="match_parent"
@@ -50,7 +50,7 @@
5050

5151
</RelativeLayout>
5252

53-
</android.support.v7.widget.Toolbar>
53+
</androidx.appcompat.widget.Toolbar>
5454

5555
<FrameLayout android:id="@+id/fragment_container"
5656
android:layout_below="@id/toolbar"

‎res/layout/conversation_list_fragment.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<android.support.design.widget.CoordinatorLayout
3+
<androidx.coordinatorlayout.widget.CoordinatorLayout
44
xmlns:android="http://schemas.android.com/apk/res/android"
55
xmlns:tools="http://schemas.android.com/tools"
66
android:layout_width="fill_parent"
@@ -55,7 +55,7 @@
5555
android:layout_width="match_parent"
5656
android:layout_height="wrap_content" />
5757

58-
<android.support.v7.widget.RecyclerView
58+
<androidx.recyclerview.widget.RecyclerView
5959
android:id="@+id/list"
6060
android:layout_width="match_parent"
6161
android:layout_height="match_parent"
@@ -78,4 +78,4 @@
7878
android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>
7979

8080

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

‎res/layout/conversation_search_nav.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:background="?conversation_background"
1010
android:visibility="gone"
1111
tools:visibility="visible"
12-
tools:parentTag="android.support.constraint.ConstraintLayout">
12+
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
1313

1414
<TextView
1515
android:id="@+id/conversation_search_position"

‎res/layout/device_link_fragment.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:layout_marginBottom="25dp"
1515
android:contentDescription="@string/device_link_fragment__link_device"/>
1616

17-
<android.support.v7.widget.CardView
17+
<androidx.cardview.widget.CardView
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
2020
android:layout_marginStart="25dp"
@@ -83,6 +83,6 @@
8383
</LinearLayout>
8484

8585

86-
</android.support.v7.widget.CardView>
86+
</androidx.cardview.widget.CardView>
8787

8888
</LinearLayout>

‎res/layout/emoji_grid_layout.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent">
66

7-
<android.support.v7.widget.RecyclerView
7+
<androidx.recyclerview.widget.RecyclerView
88
android:id="@+id/emoji"
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent"

‎res/layout/enter_backup_passphrase_dialog.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
android:layout_height="wrap_content"
55
android:padding="16dp">
66

7-
<android.support.design.widget.TextInputLayout
7+
<com.google.android.material.textfield.TextInputLayout
88
android:layout_width="match_parent"
99
android:layout_height="wrap_content">
1010

11-
<android.support.design.widget.TextInputEditText
11+
<com.google.android.material.textfield.TextInputEditText
1212
android:id="@+id/restore_passphrase_input"
1313
android:layout_width="match_parent"
1414
android:layout_height="wrap_content"
1515
android:hint="@string/enter_backup_passphrase_dialog__backup_passphrase"
1616
android:imeOptions="actionDone"
1717
android:inputType="number" />
1818

19-
</android.support.design.widget.TextInputLayout>
19+
</com.google.android.material.textfield.TextInputLayout>
2020
</FrameLayout>

‎res/layout/experience_upgrade_activity.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_width="match_parent"
77
android:layout_height="match_parent">
88

9-
<android.support.v4.view.ViewPager
9+
<androidx.viewpager.widget.ViewPager
1010
android:id="@+id/pager"
1111
android:layout_width="match_parent"
1212
android:layout_height="match_parent" />

‎res/layout/experience_upgrade_link_previews_fragment.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout
2+
<androidx.constraintlayout.widget.ConstraintLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -83,7 +83,7 @@
8383

8484
</LinearLayout>
8585

86-
<android.support.v7.widget.AppCompatButton
86+
<androidx.appcompat.widget.AppCompatButton
8787
android:id="@+id/experience_ok_button"
8888
android:layout_width="wrap_content"
8989
android:layout_height="wrap_content"
@@ -98,4 +98,4 @@
9898
app:layout_constraintEnd_toEndOf="parent"
9999
app:layout_constraintStart_toStartOf="parent" />
100100

101-
</android.support.constraint.ConstraintLayout>
101+
</androidx.constraintlayout.widget.ConstraintLayout>

‎res/layout/experience_upgrade_preference_fragment.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
android:text="@string/experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read"
5151
android:textColor="@android:color/white" />
5252

53-
<android.support.v7.widget.SwitchCompat
53+
<androidx.appcompat.widget.SwitchCompat
5454
android:id="@+id/preference"
5555
android:layout_width="wrap_content"
5656
android:layout_height="wrap_content"

‎res/layout/experience_upgrade_typing_indicators_fragment.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
android:textIsSelectable="false"
8484
android:textSize="@dimen/onboarding_subtitle_size" />
8585

86-
<android.support.v7.widget.AppCompatButton
86+
<androidx.appcompat.widget.AppCompatButton
8787
android:id="@+id/experience_yes_button"
8888
android:layout_width="wrap_content"
8989
android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
9393
android:textColor="@color/core_blue"
9494
app:backgroundTint="@color/core_white" />
9595

96-
<android.support.v7.widget.AppCompatButton
96+
<androidx.appcompat.widget.AppCompatButton
9797
android:id="@+id/experience_no_button"
9898
android:layout_width="wrap_content"
9999
android:layout_height="wrap_content"

‎res/layout/fragment_search.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:background="?attr/search_background"
1313
android:visibility="gone" />
1414

15-
<android.support.v7.widget.RecyclerView
15+
<androidx.recyclerview.widget.RecyclerView
1616
android:id="@+id/search_list"
1717
android:layout_width="match_parent"
1818
android:layout_height="match_parent"/>

‎res/layout/fragment_submit_log.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
android:layout_height="0dp"
4444
android:layout_weight="1">
4545

46-
<android.support.v7.widget.RecyclerView
46+
<androidx.recyclerview.widget.RecyclerView
4747
android:id="@+id/log_preview"
4848
android:layout_width="match_parent"
4949
android:layout_height="wrap_content"

0 commit comments

Comments
 (0)