Skip to content

Commit

Permalink
finetune preferences for M3 - DRAFT
Browse files Browse the repository at this point in the history 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
  • Loading branch information
@AndyScherzinger
AndyScherzinger committed Jun 8, 2023
1 parent d74b1fd commit 45d64e7
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 160 deletions.
7 changes: 7 additions & 0 deletions app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,13 @@ class ConversationInfoActivity :
binding.notificationSettingsView.notificationSettingsCallNotifications
).forEach(viewThemeUtils.talk::ConversationInfoCardView)
}
binding.run {
listOf(
binding.notificationSettingsView.notificationSettingsCategory,
binding.webinarInfoView.webinarSettingsCategory,
binding.guestAccessView.guestAccessSettingsCategory
)
}.forEach(viewThemeUtils.platform::colorTextView)
}

private fun showSharedItems() {
Expand Down
13 changes: 8 additions & 5 deletions app/src/main/res/layout/activity_conversation_info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginEnd="@dimen/standard_margin">

<ImageView
android:id="@+id/avatar_image"
Expand All @@ -104,6 +106,7 @@
android:layout_below="@id/avatar_image"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/margin_between_elements"
android:textSize="@dimen/headline_text_size"
tools:text="Jane Doe" />

</RelativeLayout>
Expand All @@ -124,9 +127,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="@dimen/standard_half_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:autoLink="web"
android:padding="@dimen/standard_half_padding"
tools:text="Hello world!" />
</com.google.android.material.card.MaterialCardView>

Expand Down Expand Up @@ -223,7 +228,6 @@
android:textStyle="bold"
android:padding="@dimen/standard_padding"/>


<com.google.android.material.card.MaterialCardView
android:id="@+id/shared_items_button"
android:layout_width="match_parent"
Expand Down Expand Up @@ -254,7 +258,6 @@
</LinearLayout>
</com.google.android.material.card.MaterialCardView>


</LinearLayout>

</com.google.android.material.card.MaterialCardView>
Expand Down
123 changes: 62 additions & 61 deletions app/src/main/res/layout/item_guest_access_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">

<com.google.android.material.card.MaterialCardView
android:id="@+id/guest_access_settings"
Expand All @@ -13,52 +13,54 @@
android:elevation="0dp">

<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:orientation="vertical">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/guest_access_settings_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:paddingTop="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
android:text="@string/nc_guest_access"
android:textSize="@dimen/md_title_textsize"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
android:padding="@dimen/standard_padding"/>
android:textStyle="bold" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/guest_access_settings_allow_guest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_quarter_margin"
android:layout_marginLeft="@dimen/standard_margin"
>
android:layout_marginTop="@dimen/standard_quarter_margin">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:padding="@dimen/standard_half_padding">
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:orientation="horizontal">

<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="@dimen/standard_half_margin"
android:layout_weight="1">
android:layout_weight="1"
android:orientation="vertical">

<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/nc_guest_access_allow_title"

android:textSize="@dimen/two_line_primary_text_size"/>
android:textSize="@dimen/headline_text_size" />

<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:hint="@string/nc_guest_access_allow_summary" />
android:hint="@string/nc_guest_access_allow_summary"
android:textSize="@dimen/supporting_text_text_size" />

</LinearLayout>

Expand All @@ -67,24 +69,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
/>
android:layout_marginStart="@dimen/standard_margin" />

</LinearLayout>
</com.google.android.material.card.MaterialCardView>

<com.google.android.material.card.MaterialCardView
android:id="@+id/guest_access_settings_password_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_quarter_margin"
android:layout_marginLeft="@dimen/standard_margin"
>
android:layout_height="wrap_content">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:orientation="horizontal"
android:padding="@dimen/standard_half_padding"
android:visibility="gone"
tools:visibility="visible">

Expand All @@ -95,65 +97,65 @@
android:orientation="vertical">

<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/nc_guest_access_password_title"

android:textSize="@dimen/two_line_primary_text_size" />
android:textSize="@dimen/headline_text_size" />

<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/standard_half_margin"
android:hint="@string/nc_guest_access_password_summary" />
android:hint="@string/nc_guest_access_password_summary"
android:textSize="@dimen/supporting_text_text_size" />

</LinearLayout>

<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/password_protection_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/standard_margin" />

</LinearLayout>
</com.google.android.material.card.MaterialCardView>

<com.google.android.material.card.MaterialCardView
android:id="@+id/share_conversation_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_quarter_margin"
>
android:layout_height="wrap_content">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:orientation="horizontal"
android:padding="@dimen/standard_half_padding"
android:visibility="gone"
tools:visibility="visible">

<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">

<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/transparent"
app:icon="@drawable/ic_share_variant"
app:iconGravity="textStart"
app:iconSize="@dimen/sm_icon_height"
app:iconTint="@color/grey_600" />
<ImageView
android:layout_width="24dp"
android:layout_height="40dp"
android:layout_marginEnd="@dimen/standard_margin"
android:contentDescription="@null"
android:src="@drawable/ic_share_variant"
app:tint="@color/grey_600" />

<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/nc_guest_access_share_link"
android:textSize="@dimen/two_line_primary_text_size" />
android:textSize="@dimen/headline_text_size" />


</LinearLayout>
Expand All @@ -163,47 +165,46 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/resend_invitations_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_quarter_margin"
>
android:layout_height="wrap_content">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:orientation="horizontal"
android:padding="@dimen/standard_half_padding"
android:visibility="gone"
tools:visibility="visible">

<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">

<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/transparent"
app:icon="@drawable/ic_email"
app:iconGravity="textStart"
app:iconSize="@dimen/sm_icon_height"
app:iconTint="@color/grey_600" />
<ImageView
android:layout_width="24dp"
android:layout_height="40dp"
android:layout_marginEnd="@dimen/standard_margin"
android:contentDescription="@null"
android:src="@drawable/ic_email"
app:tint="@color/grey_600" />

<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/nc_guest_access_resend_invitations"
android:textSize="@dimen/two_line_primary_text_size" />
android:textSize="@dimen/headline_text_size" />


</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>



</LinearLayout>

</com.google.android.material.card.MaterialCardView>
Expand Down
Loading

0 comments on commit 45d64e7

Please sign in to comment.