wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to Toolbar

Browse source 
This allows to show the sidebar above the ActionBar.
This commit is contained in:
ByteHamster 2018-12-02 17:22:31 +01:00 committed by cketti
parent 4a342435e3
commit 212f36170f
53 changed files with 924 additions and 661 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/ui/src/main/java/com/fsck/k9/activity/AccountList.java
View file

@ -39,7 +39,7 @@ public abstract class AccountList extends K9ListActivity implements OnItemClickL
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);
setContentView(R.layout.account_list); setLayout(R.layout.account_list);
ListView listView = getListView(); ListView listView = getListView();
listView.setOnItemClickListener(this); listView.setOnItemClickListener(this);

4
app/ui/src/main/java/com/fsck/k9/activity/Accounts.java
View file

@ -385,9 +385,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
} }
requestWindowFeature(Window.FEATURE_PROGRESS); requestWindowFeature(Window.FEATURE_PROGRESS);
actionBar = getSupportActionBar(); setLayout(R.layout.accounts);
initializeActionBar(); initializeActionBar();
setContentView(R.layout.accounts);
ListView listView = getListView(); ListView listView = getListView();
listView.setOnItemClickListener(this); listView.setOnItemClickListener(this);
listView.setItemsCanFocus(false); listView.setItemsCanFocus(false);
@ -416,6 +415,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
} }
private void initializeActionBar() { private void initializeActionBar() {
actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(false); actionBar.setDisplayHomeAsUpEnabled(false);
} }

2
app/ui/src/main/java/com/fsck/k9/activity/ChooseFolder.java
View file

@ -72,7 +72,7 @@ public class ChooseFolder extends K9ListActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setContentView(R.layout.list_content_simple); setLayout(R.layout.list_content_simple);
getListView().setFastScrollEnabled(true); getListView().setFastScrollEnabled(true);
getListView().setItemsCanFocus(false); getListView().setItemsCanFocus(false);

2
app/ui/src/main/java/com/fsck/k9/activity/ChooseIdentity.java
View file

@ -29,7 +29,7 @@ public class ChooseIdentity extends K9ListActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setContentView(R.layout.list_content_simple); setLayout(R.layout.list_content_simple);
getListView().setTextFilterEnabled(true); getListView().setTextFilterEnabled(true);
getListView().setItemsCanFocus(false); getListView().setItemsCanFocus(false);

2
app/ui/src/main/java/com/fsck/k9/activity/EditIdentity.java
View file

