mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Small layout improvements

This commit is contained in:
M66B 2019-01-19 08:25:47 +00:00
parent 65058dd02d
commit a14c8e8f2b
9 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ public class FragmentRule extends FragmentBase {
actions.add(new Action(EntityRule.TYPE_SEEN, getString(R.string.title_seen)));
actions.add(new Action(EntityRule.TYPE_UNSEEN, getString(R.string.title_unseen)));
actions.add(new Action(EntityRule.TYPE_MOVE, getString(R.string.title_move)));
actions.add(new Action(EntityRule.TYPE_ANSWER, getString(R.string.menu_answers)));
actions.add(new Action(EntityRule.TYPE_ANSWER, getString(R.string.title_answer_reply)));
adapterAction.addAll(actions);
spAction.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

6
app/src/main/res/layout/dialog_ask_again.xml
View File

@ -2,12 +2,12 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="24dp">
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="24dp">
<TextView
android:id="@+id/tvMessage"

6
app/src/main/res/layout/dialog_duration.xml
View File

@ -2,12 +2,12 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="12dp">
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="24dp">
<TextView
android:id="@+id/tvHours"

6
app/src/main/res/layout/dialog_message.xml
View File

@ -2,12 +2,12 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="24dp">
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="24dp">
<TextView
android:id="@+id/tvMessage"

23
app/src/main/res/layout/fragment_legend.xml
View File

@ -638,6 +638,27 @@
app:layout_constraintStart_toEndOf="@id/ivClosing"
app:layout_constraintTop_toTopOf="@id/ivClosing" />
<ImageView
android:id="@+id/ivStop"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="24dp"
android:src="@drawable/baseline_stop_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvClosing" />
<TextView
android:id="@+id/tvStop"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:text="@string/title_legend_stop"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintBottom_toBottomOf="@id/ivStop"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/ivStop"
app:layout_constraintTop_toTopOf="@id/ivStop" />
<TextView
android:id="@+id/tvDownloadFetch"
android:layout_width="wrap_content"
@ -648,7 +669,7 @@
android:textAppearance="@android:style/TextAppearance.Small"
app:layout_constraintBottom_toBottomOf="@+id/tvDownloadFetchLegend"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvClosing" />
app:layout_constraintTop_toBottomOf="@id/tvStop" />
<ImageView
android:id="@+id/ivDownloadFetch"

4
app/src/main/res/layout/fragment_quick_setup.xml
View File

@ -4,13 +4,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="12dp"
android:orientation="vertical"
tools:context=".ActivitySetup">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="12dp">
<EditText
android:id="@+id/etName"

33
app/src/main/res/layout/fragment_rule.xml
View File

@ -10,16 +10,15 @@
android:id="@+id/scroll"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="12dp"
android:orientation="vertical"
android:scrollbarStyle="outsideOverlay"
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="12dp">
<TextView
android:id="@+id/tvName"
@ -223,11 +222,11 @@
app:layout_constraintTop_toBottomOf="@id/tvAction" />
<TextView
android:id="@+id/tvTargetArguments"
android:id="@+id/tvMoveTarget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_rule_arguments"
android:text="@string/title_rule_folder"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spAction" />
@ -238,14 +237,14 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvTargetArguments" />
app:layout_constraintTop_toBottomOf="@id/tvMoveTarget" />
<TextView
android:id="@+id/tvAnswerArguments"
android:id="@+id/tvAnswerIdentity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_rule_arguments"
android:text="@string/title_rule_identity"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spTarget" />
@ -256,7 +255,17 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvAnswerArguments" />
app:layout_constraintTop_toBottomOf="@id/tvAnswerIdentity" />
<TextView
android:id="@+id/tvAnswerTemplate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_rule_answer"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spIdent" />
<Spinner
android:id="@+id/spAnswer"
@ -264,7 +273,7 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spIdent" />
app:layout_constraintTop_toBottomOf="@id/tvAnswerTemplate" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpReady"
@ -276,13 +285,13 @@
android:id="@+id/grpMove"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvTargetArguments,spTarget" />
app:constraint_referenced_ids="tvMoveTarget,spTarget" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpAnswer"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvAnswerArguments,spIdent,spAnswer" />
app:constraint_referenced_ids="tvAnswerIdentity,spIdent,tvAnswerTemplate,spAnswer" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

4
app/src/main/res/layout/fragment_setup.xml
View File

@ -4,13 +4,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="12dp"
android:orientation="vertical"
tools:context=".ActivitySetup">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="12dp">
<ImageView
android:id="@+id/fast"

5
app/src/main/res/values/strings.xml
View File

@ -390,7 +390,9 @@
<string name="title_rule_regex">Regex</string>
<string name="title_rule_and">AND</string>
<string name="title_rule_action">Action</string>
<string name="title_rule_arguments">Parameters</string>
<string name="title_rule_folder">Folder</string>
<string name="title_rule_identity">Identity</string>
<string name="title_rule_answer">Reply template</string>
<string name="title_rule_name_missing">Rule name missing</string>
<string name="title_rule_condition_missing">Condition missing</string>
@ -428,6 +430,7 @@
<string name="title_legend_synchronizing">Synchronizing</string>
<string name="title_legend_downloading">Downloading</string>
<string name="title_legend_closing">Closing</string>
<string name="title_legend_stop">Stop processing rules</string>
<string name="title_legend_metered">Connection is metered</string>
<string name="title_legend_unmetered">Connection is unmetered</string>
<string name="title_legend_sync_keep">Number of days to synchronize / to keep messages</string>