diff options
Diffstat (limited to 'src/main/res/layout')
| -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_media_viewer.xml | 4 | ||||
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 16 | ||||
| -rw-r--r-- | src/main/res/layout/activity_set_settings.xml | 4 | ||||
| -rw-r--r-- | src/main/res/layout/activity_trust_keys.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 1 |
7 files changed, 29 insertions, 26 deletions
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_media_viewer.xml b/src/main/res/layout/activity_media_viewer.xml index 2b64fb81a..c82ed1603 100644 --- a/src/main/res/layout/activity_media_viewer.xml +++ b/src/main/res/layout/activity_media_viewer.xml @@ -26,6 +26,10 @@ android:id="@+id/messageVideoView" android:layout_width="match_parent" android:layout_height="match_parent" + app:played_color="?attr/colorAccent" + app:scrubber_color="?attr/colorAccent" + app:show_shuffle_button="false" + app:show_buffering="never" android:visibility="gone" /> <com.leinardi.android.speeddial.SpeedDialOverlayLayout 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> diff --git a/src/main/res/layout/activity_set_settings.xml b/src/main/res/layout/activity_set_settings.xml index 99d596e0a..80d85efa0 100644 --- a/src/main/res/layout/activity_set_settings.xml +++ b/src/main/res/layout/activity_set_settings.xml @@ -234,7 +234,7 @@ android:textAppearance="@style/TextAppearance.Conversations.Body1" /> <ImageButton - android:id="@+id/action_info_invideous" + android:id="@+id/action_info_invidious" android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="?attr/icon_alpha" @@ -244,7 +244,7 @@ android:src="?attr/icon_help" /> <androidx.appcompat.widget.AppCompatCheckBox - android:id="@+id/invideous" + android:id="@+id/invidious" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" /> diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 178cd04c8..30a9d3906 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -92,7 +92,7 @@ android:paddingEnd="16dp" android:paddingRight="16dp" android:text="@string/disable_encryption" - android:textColor="@color/accent" /> + android:textColor="?attr/colorAccent" /> </LinearLayout> </LinearLayout> diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index d7f177514..9748a6b22 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -6,7 +6,6 @@ android:id="@+id/conversations_fragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/chatbg" android:clickable="false"> <ListView |