thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

old android compatibility

Browse source
This commit is contained in:
Christian Schneppe 2020-04-06 22:10:01 +02:00
parent 089ca1c414
commit e0415d1ac5
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
4 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -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'

12
src/main/res/layout/activity_contact_details.xml
View file

@ -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>

16
src/main/res/layout/activity_edit_account.xml
View file

@ -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>

16
src/main/res/layout/activity_muc_details.xml
View file

@ -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>