Skip to content

Commit

Permalink
fix settings text
Browse files Browse the repository at this point in the history
  • Loading branch information
@newhinton
newhinton committed Nov 1, 2023
1 parent 3306c59 commit 01d6743
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
86 changes: 41 additions & 45 deletions app/src/main/res/layout/settings_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,35 +245,34 @@

</androidx.constraintlayout.widget.ConstraintLayout>


<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/logging_settings"
android:id="@+id/importSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true">

<ImageView
android:id="@+id/loggingSettingsIconBackground"
android:id="@+id/importSettingsIconBackground"
android:layout_width="@dimen/settingsIconSize"
android:layout_height="@dimen/settingsIconSize"
android:layout_margin="@dimen/settingsIconMargin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/shape_circle"
app:tint="#32D6E5" />
app:tint="#2A9702" />

<ImageView
android:id="@+id/loggingSettingsIcon"
android:id="@+id/importSettingsIcon"
android:layout_width="@dimen/settings_icon_image_size"
android:layout_height="@dimen/settings_icon_image_size"
android:contentDescription="@string/logging_settings_icon_content_description"
android:src="@drawable/ic_file_alert"
app:layout_constraintBottom_toBottomOf="@+id/loggingSettingsIconBackground"
app:layout_constraintEnd_toEndOf="@+id/loggingSettingsIconBackground"
app:layout_constraintStart_toStartOf="@+id/loggingSettingsIconBackground"
app:layout_constraintTop_toTopOf="@+id/loggingSettingsIconBackground"
android:contentDescription="@string/import_settings_icon_content_description"
android:src="@drawable/ic_import"
app:layout_constraintBottom_toBottomOf="@+id/importSettingsIconBackground"
app:layout_constraintEnd_toEndOf="@+id/importSettingsIconBackground"
app:layout_constraintStart_toStartOf="@+id/importSettingsIconBackground"
app:layout_constraintTop_toTopOf="@+id/importSettingsIconBackground"
app:tint="@color/iconTint" />

<LinearLayout
Expand All @@ -284,35 +283,34 @@
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/loggingSettingsIconBackground"
app:layout_constraintStart_toEndOf="@+id/importSettingsIconBackground"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/loggingTitle"
android:id="@+id/importTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/logging_settings_header"
android:text="@string/import_rclone_config"
android:textStyle="bold" />

<TextView
android:id="@+id/loggingDescription"
android:id="@+id/importDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loggingSettingsDescription" />
android:text="@string/importSettingsDescription" />
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>


<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/importSettings"
android:id="@+id/exportSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true">

<ImageView
android:id="@+id/importSettingsIconBackground"
android:id="@+id/exportSettingsIconBackground"
android:layout_width="@dimen/settingsIconSize"
android:layout_height="@dimen/settingsIconSize"
android:layout_margin="@dimen/settingsIconMargin"
Expand All @@ -323,15 +321,15 @@
app:tint="#2A9702" />

<ImageView
android:id="@+id/importSettingsIcon"
android:id="@+id/exportSettingsIcon"
android:layout_width="@dimen/settings_icon_image_size"
android:layout_height="@dimen/settings_icon_image_size"
android:contentDescription="@string/logging_settings_icon_content_description"
android:src="@drawable/ic_import"
app:layout_constraintBottom_toBottomOf="@+id/importSettingsIconBackground"
app:layout_constraintEnd_toEndOf="@+id/importSettingsIconBackground"
app:layout_constraintStart_toStartOf="@+id/importSettingsIconBackground"
app:layout_constraintTop_toTopOf="@+id/importSettingsIconBackground"
android:contentDescription="@string/export_settings_icon_content_description"
android:src="@drawable/ic_export"
app:layout_constraintBottom_toBottomOf="@+id/exportSettingsIconBackground"
app:layout_constraintEnd_toEndOf="@+id/exportSettingsIconBackground"
app:layout_constraintStart_toStartOf="@+id/exportSettingsIconBackground"
app:layout_constraintTop_toTopOf="@+id/exportSettingsIconBackground"
app:tint="@color/iconTint" />

<LinearLayout
Expand All @@ -342,53 +340,53 @@
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/importSettingsIconBackground"
app:layout_constraintStart_toEndOf="@+id/exportSettingsIconBackground"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/importTitle"
android:id="@+id/exportTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/export_rclone_config"
android:textStyle="bold" />

<TextView
android:id="@+id/importDescription"
android:id="@+id/exportDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loggingSettingsDescription" />
android:text="@string/exportSettingsDescription" />
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/exportSettings"
android:id="@+id/logging_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true">

<ImageView
android:id="@+id/exportSettingsIconBackground"
android:id="@+id/loggingSettingsIconBackground"
android:layout_width="@dimen/settingsIconSize"
android:layout_height="@dimen/settingsIconSize"
android:layout_margin="@dimen/settingsIconMargin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/shape_circle"
app:tint="#2A9702" />
app:tint="#32D6E5" />

<ImageView
android:id="@+id/exportSettingsIcon"
android:id="@+id/loggingSettingsIcon"
android:layout_width="@dimen/settings_icon_image_size"
android:layout_height="@dimen/settings_icon_image_size"
android:contentDescription="@string/logging_settings_icon_content_description"
android:src="@drawable/ic_export"
app:layout_constraintBottom_toBottomOf="@+id/exportSettingsIconBackground"
app:layout_constraintEnd_toEndOf="@+id/exportSettingsIconBackground"
app:layout_constraintStart_toStartOf="@+id/exportSettingsIconBackground"
app:layout_constraintTop_toTopOf="@+id/exportSettingsIconBackground"
android:src="@drawable/ic_file_alert"
app:layout_constraintBottom_toBottomOf="@+id/loggingSettingsIconBackground"
app:layout_constraintEnd_toEndOf="@+id/loggingSettingsIconBackground"
app:layout_constraintStart_toStartOf="@+id/loggingSettingsIconBackground"
app:layout_constraintTop_toTopOf="@+id/loggingSettingsIconBackground"
app:tint="@color/iconTint" />

<LinearLayout
Expand All @@ -399,25 +397,23 @@
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/exportSettingsIconBackground"
app:layout_constraintStart_toEndOf="@+id/loggingSettingsIconBackground"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/exportTitle"
android:id="@+id/loggingTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/export_rclone_config"
android:text="@string/logging_settings_header"
android:textStyle="bold" />

<TextView
android:id="@+id/exportDescription"
android:id="@+id/loggingDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loggingSettingsDescription" />
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>


</LinearLayout>
</ScrollView>
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,4 +552,8 @@
<string name="theminSettingsDescription">Change the appearance</string>
<string name="notificationSettingsDescription">Control more precisely on when you get notified</string>
<string name="loggingSettingsDescription">Gather more insight when this app misbehaves</string>
<string name="importSettingsDescription">Replace your current config with an backup</string>
<string name="exportSettingsDescription">Backup your remotes, tasks and triggers</string>
<string name="import_settings_icon_content_description">Import Icon</string>
<string name="export_settings_icon_content_description">Export Icon</string>
</resources>

0 comments on commit 01d6743

Please sign in to comment.