mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 01:06:04 +00:00
Code Issues Releases Wiki Activity

Added inbox and archive to legend

Browse source
This commit is contained in:
M66B 2018-09-14 17:21:32 +00:00
parent 6ce74019a7
commit 4e5eecfece
3 changed files with 66 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml
View file

@ -30,7 +30,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

84
app/src/main/res/layout/fragment_legend.xml
View file

@ -9,13 +9,73 @@
android:layout_height="match_parent"
android:padding="18dp">
<ImageView
android:id="@+id/ivInbox"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/baseline_inbox_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvInbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:text="@string/title_legend_inbox"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintBottom_toBottomOf="@id/ivInbox"
app:layout_constraintStart_toEndOf="@id/ivInbox"
app:layout_constraintTop_toTopOf="@id/ivInbox" />
<ImageView
android:id="@+id/ivUnified"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:src="@drawable/baseline_folder_special_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivInbox" />
<TextView
android:id="@+id/tvUnified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:text="@string/title_legend_unified"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintBottom_toBottomOf="@id/ivUnified"
app:layout_constraintStart_toEndOf="@id/ivUnified"
app:layout_constraintTop_toTopOf="@id/ivUnified" />
<ImageView
android:id="@+id/ivArchive"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:src="@drawable/baseline_archive_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivUnified" />
<TextView
android:id="@+id/tvArchive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:text="@string/title_legend_archive"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintBottom_toBottomOf="@id/ivArchive"
app:layout_constraintStart_toEndOf="@id/ivArchive"
app:layout_constraintTop_toTopOf="@id/ivArchive" />
<ImageView
android:id="@+id/ivCC"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:src="@drawable/baseline_people_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/ivArchive" />
<TextView
android:id="@+id/tvCC"
@ -108,26 +168,6 @@
app:layout_constraintStart_toEndOf="@id/ivPrimary"
app:layout_constraintTop_toTopOf="@id/ivPrimary" />
<ImageView
android:id="@+id/ivUnified"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:src="@drawable/baseline_folder_special_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivPrimary" />
<TextView
android:id="@+id/tvUnified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:text="@string/title_legend_unified"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintBottom_toBottomOf="@id/ivUnified"
app:layout_constraintStart_toEndOf="@id/ivUnified"
app:layout_constraintTop_toTopOf="@id/ivUnified" />
<ImageView
android:id="@+id/ivDisconnected"
android:layout_width="24dp"
@ -135,7 +175,7 @@
android:layout_marginTop="12dp"
android:src="@drawable/baseline_cloud_off_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivUnified" />
app:layout_constraintTop_toBottomOf="@id/ivPrimary" />
<TextView
android:id="@+id/tvDisconnected"

4
app/src/main/res/values/strings.xml
View file

@ -218,12 +218,14 @@
<string name="title_answer_name">Answer name</string>
<string name="title_answer_text">Answer text</string>
<string name="title_legend_inbox">Inbox</string>
<string name="title_legend_unified">Unified inbox</string>
<string name="title_legend_archive">Archive</string>
<string name="title_legend_cc">CC/BCC</string>
<string name="title_legend_attachment">Attachment</string>
<string name="title_legend_thread">Conversation</string>
<string name="title_legend_synchronize">Synchronize</string>
<string name="title_legend_primary">Primary</string>
<string name="title_legend_unified">Unified inbox</string>
<string name="title_legend_disconnected">Disconnected</string>
<string name="title_legend_connecting">Connecting</string>
<string name="title_legend_connected">Connected</string>