Skip to content

Commit

Permalink
Merge pull request #176 from Bandyer/user_status_waiting
Browse files Browse the repository at this point in the history
Add user status alone and user status waiting styles
  • Loading branch information
stefanobrusa committed Jun 1, 2023
2 parents e54b5ee + cacc630 commit 2c2a01f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
<string name="kaleyra_ongoing_call_label">Tocca per tornare alla chiamata</string>
<string name="kaleyra_call_left_alone">Sei rimasto da solo</string>
<string name="kaleyra_call_offline">Sei offline</string>
<string name="kaleyra_call_waiting_for_other_participants">In attesa di altri partecipanti…</string>

<string name="kaleyra_error_button_reload">Riprova</string>
<string name="kaleyra_error_title">Si è verificato un errore</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
<string name="kaleyra_ongoing_call_label">Tap to go back to call</string>
<string name="kaleyra_call_left_alone">You are left alone</string>
<string name="kaleyra_call_offline">You are offline</string>
<string name="kaleyra_call_waiting_for_other_participants">Waiting for other participants…</string>
<string name="kaleyra_error_button_reload">Reload</string>
<string name="kaleyra_error_title">An error occurred</string>
<string name="kaleyra_error_subtitle">Please tap to reload</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,14 @@
<item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">center</item>
</style>

<style name="KaleyraCollaborationSuiteUI.TextView.Title.UserStatus.LeftAlone" parent="KaleyraCollaborationSuiteUI.TextView.Title.UserStatus">
<item name="android:text">@string/kaleyra_call_left_alone</item>
</style>

<style name="KaleyraCollaborationSuiteUI.TextView.Title.UserStatus.Waiting" parent="KaleyraCollaborationSuiteUI.TextView.Title.UserStatus">
<item name="android:text">@string/kaleyra_call_waiting_for_other_participants</item>
</style>

<style name="KaleyraCollaborationSuiteUI.TextView.Title.Reload" parent="KaleyraCollaborationSuiteUI.TextView.Title">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
Expand Down
13 changes: 9 additions & 4 deletions collaboration-suite-phone-ui/src/main/res/values/themes_call.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@

<attr name="kaleyra_userInfoStyle" format="reference" />
<attr name="kaleyra_callInfoStyle" format="reference" />
<attr name="kaleyra_userStatusStyle" format="reference"/>
<attr name="kaleyra_userStatusStyle_left_alone" format="reference"/>
<attr name="kaleyra_userStatusStyle_waiting" format="reference"/>


<attr name="kaleyra_whiteboardDialogStyle" format="reference" />

Expand Down Expand Up @@ -55,7 +57,8 @@
<item name="kaleyra_smartGlassDialogMenuStyle">@style/KaleyraCollaborationSuiteUI.SmartGlassDialogMenu</item>
<item name="kaleyra_userInfoStyle">@style/KaleyraCollaborationSuiteUI.UserInfo</item>
<item name="kaleyra_callInfoStyle">@style/KaleyraCollaborationSuiteUI.CallInfo</item>
<item name="kaleyra_userStatusStyle">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus</item>
<item name="kaleyra_userStatusStyle_left_alone">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus.LeftAlone</item>
<item name="kaleyra_userStatusStyle_waiting">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus.Waiting</item>
<item name="kaleyra_whiteboardDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.Whiteboard</item>
<item name="kaleyra_screenShareDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.ScreenSharePicker</item>
<item name="kaleyra_virtualBackgroundDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.VirtualBackgroundPicker</item>
Expand All @@ -75,7 +78,8 @@
<item name="kaleyra_smartGlassDialogMenuStyle">@style/KaleyraCollaborationSuiteUI.SmartGlassDialogMenu</item>
<item name="kaleyra_userInfoStyle">@style/KaleyraCollaborationSuiteUI.UserInfo</item>
<item name="kaleyra_callInfoStyle">@style/KaleyraCollaborationSuiteUI.CallInfo</item>
<item name="kaleyra_userStatusStyle">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus</item>
<item name="kaleyra_userStatusStyle_left_alone">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus.LeftAlone</item>
<item name="kaleyra_userStatusStyle_waiting">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus.Waiting</item>
<item name="kaleyra_whiteboardDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.Whiteboard</item>
<item name="kaleyra_screenShareDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.ScreenSharePicker</item>
<item name="kaleyra_virtualBackgroundDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.VirtualBackgroundPicker</item>
Expand All @@ -95,7 +99,8 @@
<item name="kaleyra_smartGlassDialogMenuStyle">@style/KaleyraCollaborationSuiteUI.SmartGlassDialogMenu</item>
<item name="kaleyra_userInfoStyle">@style/KaleyraCollaborationSuiteUI.UserInfo</item>
<item name="kaleyra_callInfoStyle">@style/KaleyraCollaborationSuiteUI.CallInfo</item>
<item name="kaleyra_userStatusStyle">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus</item>
<item name="kaleyra_userStatusStyle_left_alone">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus.LeftAlone</item>
<item name="kaleyra_userStatusStyle_waiting">@style/KaleyraCollaborationSuiteUI.TextView.Title.UserStatus.Waiting</item>
<item name="kaleyra_whiteboardDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.Whiteboard</item>
<item name="kaleyra_screenShareDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.ScreenSharePicker</item>
<item name="kaleyra_virtualBackgroundDialogStyle">@style/KaleyraCollaborationSuiteUI.BottomSheetDialog.VirtualBackgroundPicker</item>
Expand Down

0 comments on commit 2c2a01f

Please sign in to comment.