mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Update styles on several group bottom sheets.

fork-5.53.8
Alex Hart 2022-05-27 16:01:47 -03:00 zatwierdzone przez Greyson Parrelli
rodzic 3ca4ff9a94
commit cf5f7ef634
6 zmienionych plików z 30 dodań i 50 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
Wyświetl plik

@ -10,7 +10,6 @@ import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -69,15 +68,15 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
private TextView fullName; private TextView fullName;
private TextView about; private TextView about;
private TextView usernameNumber; private TextView usernameNumber;
private Button blockButton; private TextView blockButton;
private Button unblockButton; private TextView unblockButton;
private Button addContactButton; private TextView addContactButton;
private Button contactDetailsButton; private TextView contactDetailsButton;
private Button addToGroupButton; private TextView addToGroupButton;
private Button viewSafetyNumberButton; private TextView viewSafetyNumberButton;
private Button makeGroupAdminButton; private TextView makeGroupAdminButton;
private Button removeAdminButton; private TextView removeAdminButton;
private Button removeFromGroupButton; private TextView removeFromGroupButton;
private ProgressBar adminActionBusy; private ProgressBar adminActionBusy;
private View noteToSelfDescription; private View noteToSelfDescription;
private View buttonStrip; private View buttonStrip;

16
app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
Wyświetl plik

@ -14,7 +14,7 @@
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/GroupsLearnMore_legacy_vs_new_groups" android:text="@string/GroupsLearnMore_legacy_vs_new_groups"
android:textAppearance="@style/TextAppearance.Signal.Title2.Bold" android:textAppearance="@style/Signal.Text.TitleLarge"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1_header" app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1_header"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -30,7 +30,7 @@
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/GroupsLearnMore_what_are_legacy_groups" android:text="@string/GroupsLearnMore_what_are_legacy_groups"
android:textAppearance="@style/TextAppearance.Signal.Body2.Bold" android:textAppearance="@style/Signal.Text.TitleSmall"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1" app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -46,7 +46,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/GroupsLearnMore_paragraph_1" android:text="@string/GroupsLearnMore_paragraph_1"
android:textAppearance="@style/TextAppearance.Signal.Body2" android:textAppearance="@style/Signal.Text.BodyMedium"
android:textColor="@color/signal_text_secondary" android:textColor="@color/signal_text_secondary"
app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_header" app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_header"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -62,7 +62,7 @@
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/GroupsLearnMore_can_i_upgrade_a_legacy_group" android:text="@string/GroupsLearnMore_can_i_upgrade_a_legacy_group"
android:textAppearance="@style/TextAppearance.Signal.Body2.Bold" android:textAppearance="@style/Signal.Text.TitleSmall"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_a" app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_a"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -78,7 +78,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/GroupsLearnMore_paragraph_2" android:text="@string/GroupsLearnMore_paragraph_2"
android:textAppearance="@style/TextAppearance.Signal.Body2" android:textAppearance="@style/Signal.Text.BodyMedium"
android:textColor="@color/signal_text_secondary" android:textColor="@color/signal_text_secondary"
app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_b" app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_b"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -94,7 +94,7 @@
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/GroupsLearnMore_paragraph_3" android:text="@string/GroupsLearnMore_paragraph_3"
android:textAppearance="@style/TextAppearance.Signal.Body2" android:textAppearance="@style/Signal.Text.BodyMedium"
android:textColor="@color/signal_text_secondary" android:textColor="@color/signal_text_secondary"
app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1" app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -104,9 +104,9 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/lbs_ok_button" android:id="@+id/lbs_ok_button"
style="@style/Signal.Widget.Button.Large.Primary" style="@style/Signal.Widget.Button.Large.Tonal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginTop="48dp" android:layout_marginTop="48dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"

13
app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
Wyświetl plik

@ -17,7 +17,7 @@
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/GroupsV1MigrationInitiation_upgrade_to_new_group" android:text="@string/GroupsV1MigrationInitiation_upgrade_to_new_group"
android:textAppearance="@style/TextAppearance.Signal.Title1" android:textAppearance="@style/Signal.Text.HeadlineMedium"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
android:gravity="center" /> android:gravity="center" />
@ -48,7 +48,7 @@
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:text="@string/GroupsV1MigrationInitiation_new_groups_have_features_like_mentions" android:text="@string/GroupsV1MigrationInitiation_new_groups_have_features_like_mentions"
android:textAppearance="@style/TextAppearance.Signal.Body1" android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_text_primary" /> android:textColor="@color/signal_text_primary" />
</LinearLayout> </LinearLayout>
@ -71,7 +71,7 @@
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:text="@string/GroupsV1MigrationInitiation_all_message_history_and_media_will_be_kept" android:text="@string/GroupsV1MigrationInitiation_all_message_history_and_media_will_be_kept"
android:textAppearance="@style/TextAppearance.Signal.Body1" android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_text_primary" /> android:textColor="@color/signal_text_primary" />
</LinearLayout> </LinearLayout>
@ -109,7 +109,7 @@
android:id="@+id/gv1_migrate_invite_title" android:id="@+id/gv1_migrate_invite_title"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAppearance="@style/TextAppearance.Signal.Body1" android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
tools:text="Plurized string for invited members." /> tools:text="Plurized string for invited members." />
@ -150,7 +150,7 @@
android:id="@+id/gv1_migrate_ineligible_title" android:id="@+id/gv1_migrate_ineligible_title"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAppearance="@style/TextAppearance.Signal.Body1" android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
tools:text="Plurized string for ineligible members." /> tools:text="Plurized string for ineligible members." />
@ -170,8 +170,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:padding="20dp" style="@style/Signal.Widget.Button.Large.Tonal"
style="@style/Signal.Widget.Button.Large.Primary"
android:text="@string/GroupsV1MigrationInitiation_upgrade_this_group" /> android:text="@string/GroupsV1MigrationInitiation_upgrade_this_group" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton

