msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added color title

Browse Source
pull/158/head
M66B 6 years ago
parent 091067073a
commit 7ad57f431a
5 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -299,7 +299,7 @@ public class FragmentAccount extends FragmentBase {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
FragmentDialogColor fragment = new FragmentDialogColor(); FragmentDialogColor fragment = new FragmentDialogColor();
fragment.initialize(R.string.title_account_color, color, new Bundle(), getContext()); fragment.initialize(R.string.title_color, color, new Bundle(), getContext());
fragment.setTargetFragment(FragmentAccount.this, REQUEST_COLOR); fragment.setTargetFragment(FragmentAccount.this, REQUEST_COLOR);
fragment.show(getFragmentManager(), "account:color"); fragment.show(getFragmentManager(), "account:color");
} }

17
app/src/main/res/layout/fragment_account.xml
Unescape View File

@ -288,18 +288,27 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvNameRemark" /> app:layout_constraintTop_toBottomOf="@id/tvNameRemark" />
<TextView
android:id="@+id/tvColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_color"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etName" />
<Button <Button
android:id="@+id/btnColor" android:id="@+id/btnColor"
style="@style/buttonStyleSmall" style="@style/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:tag="disable" android:tag="disable"
android:text="@string/title_account_color" android:text="@string/title_select"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etName" /> app:layout_constraintTop_toBottomOf="@id/tvColor" />
<View <View
android:id="@+id/vwColor" android:id="@+id/vwColor"
@ -750,7 +759,7 @@
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids=" app:constraint_referenced_ids="
tvUser,etUser,tvPassword,tilPassword,tvRealm,etRealm, tvUser,etUser,tvPassword,tilPassword,tvRealm,etRealm,
tvName,tvNameRemark,etName,btnColor,vwColor,ibColorDefault,tvColorPro" /> tvName,tvNameRemark,etName,tvColor,btnColor,vwColor,ibColorDefault,tvColorPro" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/grpAdvanced" android:id="@+id/grpAdvanced"

17
app/src/main/res/layout/fragment_identity.xml
Unescape View File

@ -106,18 +106,27 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDisplay" /> app:layout_constraintTop_toBottomOf="@id/tvDisplay" />
<TextView
android:id="@+id/tvColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_color"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etDisplay" />
<Button <Button
android:id="@+id/btnColor" android:id="@+id/btnColor"
style="@style/buttonStyleSmall" style="@style/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:tag="disable" android:tag="disable"
android:text="@string/title_account_color" android:text="@string/title_select"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etDisplay" /> app:layout_constraintTop_toBottomOf="@id/tvColor" />
<View <View
android:id="@+id/vwColor" android:id="@+id/vwColor"
@ -652,7 +661,7 @@
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids=" app:constraint_referenced_ids="
tvName,etName,tvEmail,etEmail,tvDisplay,etDisplay, tvName,etName,tvEmail,etEmail,tvDisplay,etDisplay,
btnColor,vwColor,ibColorDefault,tvColorPro, tvColor,btnColor,vwColor,ibColorDefault,tvColorPro,
tvSignature,etSignature,btnHtml, tvSignature,etSignature,btnHtml,
btnAdvanced,btnSave" /> btnAdvanced,btnSave" />

17
app/src/main/res/layout/fragment_rule.xml
Unescape View File

@ -386,18 +386,27 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvHours" /> app:layout_constraintTop_toBottomOf="@+id/tvHours" />
<TextView
android:id="@+id/tvColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_color"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/npDuration" />
<Button <Button
android:id="@+id/btnColor" android:id="@+id/btnColor"
style="@style/buttonStyleSmall" style="@style/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:tag="disable" android:tag="disable"
android:text="@string/title_account_color" android:text="@string/title_select"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/npDuration" /> app:layout_constraintTop_toBottomOf="@id/tvColor" />
<View <View
android:id="@+id/vwColor" android:id="@+id/vwColor"
@ -538,7 +547,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids=" app:constraint_referenced_ids="
btnColor,vwColor,ibColorDefault" /> tvColor,btnColor,vwColor,ibColorDefault" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/grpMove" android:id="@+id/grpMove"

2
app/src/main/res/values/strings.xml
Unescape View File

@ -311,7 +311,7 @@
<string name="title_account_interval_hint">Frequency of refreshing the connection for push messages or frequency of checking for new messages</string> <string name="title_account_interval_hint">Frequency of refreshing the connection for push messages or frequency of checking for new messages</string>
<string name="title_account_partial_fetch_hint">Disable this only in case of empty messages or corrupt attachments</string> <string name="title_account_partial_fetch_hint">Disable this only in case of empty messages or corrupt attachments</string>
<string name="title_account_signature">Signature text</string> <string name="title_account_signature">Signature text</string>
<string name="title_account_color">Color</string> <string name="title_color">Color</string>
<string name="title_account_notify">Separate notifications</string> <string name="title_account_notify">Separate notifications</string>
<string name="title_account_left">Swipe left</string> <string name="title_account_left">Swipe left</string>
<string name="title_account_right">Swipe right</string> <string name="title_account_right">Swipe right</string>

Write Preview
Loading…
Cancel
Save