From 7109915e6ed794040b08a18c6cc85fd69d8e329c Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Thu, 24 Mar 2016 17:43:35 +0100 Subject: [PATCH] Minor refactoring (lint) --- app/build.gradle | 10 +++++++--- .../at/bitfire/davdroid/ui/AboutActivity.java | 4 +++- .../davdroid/ui/AccountSettingsActivity.java | 3 +-- .../ui/setup/AccountDetailsFragment.java | 2 +- .../ui/setup/DetectConfigurationFragment.java | 2 +- .../bitfire/davdroid/ui/setup/LoginActivity.java | 3 +-- app/src/main/res/drawable/twitter.xml | 15 +++++++++++---- app/src/main/res/layout/about_component.xml | 3 +-- .../res/layout/activity_account_settings.xml | 13 ------------- app/src/main/res/layout/login_activity.xml | 15 --------------- .../res/layout/login_credentials_fragment.xml | 7 ++++--- app/src/main/res/layout/nav_header_accounts.xml | 6 ++++-- app/src/main/res/menu/activity_account.xml | 4 ++-- app/src/main/res/values/dimen.xml | 2 -- app/src/main/res/values/drawables.xml | 16 ---------------- app/src/main/res/values/strings.xml | 1 - app/src/main/res/values/styles.xml | 6 +----- 17 files changed, 37 insertions(+), 75 deletions(-) delete mode 100644 app/src/main/res/layout/activity_account_settings.xml delete mode 100644 app/src/main/res/layout/login_activity.xml delete mode 100644 app/src/main/res/values/drawables.xml diff --git a/app/build.gradle b/app/build.gradle index efa299b0..6bc99e55 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,14 +35,18 @@ android { lintOptions { disable 'ExtraTranslation' + disable 'GoogleAppIndexingWarning' // we don't need Google indexing, thanks + disable 'GradleDependency' + disable 'GradleDynamicVersion' disable 'IconColors' disable 'IconLauncherShape' disable 'IconMissingDensityFolder' - disable 'InconsistentLayout' - disable 'MergeRootFrame' + //disable 'InconsistentLayout' disable 'MissingTranslation' - disable 'OldTargetApi' + disable 'OldTargetApi' // Android 6 permission model not implemented yet + disable 'Recycle' // doesn't understand Lombok's @Cleanup disable 'RtlEnabled' + disable 'RtlHardcoded' disable 'Typos' } packagingOptions { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java index c81c2d8f..4afab33d 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java @@ -174,8 +174,10 @@ public class AboutActivity extends AppCompatActivity { public void onLoadFinished(Loader loader, Spanned license) { if (getView() != null) { TextView tv = (TextView)getView().findViewById(R.id.license_text); - if (tv != null) + if (tv != null) { + tv.setAutoLinkMask(Linkify.EMAIL_ADDRESSES | Linkify.WEB_URLS); tv.setText(license); + } } } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java index e1959d39..5a88c724 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java @@ -36,7 +36,6 @@ public class AccountSettingsActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_account_settings); account = getIntent().getParcelableExtra(EXTRA_ACCOUNT); setTitle(getString(R.string.settings_title, account.name)); @@ -45,7 +44,7 @@ public class AccountSettingsActivity extends AppCompatActivity { if (savedInstanceState == null) getSupportFragmentManager().beginTransaction() - .add(R.id.fragment, AccountSettingsFragment.instantiate(this, AccountSettingsFragment.class.getName(), getIntent().getExtras())) + .replace(android.R.id.content, AccountSettingsFragment.instantiate(this, AccountSettingsFragment.class.getName(), getIntent().getExtras())) .commit(); } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.java index f0bb2e3c..353d3488 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.java @@ -126,7 +126,7 @@ public class AccountDetailsFragment extends Fragment { ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 1); ContentResolver.setSyncAutomatically(account, CalendarContract.AUTHORITY, true); - // TODO check for tasks availability + // will only do something if OpenTasks is installed ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 1); ContentResolver.setSyncAutomatically(account, TaskProvider.ProviderName.OpenTasks.authority, true); } else { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java index f81fda0c..c1fbfa17 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java @@ -71,7 +71,7 @@ public class DetectConfigurationFragment extends DialogFragment implements Loade else // service found: continue getFragmentManager().beginTransaction() - .replace(R.id.fragment, AccountDetailsFragment.newInstance(data)) + .replace(android.R.id.content, AccountDetailsFragment.newInstance(data)) .addToBackStack(null) .commitAllowingStateLoss(); diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.java index dcd5866b..62193ad1 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.java @@ -22,12 +22,11 @@ public class LoginActivity extends AppCompatActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.login_activity); if (savedInstanceState == null) // first call, add fragment getSupportFragmentManager().beginTransaction() - .add(R.id.fragment, new LoginCredentialsFragment()) + .replace(android.R.id.content, new LoginCredentialsFragment()) .commit(); } diff --git a/app/src/main/res/drawable/twitter.xml b/app/src/main/res/drawable/twitter.xml index 5084ee6d..9fc528b6 100644 --- a/app/src/main/res/drawable/twitter.xml +++ b/app/src/main/res/drawable/twitter.xml @@ -1,13 +1,18 @@ - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/about_component.xml b/app/src/main/res/layout/about_component.xml index cf400b2d..1bd423b5 100644 --- a/app/src/main/res/layout/about_component.xml +++ b/app/src/main/res/layout/about_component.xml @@ -41,8 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginBottom="16dp" - android:layout_gravity="center_horizontal"/> + android:layout_marginBottom="16dp"/> - - - diff --git a/app/src/main/res/layout/login_activity.xml b/app/src/main/res/layout/login_activity.xml deleted file mode 100644 index 4150c46c..00000000 --- a/app/src/main/res/layout/login_activity.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/login_credentials_fragment.xml b/app/src/main/res/layout/login_credentials_fragment.xml index 1beac0e3..bbc04c56 100644 --- a/app/src/main/res/layout/login_credentials_fragment.xml +++ b/app/src/main/res/layout/login_credentials_fragment.xml @@ -8,6 +8,7 @@ --> @@ -18,7 +19,7 @@ android:focusable="true" android:focusableInTouchMode="true" android:contentDescription="@null" - android:importantForAccessibility="no"> + android:importantForAccessibility="no" tools:ignore="UnusedAttribute"> @@ -38,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/login_type_email" - android:paddingLeft="14dp" + android:paddingLeft="14dp" tools:ignore="RtlSymmetry" style="@style/login_type_headline"/> + android:src="@drawable/ic_launcher" + tools:ignore="ContentDescription"/> + android:text="@string/navigation_drawer_subtitle"/> diff --git a/app/src/main/res/menu/activity_account.xml b/app/src/main/res/menu/activity_account.xml index c9ffe890..8a7e428f 100644 --- a/app/src/main/res/menu/activity_account.xml +++ b/app/src/main/res/menu/activity_account.xml @@ -13,12 +13,12 @@ + app:showAsAction="ifRoom"/> + app:showAsAction="ifRoom"/> diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index f12e64c8..eaa1441a 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -8,8 +8,6 @@ --> - 320dp - 16dp 16dp diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml deleted file mode 100644 index 0af090f0..00000000 --- a/app/src/main/res/values/drawables.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - @android:drawable/ic_menu_camera - @android:drawable/ic_menu_gallery - @android:drawable/ic_menu_slideshow - @android:drawable/ic_menu_manage - @android:drawable/ic_menu_share - @android:drawable/ic_menu_send - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0e819ebb..256d5269 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,7 +15,6 @@ Manage accounts Please wait … Send - Skip Don\'t show again diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 71b5a830..b561269b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,9 +10,6 @@ - #039be5 - - #4caf50 #388e3c #aed581 @@ -22,7 +19,6 @@ #ffa726 #ff6d00 - #000000 #888888 #ebebeb #ffffff @@ -56,7 +52,7 @@