13
app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml
Wyświetl plik

@ -17,7 +17,7 @@
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/GroupsV1MigrationLearnMore_what_are_new_groups" android:text="@string/GroupsV1MigrationLearnMore_what_are_new_groups"
android:textAppearance="@style/TextAppearance.Signal.Title1" android:textAppearance="@style/Signal.Text.HeadlineMedium"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
android:gravity="center" /> android:gravity="center" />
@ -48,7 +48,7 @@
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:text="@string/GroupsV1MigrationLearnMore_new_groups_have_features_like_mentions" android:text="@string/GroupsV1MigrationLearnMore_new_groups_have_features_like_mentions"
android:textAppearance="@style/TextAppearance.Signal.Body1" android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_text_primary" /> android:textColor="@color/signal_text_primary" />
</LinearLayout> </LinearLayout>
@ -71,7 +71,7 @@
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:text="@string/GroupsV1MigrationLearnMore_all_message_history_and_media_has_been_kept" android:text="@string/GroupsV1MigrationLearnMore_all_message_history_and_media_has_been_kept"
android:textAppearance="@style/TextAppearance.Signal.Body1" android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_text_primary" /> android:textColor="@color/signal_text_primary" />
</LinearLayout> </LinearLayout>
@ -102,7 +102,7 @@
android:id="@+id/gv1_learn_more_pending_title" android:id="@+id/gv1_learn_more_pending_title"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAppearance="@style/TextAppearance.Signal.Body1" android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
tools:text="Plurized string for pending members." /> tools:text="Plurized string for pending members." />
@ -143,7 +143,7 @@
android:id="@+id/gv1_learn_more_dropped_title" android:id="@+id/gv1_learn_more_dropped_title"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAppearance="@style/TextAppearance.Signal.Body1" android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
tools:text="Plurized string for ineligible members." /> tools:text="Plurized string for ineligible members." />
@ -163,8 +163,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:padding="20dp" style="@style/Signal.Widget.Button.Large.Tonal"
style="@style/Signal.Widget.Button.Large.Primary"
android:text="@android:string/ok" /> android:text="@android:string/ok" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/show_admin_bottom_sheet.xml
Wyświetl plik

@ -25,7 +25,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:text="@string/ConversationActivity_message_an_admin" android:text="@string/ConversationActivity_message_an_admin"
style="@style/Signal.Text.Title.BottomSheet" style="@style/Signal.Text.TitleSmall"
app:layout_constraintTop_toBottomOf="@id/show_admin_handle" /> app:layout_constraintTop_toBottomOf="@id/show_admin_handle" />
<org.thoughtcrime.securesms.groups.ui.GroupMemberListView <org.thoughtcrime.securesms.groups.ui.GroupMemberListView

17
app/src/main/res/values/text_styles.xml
Wyświetl plik

@ -116,16 +116,6 @@
<item name="android:shadowRadius">0</item> <item name="android:shadowRadius">0</item>
</style> </style>
<style name="Signal.Text.Caption.MessageReceived">
<item name="android:textColor">@color/conversation_item_sent_text_secondary_color</item>
<item name="android:shadowRadius">0</item>
<item name="android:alpha">0.7</item>
</style>
<style name="Signal.Text.Caption.MessageImageOverlay">
<item name="android:textColor">@color/core_white</item>
</style>
<style name="Signal.Text.Giant" parent="@style/TextAppearance.AppCompat.Display1"> <style name="Signal.Text.Giant" parent="@style/TextAppearance.AppCompat.Display1">
<item name="android:textSize">48sp</item> <item name="android:textSize">48sp</item>
<item name="android:textColor">@color/signal_text_primary</item> <item name="android:textColor">@color/signal_text_primary</item>
@ -265,13 +255,6 @@
<style name="Signal.Text.Title.SettingsBio"> <style name="Signal.Text.Title.SettingsBio">
</style> </style>
<style name="Signal.Text.Title.BottomSheet" parent="">
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">4sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:letterSpacing" tools:ignore="NewApi">0.01</item>
</style>
<!-- endregion --> <!-- endregion -->
</resources> </resources>