@ -43,7 +43,7 @@ public class EditIdentity extends K9Activity {
mIdentity = new Identity(); mIdentity = new Identity();
} }
setContentView(R.layout.edit_identity); setLayout(R.layout.edit_identity);
/* /*
* If we're being reloaded we override the original account with the one * If we're being reloaded we override the original account with the one

2
app/ui/src/main/java/com/fsck/k9/activity/EmailAddressList.java
View file

@ -21,7 +21,7 @@ public class EmailAddressList extends K9ListActivity implements OnItemClickListe
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.email_address_list); setLayout(R.layout.email_address_list);
Intent i = getIntent(); Intent i = getIntent();
ContactItem contact = (ContactItem) i.getSerializableExtra(EXTRA_CONTACT_ITEM); ContactItem contact = (ContactItem) i.getSerializableExtra(EXTRA_CONTACT_ITEM);

6
app/ui/src/main/java/com/fsck/k9/activity/FolderList.java
View file

@ -249,10 +249,9 @@ public class FolderList extends K9ListActivity {
return; return;
} }
actionBarProgressView = getActionBarProgressView(); setLayout(R.layout.folder_list);
actionBar = getSupportActionBar();
initializeActionBar(); initializeActionBar();
setContentView(R.layout.folder_list); actionBarProgressView = getActionBarProgressView();
listView = getListView(); listView = getListView();
listView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); listView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
listView.setLongClickable(true); listView.setLongClickable(true);
@ -293,6 +292,7 @@ public class FolderList extends K9ListActivity {
} }
private void initializeActionBar() { private void initializeActionBar() {
actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true);
} }

21
app/ui/src/main/java/com/fsck/k9/activity/K9Activity.java
View file

@ -4,12 +4,15 @@ package com.fsck.k9.activity;
import android.Manifest; import android.Manifest;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.LayoutRes;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import com.fsck.k9.activity.K9ActivityCommon.K9ActivityMagic; import com.fsck.k9.activity.K9ActivityCommon.K9ActivityMagic;
import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener; import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
import com.fsck.k9.ui.R; import com.fsck.k9.ui.R;
@ -43,6 +46,24 @@ public abstract class K9Activity extends AppCompatActivity implements K9Activity
mBase.setupGestureDetector(listener); mBase.setupGestureDetector(listener);
} }
protected void setLayout(@LayoutRes int layoutResId) {
setContentView(layoutResId);
Toolbar toolbar = findViewById(R.id.toolbar);
if (toolbar == null) {
throw new IllegalArgumentException("K9 layouts must provide a toolbar with id='toolbar'.");
}
setSupportActionBar(toolbar);
}
protected void setLayout(View view) {
setContentView(view);
Toolbar toolbar = findViewById(R.id.toolbar);
if (toolbar == null) {
throw new IllegalArgumentException("K9 layouts must provide a toolbar with id='toolbar'.");
}
setSupportActionBar(toolbar);
}
public boolean hasPermission(Permission permission) { public boolean hasPermission(Permission permission) {
return ContextCompat.checkSelfPermission(this, permission.permission) == PackageManager.PERMISSION_GRANTED; return ContextCompat.checkSelfPermission(this, permission.permission) == PackageManager.PERMISSION_GRANTED;
} }

5
app/ui/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java
View file

@ -118,6 +118,11 @@ public class K9ActivityCommon {
return (themeId == Theme.LIGHT) ? R.style.Theme_K9_Light : R.style.Theme_K9_Dark; return (themeId == Theme.LIGHT) ? R.style.Theme_K9_Light : R.style.Theme_K9_Dark;
} }
public static int getK9ActionBarThemeResourceId() {
return (getK9ThemeResourceId() == R.style.Theme_K9_Light) ?
R.style.Theme_K9_Light_ActionBar : R.style.Theme_K9_Dark_ActionBar;
}
public static int getK9ThemeResourceId() { public static int getK9ThemeResourceId() {
return getK9ThemeResourceId(K9.getK9Theme()); return getK9ThemeResourceId(K9.getK9Theme());
} }

2
app/ui/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java
View file

@ -18,7 +18,7 @@ public abstract class K9PreferenceActivity extends AppCompatPreferenceActivity i
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
K9ActivityCommon.setLanguage(this, K9.getK9Language()); K9ActivityCommon.setLanguage(this, K9.getK9Language());
setTheme(K9ActivityCommon.getK9ThemeResourceId()); setTheme(K9ActivityCommon.getK9ActionBarThemeResourceId());
super.onCreate(icicle); super.onCreate(icicle);
lifecycleRegistry = new LifecycleRegistry(this); lifecycleRegistry = new LifecycleRegistry(this);
lifecycleRegistry.markState(State.CREATED); lifecycleRegistry.markState(State.CREATED);

4
app/ui/src/main/java/com/fsck/k9/activity/MessageCompose.java
View file

@ -242,9 +242,9 @@ public class MessageCompose extends K9Activity implements OnClickListener,
// background color needs to be forced // background color needs to be forced
themeContext.getTheme().resolveAttribute(R.attr.messageViewBackgroundColor, outValue, true); themeContext.getTheme().resolveAttribute(R.attr.messageViewBackgroundColor, outValue, true);
v.setBackgroundColor(outValue.data); v.setBackgroundColor(outValue.data);
setContentView(v); setLayout(v);
} else { } else {
setContentView(R.layout.message_compose); setLayout(R.layout.message_compose);
} }
initializeActionBar(); initializeActionBar();

5
app/ui/src/main/java/com/fsck/k9/activity/MessageList.java
View file

@ -213,9 +213,9 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
} }
if (useSplitView()) { if (useSplitView()) {
setContentView(R.layout.split_message_list); setLayout(R.layout.split_message_list);
} else { } else {
setContentView(R.layout.message_list); setLayout(R.layout.message_list);
viewSwitcher = findViewById(R.id.container); viewSwitcher = findViewById(R.id.container);
viewSwitcher.setFirstInAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_in_left)); viewSwitcher.setFirstInAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_in_left));
viewSwitcher.setFirstOutAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_out_right)); viewSwitcher.setFirstOutAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_out_right));
@ -552,6 +552,7 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
private void initializeActionBar() { private void initializeActionBar() {
actionBar = getSupportActionBar(); actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setDisplayShowCustomEnabled(true); actionBar.setDisplayShowCustomEnabled(true);
actionBar.setCustomView(R.layout.actionbar_custom); actionBar.setCustomView(R.layout.actionbar_custom);

2
app/ui/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java
View file

@ -125,7 +125,7 @@ public class UpgradeDatabases extends K9Activity {
* Initialize the activity's layout * Initialize the activity's layout
*/ */
private void initializeLayout() { private void initializeLayout() {
setContentView(R.layout.upgrade_databases); setLayout(R.layout.upgrade_databases);
mUpgradeText = findViewById(R.id.databaseUpgradeText); mUpgradeText = findViewById(R.id.databaseUpgradeText);
} }

2
app/ui/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java
View file

@ -44,7 +44,7 @@ public class AccountSetupAccountType extends K9Activity implements OnClickListen
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.account_setup_account_type); setLayout(R.layout.account_setup_account_type);
findViewById(R.id.pop).setOnClickListener(this); findViewById(R.id.pop).setOnClickListener(this);
findViewById(R.id.imap).setOnClickListener(this); findViewById(R.id.imap).setOnClickListener(this);
findViewById(R.id.webdav).setOnClickListener(this); findViewById(R.id.webdav).setOnClickListener(this);

2
app/ui/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
View file

@ -84,7 +84,7 @@ public class AccountSetupBasics extends K9Activity
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.account_setup_basics); setLayout(R.layout.account_setup_basics);
mEmailView = findViewById(R.id.account_email); mEmailView = findViewById(R.id.account_email);
mPasswordView = findViewById(R.id.account_password); mPasswordView = findViewById(R.id.account_password);
mClientCertificateCheckBox = findViewById(R.id.account_client_certificate); mClientCertificateCheckBox = findViewById(R.id.account_client_certificate);

2
app/ui/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
View file

@ -105,7 +105,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.account_setup_check_settings); setLayout(R.layout.account_setup_check_settings);
mMessageView = findViewById(R.id.message); mMessageView = findViewById(R.id.message);
mProgressBar = findViewById(R.id.progress); mProgressBar = findViewById(R.id.progress);
findViewById(R.id.cancel).setOnClickListener(this); findViewById(R.id.cancel).setOnClickListener(this);

2
app/ui/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java
View file

