diff options
-rw-r--r-- | build.gradle | 1 | ||||
-rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 12 | ||||
-rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 16 | ||||
-rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 16 |
4 files changed, 23 insertions, 22 deletions
diff --git a/build.gradle b/build.gradle index 605e68442..989199663 100644 --- a/build.gradle +++ b/build.gradle @@ -70,6 +70,7 @@ dependencies { gitImplementation 'androidx.emoji:emoji-appcompat:1.0.0' gitImplementation 'androidx.emoji:emoji-bundled:1.0.0' implementation 'com.google.android.material:material:1.0.0' // higher versions cause strange fab design + implementation 'androidx.cardview:cardview:1.0.0' // for compatibility implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0' implementation 'com.google.android.exoplayer:exoplayer-core:2.11.3' implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.3' diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index cb02d53e2..09aac94dc 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" @@ -238,9 +238,9 @@ android:visibility="visible" /> </LinearLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:id="@+id/media_wrapper" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -289,9 +289,9 @@ android:textColor="?attr/colorAccent" /> </LinearLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:id="@+id/keys_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -350,7 +350,7 @@ android:textColor="?attr/colorAccent" /> </LinearLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index a1646f553..efc361bf0 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:id="@+id/editor" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -307,9 +307,9 @@ android:layout_marginTop="8dp" android:text="@string/register_account" /> </RelativeLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:id="@+id/os_optimization" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -369,9 +369,9 @@ android:textColor="@color/accent" /> </LinearLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:id="@+id/stats" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -819,9 +819,9 @@ </LinearLayout> </RelativeLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:id="@+id/other_device_keys_card" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -862,7 +862,7 @@ android:layout_gravity="center_horizontal" android:text="@string/clear_other_devices" /> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> </LinearLayout> </ScrollView> diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 894649cc2..e53d22823 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" @@ -312,9 +312,9 @@ android:visibility="gone" /> </LinearLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" @@ -408,9 +408,9 @@ </LinearLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:id="@+id/users_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -484,9 +484,9 @@ tools:text="View n Participants" /> </LinearLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> - <com.google.android.material.card.MaterialCardView + <androidx.cardview.widget.CardView android:id="@+id/media_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -537,7 +537,7 @@ android:textColor="?attr/colorAccent" /> </LinearLayout> </LinearLayout> - </com.google.android.material.card.MaterialCardView> + </androidx.cardview.widget.CardView> </LinearLayout> </ScrollView> </LinearLayout> |