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

Fixed warnings

This commit is contained in:
M66B 2018-09-26 11:50:45 +00:00
parent c2a078a340
commit a85797064a
8 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser
View File

Binary file not shown.

4
app/build.gradle
View File

@ -17,6 +17,10 @@ android {
} }
} }
lintOptions {
disable 'MissingTranslation'
}
buildTypes { buildTypes {
release { release {
debuggable = false debuggable = false

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

@ -127,7 +127,7 @@ public interface DaoFolder {
", hide = :hide" + ", hide = :hide" +
", synchronize = :synchronize" + ", synchronize = :synchronize" +
", unified = :unified" + ", unified = :unified" +
", after = :after" + ", `after` = :after" +
" WHERE id = :id") " WHERE id = :id")
int setFolderProperties(long id, String name, String display, boolean hide, boolean synchronize, boolean unified, int after); int setFolderProperties(long id, String name, String display, boolean hide, boolean synchronize, boolean unified, int after);

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

@ -34,7 +34,6 @@ import android.graphics.drawable.GradientDrawable;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.preference.PreferenceManager;
import android.text.Editable; import android.text.Editable;
import android.text.Html; import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
@ -339,7 +338,7 @@ public class FragmentAccount extends FragmentEx {
btnColor.setOnClickListener(new View.OnClickListener() { btnColor.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("pro", false)) { if (Helper.isPro(getContext())) {
int[] colors = getContext().getResources().getIntArray(R.array.colorPicker); int[] colors = getContext().getResources().getIntArray(R.array.colorPicker);
ColorPickerDialog colorPickerDialog = new ColorPickerDialog(); ColorPickerDialog colorPickerDialog = new ColorPickerDialog();
colorPickerDialog.initialize(R.string.title_account_color, colors, color, 4, colors.length); colorPickerDialog.initialize(R.string.title_account_color, colors, color, 4, colors.length);

11
app/src/main/java/eu/faircode/email/FragmentMessage.java
View File

@ -353,7 +353,7 @@ public class FragmentMessage extends FragmentEx {
grpHeader.setVisibility(View.GONE); grpHeader.setVisibility(View.GONE);
vSeparatorBody.setVisibility(View.GONE); vSeparatorBody.setVisibility(View.GONE);
fab.setVisibility(View.GONE); fab.hide();
grpThread.setVisibility(View.GONE); grpThread.setVisibility(View.GONE);
grpAddresses.setVisibility(View.GONE); grpAddresses.setVisibility(View.GONE);
@ -373,7 +373,7 @@ public class FragmentMessage extends FragmentEx {
grpHeader.setVisibility(View.VISIBLE); grpHeader.setVisibility(View.VISIBLE);
vSeparatorBody.setVisibility(View.VISIBLE); vSeparatorBody.setVisibility(View.VISIBLE);
fab.setVisibility(View.VISIBLE); fab.show();
RecyclerView.Adapter adapter = rvAttachment.getAdapter(); RecyclerView.Adapter adapter = rvAttachment.getAdapter();
@ -425,7 +425,7 @@ public class FragmentMessage extends FragmentEx {
bottom_navigation.setVisibility(View.GONE); bottom_navigation.setVisibility(View.GONE);
grpThread.setVisibility(View.GONE); grpThread.setVisibility(View.GONE);
grpError.setVisibility(View.GONE); grpError.setVisibility(View.GONE);
fab.setVisibility(View.GONE); fab.hide();
pbWait.setVisibility(View.VISIBLE); pbWait.setVisibility(View.VISIBLE);
rvAttachment.setHasFixedSize(false); rvAttachment.setHasFixedSize(false);
@ -1241,7 +1241,10 @@ public class FragmentMessage extends FragmentEx {
tvBody.setText(body); tvBody.setText(body);
btnImages.setVisibility(has_images && !show_images ? View.VISIBLE : View.GONE); btnImages.setVisibility(has_images && !show_images ? View.VISIBLE : View.GONE);
grpMessage.setVisibility(View.VISIBLE); grpMessage.setVisibility(View.VISIBLE);
fab.setVisibility(free ? View.GONE : View.VISIBLE); if (free)
fab.hide();
else
fab.show();
pbBody.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
} }
}; };

4
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -380,7 +380,7 @@ public class FragmentMessages extends FragmentEx {
tvNoEmail.setVisibility(View.GONE); tvNoEmail.setVisibility(View.GONE);
grpReady.setVisibility(View.GONE); grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE); pbWait.setVisibility(View.VISIBLE);
fab.setVisibility(View.GONE); fab.hide();
return view; return view;
} }
@ -494,7 +494,7 @@ public class FragmentMessages extends FragmentEx {
protected void onLoaded(Bundle args, Long account) { protected void onLoaded(Bundle args, Long account) {
if (account != null) { if (account != null) {
fab.setTag(account); fab.setTag(account);
fab.setVisibility(View.VISIBLE); fab.show();
} }
} }

2
app/src/main/res/layout/item_log.xml
View File

@ -13,7 +13,7 @@
android:text="12:34:56" android:text="12:34:56"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/ivEdit" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tvData" android:id="@+id/tvData"

2
colorpicker

@ -1 +1 @@
Subproject commit dc64bb476e4add2a3a042a3c426c4be0038f38e6 Subproject commit 48ef548ad518b1b09bf31443ade1d9ccafe8e24a