@ -51,7 +51,7 @@ public class AccountSetupComposition extends K9Activity {
String accountUuid = getIntent().getStringExtra(EXTRA_ACCOUNT); String accountUuid = getIntent().getStringExtra(EXTRA_ACCOUNT);
mAccount = Preferences.getPreferences(this).getAccount(accountUuid); mAccount = Preferences.getPreferences(this).getAccount(accountUuid);
setContentView(R.layout.account_setup_composition); setLayout(R.layout.account_setup_composition);
/* /*
* If we're being reloaded we override the original account with the one * If we're being reloaded we override the original account with the one

2
app/ui/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
View file

@ -120,7 +120,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.account_setup_incoming); setLayout(R.layout.account_setup_incoming);
mUsernameView = findViewById(R.id.account_username); mUsernameView = findViewById(R.id.account_username);
mPasswordView = findViewById(R.id.account_password); mPasswordView = findViewById(R.id.account_password);

2
app/ui/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java
View file

@ -41,7 +41,7 @@ public class AccountSetupNames extends K9Activity implements OnClickListener {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.account_setup_names); setLayout(R.layout.account_setup_names);
mDescription = findViewById(R.id.account_description); mDescription = findViewById(R.id.account_description);
mName = findViewById(R.id.account_name); mName = findViewById(R.id.account_name);
mDoneButton = findViewById(R.id.done); mDoneButton = findViewById(R.id.done);

2
app/ui/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
View file

@ -48,7 +48,7 @@ public class AccountSetupOptions extends K9Activity implements OnClickListener {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.account_setup_options); setLayout(R.layout.account_setup_options);
mCheckFrequencyView = findViewById(R.id.account_check_frequency); mCheckFrequencyView = findViewById(R.id.account_check_frequency);
mDisplayCountView = findViewById(R.id.account_display_count); mDisplayCountView = findViewById(R.id.account_display_count);

2
app/ui/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
View file

@ -102,7 +102,7 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.account_setup_outgoing); setLayout(R.layout.account_setup_outgoing);
String accountUuid = getIntent().getStringExtra(EXTRA_ACCOUNT); String accountUuid = getIntent().getStringExtra(EXTRA_ACCOUNT);
mAccount = Preferences.getPreferences(this).getAccount(accountUuid); mAccount = Preferences.getPreferences(this).getAccount(accountUuid);

2
app/ui/src/main/java/com/fsck/k9/activity/setup/WelcomeMessage.java
View file

@ -26,7 +26,7 @@ public class WelcomeMessage extends K9Activity implements OnClickListener{
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
setContentView(R.layout.welcome_message); setLayout(R.layout.welcome_message);
TextView welcome = findViewById(R.id.welcome_message); TextView welcome = findViewById(R.id.welcome_message);
welcome.setText(HtmlConverter.htmlToSpanned(getString(R.string.accounts_welcome))); welcome.setText(HtmlConverter.htmlToSpanned(getString(R.string.accounts_welcome)));

2
app/ui/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt
View file

@ -28,7 +28,7 @@ class AutocryptKeyTransferActivity : K9Activity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.crypto_key_transfer) setLayout(R.layout.crypto_key_transfer)
val accountUuid = intent.getStringExtra(EXTRA_ACCOUNT) val accountUuid = intent.getStringExtra(EXTRA_ACCOUNT)

2
app/ui/src/main/java/com/fsck/k9/ui/settings/AboutActivity.kt
View file

@ -18,7 +18,7 @@ class AboutActivity : K9Activity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.about) setLayout(R.layout.about)
supportActionBar!!.setDisplayHomeAsUpEnabled(true) supportActionBar!!.setDisplayHomeAsUpEnabled(true)
webView = findViewById(R.id.about_view) webView = findViewById(R.id.about_view)

2
app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt
View file

@ -25,7 +25,7 @@ class SettingsActivity : K9Activity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_settings) setLayout(R.layout.activity_settings)
initializeActionBar() initializeActionBar()
initializeSettingsList() initializeSettingsList()

2
app/ui/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt
View file

@ -25,7 +25,7 @@ class AccountSettingsActivity : K9Activity(), OnPreferenceStartScreenCallback {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_account_settings) setLayout(R.layout.activity_account_settings)
initializeActionBar() initializeActionBar()

2
app/ui/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt
View file

@ -27,7 +27,7 @@ class GeneralSettingsActivity : K9Activity(), OnPreferenceStartScreenCallback, S
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.general_settings) setLayout(R.layout.general_settings)
initializeActionBar() initializeActionBar()

17
app/ui/src/main/res/layout/about.xml
View file

@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<WebView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/about_view" android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="fill_parent"
android:layout_height="match_parent" /> android:layout_width="fill_parent">
<include layout="@layout/toolbar" />
<WebView
android:id="@+id/about_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
</LinearLayout>

5
app/ui/src/main/res/layout/account_list.xml
View file

@ -4,10 +4,13 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent"> android:layout_width="fill_parent">
<include layout="@layout/toolbar"/>
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"/> android:layout_height="0dip"
android:layout_weight="1"/>
<LinearLayout <LinearLayout
android:id="@android:id/empty" android:id="@android:id/empty"

6
app/ui/src/main/res/layout/account_setup_account_type.xml
View file

@ -4,8 +4,10 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:padding="6dip" android:padding="6dip"
android:orientation="vertical" android:orientation="vertical"
android:layout_gravity="center_horizontal|center_vertical" android:layout_gravity="center_horizontal|center_vertical" >
>
<include layout="@layout/toolbar" />
<TextView <TextView
android:text="@string/account_setup_account_type_instructions" android:text="@string/account_setup_account_type_instructions"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
app/ui/src/main/res/layout/account_setup_basics.xml
View file

@ -5,6 +5,8 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" > android:layout_width="fill_parent" >
<include layout="@layout/toolbar" />
<ScrollView <ScrollView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"

75
app/ui/src/main/res/layout/account_setup_check_settings.xml
View file

@ -1,39 +1,46 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="6dip"
android:fadingEdge="none"
android:scrollbarStyle="outsideInset">
<LinearLayout
android:orientation="vertical"
android:layout_gravity="center_horizontal|center_vertical"
android:layout_height="wrap_content"
android:padding="6dip"
android:layout_width="fill_parent">
<TextView
android:id="@+id/message"
android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:gravity="center_horizontal" android:layout_height="fill_parent"
android:textAppearance="?android:attr/textAppearanceMedium" android:orientation="vertical">
android:textColor="?android:attr/textColorPrimary"
android:paddingBottom="6dip" <include layout="@layout/toolbar" />
android:focusable="true"
/> <ScrollView
<ProgressBar android:layout_width="fill_parent"
android:id="@+id/progress" android:layout_height="0dp"
android:layout_height="wrap_content" android:layout_weight="1"
android:layout_width="wrap_content" android:padding="6dip"
android:layout_gravity="center_horizontal|center_vertical" android:fadingEdge="none"
android:focusable="true" /> android:scrollbarStyle="outsideInset">
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_gravity="center_horizontal|center_vertical"
android:layout_height="wrap_content"
android:padding="6dip"
android:layout_width="fill_parent">
<TextView
android:id="@+id/message"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
android:paddingBottom="6dip"
android:focusable="true"
/>
<ProgressBar
android:id="@+id/progress"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_horizontal|center_vertical"
android:focusable="true"/>
</LinearLayout>
</ScrollView> </ScrollView>
<include layout="@layout/wizard_cancel" />
<include layout="@layout/wizard_cancel"/>
</LinearLayout> </LinearLayout>

207
app/ui/src/main/res/layout/account_setup_composition.xml
View file

@ -1,103 +1,126 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:fadingEdge="none"
android:scrollbarStyle="outsideInset">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView
android:text="@string/account_settings_name_label" <include layout="@layout/toolbar"/>
android:layout_height="wrap_content"
<ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_height="0dp"
android:textColor="?android:attr/textColorPrimary" /> android:layout_weight="1"
<EditText android:fadingEdge="none"
android:id="@+id/account_name" android:scrollbarStyle="outsideInset">
android:singleLine="true"
android:inputType="textPersonName"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_settings_name_label"
/>
<TextView
android:text="@string/account_settings_email_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
/>
<EditText
android:id="@+id/account_email"
android:singleLine="true"
android:inputType="textEmailAddress"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_settings_email_label"
/>
<TextView
android:text="@string/account_settings_always_bcc_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_always_bcc"
android:singleLine="true"
android:inputType="textEmailAddress"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_settings_always_bcc_label" />
<CheckBox
android:id="@+id/account_signature_use"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/account_settings_signature_use_label" />
<LinearLayout <LinearLayout
android:id="@+id/account_signature_layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TextView
android:text="@string/account_settings_signature_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" /> android:orientation="vertical">
<TextView
android:text="@string/account_settings_name_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<EditText <EditText
android:id="@+id/account_signature" android:id="@+id/account_name"
android:inputType="textMultiLine|textAutoCorrect|textCapSentences" android:singleLine="true"
android:layout_height="wrap_content" android:inputType="textPersonName"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:contentDescription="@string/account_settings_signature_label" /> android:layout_width="fill_parent"
android:contentDescription="@string/account_settings_name_label"
/>
<TextView <TextView
android:text="@string/account_settings_signature__location_label" android:text="@string/account_settings_email_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<RadioGroup
android:id="@+id/account_signature_location"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical" >
<RadioButton
android:id="@+id/account_signature_location_before_quoted_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/account_settings_signature__location_before_quoted_text" android:layout_width="fill_parent"
android:contentDescription="@string/account_settings_signature__location_label" /> android:textAppearance="?android:attr/textAppearanceSmall"
<RadioButton android:textColor="?android:attr/textColorPrimary"
android:id="@+id/account_signature_location_after_quoted_text" />
android:layout_width="wrap_content"
<EditText
android:id="@+id/account_email"
android:singleLine="true"
android:inputType="textEmailAddress"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/account_settings_signature__location_after_quoted_text" android:layout_width="fill_parent"
android:contentDescription="@string/account_settings_signature__location_label" /> android:contentDescription="@string/account_settings_email_label"
</RadioGroup> />
<TextView
android:text="@string/account_settings_always_bcc_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<EditText
android:id="@+id/account_always_bcc"
android:singleLine="true"
android:inputType="textEmailAddress"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_settings_always_bcc_label"/>
<CheckBox
android:id="@+id/account_signature_use"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/account_settings_signature_use_label"/>
<LinearLayout
android:id="@+id/account_signature_layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TextView
android:text="@string/account_settings_signature_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<EditText
android:id="@+id/account_signature"
android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_settings_signature_label"/>
<TextView
android:text="@string/account_settings_signature__location_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<RadioGroup
android:id="@+id/account_signature_location"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical">
<RadioButton
android:id="@+id/account_signature_location_before_quoted_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_signature__location_before_quoted_text"
android:contentDescription="@string/account_settings_signature__location_label"/>
<RadioButton
android:id="@+id/account_signature_location_after_quoted_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_signature__location_after_quoted_text"
android:contentDescription="@string/account_settings_signature__location_label"/>
</RadioGroup>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </ScrollView>
</ScrollView> </LinearLayout>

516
app/ui/src/main/res/layout/account_setup_incoming.xml
View file

@ -1,253 +1,295 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_height="fill_parent"
android:layout_width="fill_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <include layout="@layout/toolbar"/>
android:orientation="vertical"
android:layout_height="fill_parent"
android:layout_width="fill_parent">
<ScrollView <ScrollView
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="6dip"
android:fadingEdge="none"
android:scrollbarStyle="outsideInset">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- This text may be changed in code if the server is IMAP, etc. -->
<TextView
android:id="@+id/account_server_label"
android:text="@string/account_setup_incoming_pop_server_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_height="0dp"
android:textColor="?android:attr/textColorPrimary" android:layout_weight="1"
android:contentDescription="@string/account_setup_incoming_password_label" /> android:padding="6dip"
<EditText android:fadingEdge="none"
android:id="@+id/account_server" android:scrollbarStyle="outsideInset">
android:singleLine="true"
android:inputType="textUri"
android:layout_height="wrap_content"
android:layout_width="fill_parent" />
<TextView
android:text="@string/account_setup_incoming_security_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_security_type"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_security_label" />
<TextView
android:text="@string/account_setup_incoming_port_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_port"
android:singleLine="true"
android:inputType="number"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_port_label" />
<TextView
android:text="@string/account_setup_incoming_username_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_username"
android:singleLine="true"
android:inputType="textEmailAddress"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_username_label" />
<TextView
android:id="@+id/account_auth_type_label"
android:text="@string/account_setup_incoming_auth_type_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_auth_type"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_auth_type_label" />
<TextView
android:id="@+id/account_password_label"
android:text="@string/account_setup_incoming_password_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_password"
android:inputType="textPassword"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/account_client_certificate_label"
android:text="@string/account_setup_incoming_client_certificate_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:visibility="gone" />
<com.fsck.k9.view.ClientCertificateSpinner
android:id="@+id/account_client_certificate_spinner"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:visibility="gone" />
<LinearLayout <LinearLayout
android:id="@+id/imap_path_prefix_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<CheckBox
android:id="@+id/imap_autodetect_namespace"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_autodetect_namespace_label" />
<TextView
android:text="@string/account_setup_incoming_imap_path_prefix_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" /> android:orientation="vertical">
<!-- This text may be changed in code if the server is IMAP, etc. -->
<TextView
android:id="@+id/account_server_label"
android:text="@string/account_setup_incoming_pop_server_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:contentDescription="@string/account_setup_incoming_password_label"/>
<EditText <EditText
android:id="@+id/imap_path_prefix" android:id="@+id/account_server"
android:singleLine="true" android:singleLine="true"
android:layout_height="wrap_content" android:inputType="textUri"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:contentDescription="@string/account_setup_incoming_imap_path_prefix_label" /> android:layout_width="fill_parent"/>
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:id="@+id/imap_folder_setup_section"
android:orientation="vertical">
<CheckBox
android:id="@+id/subscribed_folders_only"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_subscribed_folders_only_label"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_advanced_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:text="@string/advanced" android:text="@string/account_setup_incoming_security_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"/>
android:textStyle="bold"
android:layout_marginTop="4dp" /> <Spinner
</LinearLayout> android:id="@+id/account_security_type"
<LinearLayout android:layout_height="wrap_content"
android:id="@+id/webdav_mailbox_alias_section" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:contentDescription="@string/account_setup_incoming_security_label"/>
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:text="@string/account_setup_incoming_webdav_mailbox_path_label" android:text="@string/account_setup_incoming_port_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary"/>
<EditText <EditText
android:id="@+id/webdav_mailbox_path" android:id="@+id/account_port"
android:hint="@string/account_setup_incoming_webdav_mailbox_path_hint" android:singleLine="true"
android:singleLine="true" android:inputType="number"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_mailbox_path_label" /> android:contentDescription="@string/account_setup_incoming_port_label"/>
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_owa_path_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:text="@string/account_setup_incoming_webdav_path_prefix_label" android:text="@string/account_setup_incoming_username_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary"/>
<EditText <EditText
android:id="@+id/webdav_path_prefix" android:id="@+id/account_username"
android:hint="@string/account_setup_incoming_webdav_path_prefix_hint" android:singleLine="true"
android:singleLine="true" android:inputType="textEmailAddress"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_path_prefix_label" /> android:contentDescription="@string/account_setup_incoming_username_label"/>
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_auth_path_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:text="@string/account_setup_incoming_webdav_auth_path_label" android:id="@+id/account_auth_type_label"
android:layout_height="wrap_content" android:text="@string/account_setup_incoming_auth_type_label"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="fill_parent"
android:textColor="?android:attr/textColorPrimary" /> android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<Spinner
android:id="@+id/account_auth_type"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_auth_type_label"/>
<TextView
android:id="@+id/account_password_label"
android:text="@string/account_setup_incoming_password_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<EditText <EditText
android:id="@+id/webdav_auth_path" android:id="@+id/account_password"
android:hint="@string/account_setup_incoming_webdav_auth_path_hint" android:inputType="textPassword"
android:singleLine="true" android:singleLine="true"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"/>
android:contentDescription="@string/account_setup_incoming_webdav_auth_path_label" />
<TextView
android:id="@+id/account_client_certificate_label"
android:text="@string/account_setup_incoming_client_certificate_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:visibility="gone"/>
<com.fsck.k9.view.ClientCertificateSpinner
android:id="@+id/account_client_certificate_spinner"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/imap_path_prefix_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<CheckBox
android:id="@+id/imap_autodetect_namespace"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_autodetect_namespace_label"/>
<TextView
android:text="@string/account_setup_incoming_imap_path_prefix_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<EditText
android:id="@+id/imap_path_prefix"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_imap_path_prefix_label"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/imap_folder_setup_section"
android:orientation="vertical">
<CheckBox
android:id="@+id/subscribed_folders_only"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_subscribed_folders_only_label"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_advanced_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:text="@string/advanced"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:layout_marginTop="4dp"/>
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_mailbox_alias_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:text="@string/account_setup_incoming_webdav_mailbox_path_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<EditText
android:id="@+id/webdav_mailbox_path"
android:hint="@string/account_setup_incoming_webdav_mailbox_path_hint"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_mailbox_path_label"/>
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_owa_path_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:text="@string/account_setup_incoming_webdav_path_prefix_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<EditText
android:id="@+id/webdav_path_prefix"
android:hint="@string/account_setup_incoming_webdav_path_prefix_hint"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_path_prefix_label"/>
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_auth_path_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:text="@string/account_setup_incoming_webdav_auth_path_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<EditText
android:id="@+id/webdav_auth_path"
android:hint="@string/account_setup_incoming_webdav_auth_path_hint"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_auth_path_label"/>
</LinearLayout>
<TextView
android:id="@+id/compression_label"
android:text="@string/account_setup_incoming_compression_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<LinearLayout
android:id="@+id/compression_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<CheckBox
android:id="@+id/compression_mobile"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_mobile_label"
/>
<CheckBox
android:id="@+id/compression_wifi"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_wifi_label"
android:contentDescription="@string/account_setup_incoming_compression_label"
/>
<CheckBox
android:id="@+id/compression_other"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_other_label"
android:contentDescription="@string/account_setup_incoming_compression_label"
/>
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
</LinearLayout> </LinearLayout>
<TextView </ScrollView>
android:id="@+id/compression_label"
android:text="@string/account_setup_incoming_compression_label" <include layout="@layout/wizard_next"/>
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<LinearLayout
android:id="@+id/compression_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<CheckBox
android:id="@+id/compression_mobile"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_mobile_label"
/>
<CheckBox
android:id="@+id/compression_wifi"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_wifi_label"
android:contentDescription="@string/account_setup_incoming_compression_label"
/>
<CheckBox
android:id="@+id/compression_other"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_other_label"
android:contentDescription="@string/account_setup_incoming_compression_label"
/>
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1" />
</LinearLayout>
</ScrollView>
<include layout="@layout/wizard_next" />
</LinearLayout> </LinearLayout>

81
app/ui/src/main/res/layout/account_setup_names.xml
View file

@ -1,42 +1,49 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="6dip"
android:fadingEdge="none"
android:scrollbarStyle="outsideInset">
<LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="fill_parent"
android:layout_gravity="center_horizontal|center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<EditText
android:id="@+id/account_description" <include layout="@layout/toolbar"/>
android:singleLine="true"
android:layout_height="wrap_content" <ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:hint="@string/account_setup_names_account_name_label" android:layout_height="0dp"
android:contentDescription="@string/account_setup_names_account_name_label" /> android:layout_weight="1"
<EditText android:padding="6dip"
android:id="@+id/account_name" android:fadingEdge="none"
android:singleLine="true" android:scrollbarStyle="outsideInset">
android:inputType="textPersonName"
android:layout_height="wrap_content" <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:hint="@string/account_setup_names_user_name_label" android:layout_height="wrap_content"
android:contentDescription="@string/account_setup_names_user_name_label" /> android:layout_gravity="center_horizontal|center_vertical"
<View android:orientation="vertical">
android:layout_height="0dip"
android:layout_width="fill_parent" <EditText
android:layout_weight="1" /> android:id="@+id/account_description"
</LinearLayout> android:singleLine="true"
</ScrollView> android:layout_height="wrap_content"
<include layout="@layout/wizard_done" /> android:layout_width="fill_parent"
android:hint="@string/account_setup_names_account_name_label"
android:contentDescription="@string/account_setup_names_account_name_label"/>
<EditText
android:id="@+id/account_name"
android:singleLine="true"
android:inputType="textPersonName"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:hint="@string/account_setup_names_user_name_label"
android:contentDescription="@string/account_setup_names_user_name_label"/>
<View
android:layout_height="0dip"
android:layout_width="fill_parent"
android:layout_weight="1"/>
</LinearLayout>
</ScrollView>
<include layout="@layout/wizard_done"/>
</LinearLayout> </LinearLayout>

149
app/ui/src/main/res/layout/account_setup_options.xml
View file

@ -1,71 +1,92 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_height="fill_parent"
android:layout_width="fill_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <include layout="@layout/toolbar"/>
android:orientation="vertical"
android:layout_height="fill_parent"
android:layout_width="fill_parent">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginBottom="54dip"
android:fadingEdge="none"
android:padding="6dip"
android:scrollbarStyle="outsideInset">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:orientation="vertical"
android:layout_height="wrap_content" android:layout_height="0dip"
android:orientation="vertical"> android:layout_weight="1"
<TextView android:layout_width="fill_parent">
android:text="@string/account_setup_options_mail_check_frequency_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
/>
<Spinner
android:id="@+id/account_check_frequency"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_options_mail_check_frequency_label" />
<CheckBox
android:id="@+id/account_enable_push"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/account_setup_options_enable_push_label"
android:summary="@string/account_setup_options_enable_push_summary"
/>
<TextView
android:text="@string/account_setup_options_mail_display_count_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_display_count"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_options_mail_display_count_label" />
<CheckBox
android:id="@+id/account_notify"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/account_setup_options_notify_label" />
<CheckBox
android:id="@+id/account_notify_sync"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/account_setup_options_notify_sync_label" /> <include layout="@layout/toolbar"/>
<View
android:layout_width="fill_parent" <ScrollView
android:layout_height="0dp" android:layout_width="fill_parent"
android:layout_weight="1" /> android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginBottom="54dip"
android:fadingEdge="none"
android:padding="6dip"
android:scrollbarStyle="outsideInset">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:text="@string/account_setup_options_mail_check_frequency_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
/>
<Spinner
android:id="@+id/account_check_frequency"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_options_mail_check_frequency_label"/>
<CheckBox
android:id="@+id/account_enable_push"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/account_setup_options_enable_push_label"
android:summary="@string/account_setup_options_enable_push_summary"
/>
<TextView
android:text="@string/account_setup_options_mail_display_count_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
<Spinner
android:id="@+id/account_display_count"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_options_mail_display_count_label"/>
<CheckBox
android:id="@+id/account_notify"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/account_setup_options_notify_label"/>
<CheckBox
android:id="@+id/account_notify_sync"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/account_setup_options_notify_sync_label"/>
<View
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
</LinearLayout>
</ScrollView>
<include layout="@layout/wizard_next"/>
</LinearLayout> </LinearLayout>
</ScrollView>
<include layout="@layout/wizard_next" />
</LinearLayout> </LinearLayout>

2
app/ui/src/main/res/layout/account_setup_outgoing.xml
View file

@ -5,6 +5,8 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent"> android:layout_width="fill_parent">
<include layout="@layout/toolbar"/>
<ScrollView <ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dp" android:layout_height="0dp"

6
app/ui/src/main/res/layout/accounts.xml
View file

@ -3,9 +3,13 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent"> android:layout_width="fill_parent">
<include layout="@layout/toolbar" />
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="0dip"
android:layout_weight="1"
/> />
</LinearLayout> </LinearLayout>

18
app/ui/src/main/res/layout/activity_account_settings.xml
View file

@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/accountSettingsContainer" android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="fill_parent"
android:layout_height="match_parent" /> android:layout_width="fill_parent">
<include layout="@layout/toolbar" />
<FrameLayout
android:id="@+id/accountSettingsContainer"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
</LinearLayout>

27
app/ui/src/main/res/layout/activity_settings.xml
View file

@ -1,10 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/settings_list" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:orientation="vertical">
android:orientation="vertical"
android:scrollbars="vertical" <include layout="@layout/toolbar" />
tools:context="com.fsck.k9.ui.settings.SettingsActivity" />
<android.support.v7.widget.RecyclerView
android:id="@+id/settings_list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:scrollbars="vertical"
tools:context="com.fsck.k9.ui.settings.SettingsActivity"/>
</LinearLayout>

2
app/ui/src/main/res/layout/crypto_key_transfer.xml
View file

@ -10,6 +10,8 @@
android:paddingLeft="12dp" android:paddingLeft="12dp"
android:paddingRight="12dp"> android:paddingRight="12dp">
<include layout="@layout/toolbar" />
<TextView <TextView
style="?android:textAppearanceMedium" style="?android:textAppearanceMedium"
android:layout_width="wrap_content" android:layout_width="wrap_content"

197
app/ui/src/main/res/layout/edit_identity.xml
View file

@ -1,69 +1,86 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:scrollbarStyle="outsideInset">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView
android:text="@string/edit_identity_description_label" <include layout="@layout/toolbar"/>
android:layout_height="wrap_content"
<ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_height="0dip"
android:textColor="?android:attr/textColorPrimary" /> android:layout_weight="1"
<EditText android:scrollbarStyle="outsideInset">
android:id="@+id/description"
android:singleLine="true" <LinearLayout
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:hint="@string/edit_identity_description_hint" android:orientation="vertical">
/>
<TextView <TextView
android:text="@string/edit_identity_name_label" android:text="@string/edit_identity_description_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary"/>
<EditText
android:id="@+id/name" <EditText
android:singleLine="true" android:id="@+id/description"
android:layout_height="wrap_content" android:singleLine="true"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:hint="@string/edit_identity_name_hint" android:layout_width="fill_parent"
/> android:hint="@string/edit_identity_description_hint"
<TextView />
android:text="@string/edit_identity_email_label"
android:layout_height="wrap_content" <TextView
android:layout_width="fill_parent" android:text="@string/edit_identity_name_label"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" android:layout_width="fill_parent"
/> android:textAppearance="?android:attr/textAppearanceSmall"
<EditText android:textColor="?android:attr/textColorPrimary"/>
android:id="@+id/email"
android:singleLine="true" <EditText
android:layout_height="wrap_content" android:id="@+id/name"
android:layout_width="fill_parent" android:singleLine="true"
android:hint="@string/edit_identity_email_hint" android:layout_height="wrap_content"
android:inputType="textEmailAddress"/> android:layout_width="fill_parent"
<TextView android:hint="@string/edit_identity_name_hint"
android:text="@string/edit_identity_reply_to_label" />
android:layout_height="wrap_content"
android:layout_width="fill_parent" <TextView
android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/edit_identity_email_label"
android:textColor="?android:attr/textColorPrimary" android:layout_height="wrap_content"
/> android:layout_width="fill_parent"
<EditText android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/reply_to" android:textColor="?android:attr/textColorPrimary"
android:singleLine="true" />
android:layout_height="wrap_content"
android:layout_width="fill_parent" <EditText
android:hint="@string/edit_identity_reply_to_hint" android:id="@+id/email"
android:inputType="textEmailAddress" android:singleLine="true"
/> android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:hint="@string/edit_identity_email_hint"
android:inputType="textEmailAddress"/>
<TextView
android:text="@string/edit_identity_reply_to_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
/>
<EditText
android:id="@+id/reply_to"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:hint="@string/edit_identity_reply_to_hint"
android:inputType="textEmailAddress"
/>
<!-- <!--
<TextView <TextView
android:text="@string/edit_identity_always_bcc_label" android:text="@string/edit_identity_always_bcc_label"
@ -77,28 +94,32 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" /> android:layout_width="fill_parent" />
--> -->
<CheckBox <CheckBox
android:id="@+id/signature_use" android:id="@+id/signature_use"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/account_settings_signature_use_label" /> android:text="@string/account_settings_signature_use_label"/>
<LinearLayout
android:id="@+id/signature_layout" <LinearLayout
android:layout_width="fill_parent" android:id="@+id/signature_layout"
android:layout_height="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical"> android:layout_height="fill_parent"
<TextView android:orientation="vertical">
android:text="@string/edit_identity_signature_label"
android:layout_height="wrap_content" <TextView
android:layout_width="fill_parent" android:text="@string/edit_identity_signature_label"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" /> android:layout_width="fill_parent"
<EditText android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/signature" android:textColor="?android:attr/textColorPrimary"/>
android:singleLine="false"
android:layout_height="wrap_content" <EditText
android:layout_width="fill_parent" android:id="@+id/signature"
android:hint="@string/edit_identity_signature_hint"/> android:singleLine="false"
</LinearLayout> android:layout_height="wrap_content"
</LinearLayout> android:layout_width="fill_parent"
</ScrollView> android:hint="@string/edit_identity_signature_hint"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>

5
app/ui/src/main/res/layout/email_address_list.xml
View file

@ -5,9 +5,12 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<include layout="@layout/toolbar"/>
<ListView <ListView
android:id="@+id/android:list" android:id="@+id/android:list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"/> android:layout_height="0dip"
android:layout_weight="1"/>
</LinearLayout> </LinearLayout>

21
app/ui/src/main/res/layout/folder_list.xml
View file

@ -1,12 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" android:orientation="vertical"
android:layout_width="fill_parent">
<ListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
/> android:layout_width="fill_parent">
<include layout="@layout/toolbar" />
<ListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"
/>
</LinearLayout> </LinearLayout>

18
app/ui/src/main/res/layout/general_settings.xml
View file

@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/generalSettingsContainer" android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="fill_parent"
android:layout_height="match_parent" /> android:layout_width="fill_parent">
<include layout="@layout/toolbar" />
<FrameLayout
android:id="@+id/generalSettingsContainer"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
</LinearLayout>

20
app/ui/src/main/res/layout/list_content_simple.xml
View file

@ -1,6 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ListView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:id="@android:id/list" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:drawSelectorOnTop="false" /> android:orientation="vertical">
<include layout="@layout/toolbar"/>
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:drawSelectorOnTop="false"/>
</LinearLayout>

3
app/ui/src/main/res/layout/message_compose.xml
View file

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar" />
<ScrollView <ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dip" android:layout_height="0dip"

37
app/ui/src/main/res/layout/message_list.xml
View file

@ -1,17 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.fsck.k9.view.ViewSwitcher xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" > android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout <include layout="@layout/toolbar" />
android:id="@+id/message_list_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
<FrameLayout <com.fsck.k9.view.ViewSwitcher
android:id="@+id/message_view_container" android:id="@+id/container"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" /> android:layout_height="0dip"
android:layout_weight="1">
</com.fsck.k9.view.ViewSwitcher> <FrameLayout
android:id="@+id/message_list_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<FrameLayout
android:id="@+id/message_view_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
</com.fsck.k9.view.ViewSwitcher>
</LinearLayout>

58
app/ui/src/main/res/layout/split_message_list.xml
View file

@ -1,29 +1,39 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:baselineAligned="false" android:orientation="vertical">
android:orientation="horizontal" >
<FrameLayout <include layout="@layout/toolbar" />
android:id="@+id/message_list_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="5" />
<View <LinearLayout
android:id="@+id/message_list_divider" android:id="@+id/container"
android:layout_width="1px" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="0dip"
android:background="?attr/messageListDividerColor" android:layout_weight="1"
tools:ignore="PxUsage" /> android:baselineAligned="false"
android:orientation="horizontal">
<FrameLayout <FrameLayout
android:id="@+id/message_view_container" android:id="@+id/message_list_container"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="3" /> android:layout_weight="5"/>
</LinearLayout> <View
android:id="@+id/message_list_divider"
android:layout_width="1px"
android:layout_height="fill_parent"
android:background="?attr/messageListDividerColor"
tools:ignore="PxUsage"/>
<FrameLayout
android:id="@+id/message_view_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="3"/>
</LinearLayout>
</LinearLayout>

8
app/ui/src/main/res/layout/toolbar.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"/>

2
app/ui/src/main/res/layout/upgrade_databases.xml
View file

@ -5,6 +5,8 @@
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:orientation="vertical" > android:orientation="vertical" >
<include layout="@layout/toolbar"/>
<ProgressBar <ProgressBar
android:id="@+id/databaseUpgradeProgress" android:id="@+id/databaseUpgradeProgress"
style="?android:attr/progressBarStyleLarge" style="?android:attr/progressBarStyleLarge"

2
app/ui/src/main/res/layout/welcome_message.xml
View file

@ -4,6 +4,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<include layout="@layout/toolbar"/>
<ScrollView <ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dp" android:layout_height="0dp"

14
app/ui/src/main/res/values/themes.xml
View file

@ -6,8 +6,8 @@
</style> </style>
<!-- Empty base themes that can be easily replaced by RRO (Runtime Resource Overlay) themes --> <!-- Empty base themes that can be easily replaced by RRO (Runtime Resource Overlay) themes -->
<style name="Theme.K9.Light.Base" parent="Theme.AppCompat.Light" /> <style name="Theme.K9.Light.Base" parent="Theme.AppCompat.Light.NoActionBar" />
<style name="Theme.K9.Dark.Base" parent="Theme.AppCompat" /> <style name="Theme.K9.Dark.Base" parent="Theme.AppCompat.NoActionBar" />
<style name="Theme.K9.Light.Common" parent="Theme.K9.Light.Base"> <style name="Theme.K9.Light.Common" parent="Theme.K9.Light.Base">
<item name="material_drawer_background">@color/material_drawer_background</item> <item name="material_drawer_background">@color/material_drawer_background</item>
@ -220,6 +220,16 @@
<style name="Theme.K9.Light" parent="Theme.K9.Light.Common" /> <style name="Theme.K9.Light" parent="Theme.K9.Light.Common" />
<style name="Theme.K9.Dark" parent="Theme.K9.Dark.Common" /> <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Common" />
<style name="Theme.K9.Light.ActionBar" parent="Theme.K9.Light.Common" >
<item name="windowActionBar">true</item>
<item name="windowNoTitle">false</item>
</style>
<style name="Theme.K9.Dark.ActionBar" parent="Theme.K9.Dark.Common" >
<item name="windowActionBar">true</item>
<item name="windowNoTitle">false</item>
</style>
<style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light"> <style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light">
<item name="backgroundColorChooseAccountHeader">#cccccc</item> <item name="backgroundColorChooseAccountHeader">#cccccc</item>
</style> </style>