Skip to content

Commit

Permalink
Merge pull request #1693 from novasamatech/fix/settings-ordering
Browse files Browse the repository at this point in the history
Fixed ordering on settings
  • Loading branch information
antonijzelinskij authored Oct 15, 2024
2 parents 549b9d5 + d3cd237 commit 709e5ea
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
5 changes: 3 additions & 2 deletions common/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="TypographyEllipsis">

<!--<string name="settings_wiki">Wiki</string>-->
<string name="settings_wiki">Wiki &amp; Help Center</string>

<!--<string name="settings_email">Email</string>-->
<string name="settings_email">Get support via Email</string>

Expand Down Expand Up @@ -627,8 +630,6 @@

<string name="referendim_details_not_found_title">Referendum not found</string>

<string name="settings_wiki">Wiki</string>

<string name="operations_swap_title">Swap</string>

<string name="swap_repeat_operation">Repeat the operation</string>
Expand Down
13 changes: 7 additions & 6 deletions feature-settings-impl/src/main/res/layout/fragment_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,21 @@
app:title="@string/settings_email" />

<io.novafoundation.nova.common.view.settings.SettingsItemView
android:id="@+id/settingsRateUs"
android:id="@+id/settingsWiki"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_rate_us"
app:title="@string/about_rate_app" />
app:icon="@drawable/ic_nova_wiki"
app:title="@string/settings_wiki" />

<io.novafoundation.nova.common.view.settings.SettingsItemView
android:id="@+id/settingsWiki"
android:id="@+id/settingsRateUs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_nova_wiki"
app:title="@string/settings_wiki" />
app:icon="@drawable/ic_rate_us"
app:title="@string/about_rate_app" />

</io.novafoundation.nova.common.view.settings.SettingsGroupView>

<io.novafoundation.nova.common.view.settings.SettingsGroupHeaderView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down

0 comments on commit 709e5ea

Please sign in to comment.