Skip to content

Commit

Permalink
Merge pull request #774 from mysteriumnetwork/feature/new-design-updates
Browse files Browse the repository at this point in the history
Feature/new design updates
  • Loading branch information
i-kulikov-geniusee authored Jul 5, 2023
2 parents 7f72e28 + 7ceb2df commit 492b5a2
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
android:id="@+id/headerView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="ipTextView, connectedStatusImageView,securityStatusImageView,titleTextView" />
app:constraint_referenced_ids="ipTextView, titleTextView" />

<androidx.constraintlayout.widget.Group
android:id="@+id/notificationNewApp"
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/layout/activity_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_padding_size_medium_large"
android:text="@string/menu_terms"
android:textColor="@color/manual_connect_value_white"
android:textColor="@color/onboarding_skip_white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/helpButton" />
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/layout/activity_profile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
android:layout_marginTop="@dimen/margin_padding_size_medium_large"
android:text="@string/profile_backup"
android:textAlignment="center"
android:textColor="@color/manual_connect_subtitle_white"
android:textColor="@color/manual_connect_value_white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textViewKeysDescription" />
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/layout/activity_report_issue.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
android:layout_marginTop="@dimen/margin_padding_size_small_medium"
android:text="@string/report_issue_description"
android:textAlignment="center"
android:textColor="@color/manual_connect_subtitle_white" />
android:textColor="@color/manual_connect_value_white" />

<TextView
android:id="@+id/emailSubtitleTextView"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cardPreventCornerOverlap="false"
app:cardBackgroundColor="@android:color/transparent"
android:layout_marginHorizontal="28dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -32,6 +33,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<View
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="@color/primary_card_view"
app:layout_constraintTop_toBottomOf="@id/ivBanner"
app:layout_constraintBottom_toBottomOf="parent"
/>

<TextView
android:id="@+id/title"
android:layout_width="0dp"
Expand All @@ -46,6 +57,7 @@
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintTop_toBottomOf="@id/ivBanner" />


<TextView
android:id="@+id/message"
android:layout_width="0dp"
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<string name="report_issue_success">Report sent successfully. Thank you!</string>

<!-- Get help -->
<string name="get_help_email" translatable="false">help@mysterium.network</string>
<string name="get_help_email" translatable="false">help@mysteriumvpn.com</string>
<string name="get_help_subject" translatable="false">Mysterium: Get help</string>

<!-- Monitoring -->
Expand Down

0 comments on commit 492b5a2

Please sign in to comment.