diff --git a/src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java index 0efde4b80d..ec98ff654e 100644 --- a/src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -49,7 +49,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.lang.ref.WeakReference; -import java.lang.reflect.Field; import java.util.ArrayList; @@ -81,10 +80,10 @@ public class LogHistoryActivity extends ToolbarActivity { if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); } - Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton); - Button sendHistoryButton = (Button) findViewById(R.id.sendLogHistoryButton); + Button deleteHistoryButton = findViewById(R.id.deleteLogHistoryButton); + Button sendHistoryButton = findViewById(R.id.sendLogHistoryButton); sendHistoryButton.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(), PorterDuff.Mode.SRC_ATOP); - TextView logTV = (TextView) findViewById(R.id.logTV); + TextView logTV = findViewById(R.id.logTV); deleteHistoryButton.setOnClickListener(new OnClickListener() { @@ -148,20 +147,8 @@ public class LogHistoryActivity extends ToolbarActivity { * Start activity for sending email with logs attached */ private void sendMail() { + String emailAddress = getString(R.string.mail_logger); - // For the moment we need to consider the possibility that setup.xml - // does not include the "mail_logger" entry. This block prevents that - // compilation fails in this case. - String emailAddress; - try { - Class stringClass = R.string.class; - Field mailLoggerField = stringClass.getField("mail_logger"); - int emailAddressId = (Integer) mailLoggerField.get(null); - emailAddress = getString(emailAddressId); - } catch (Exception e) { - emailAddress = ""; - } - ArrayList uris = new ArrayList<>(); // Convert from paths to Android friendly Parcelable Uri's diff --git a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java b/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java index 7cb77e7e93..9b762bffc4 100644 --- a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java @@ -120,8 +120,8 @@ public class NotificationsActivity extends FileActivity { // setup toolbar setupToolbar(); - swipeEmptyListRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_containing_empty); - swipeListRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_containing_list); + swipeEmptyListRefreshLayout = findViewById(R.id.swipe_containing_empty); + swipeListRefreshLayout = findViewById(R.id.swipe_containing_list); // setup drawer setupDrawer(R.id.nav_notifications); @@ -236,7 +236,7 @@ public class NotificationsActivity extends FileActivity { recyclerView.setLayoutManager(layoutManager); recyclerView.addItemDecoration(dividerItemDecoration); - BottomNavigationView bottomNavigationView = (BottomNavigationView) findViewById(R.id.bottom_navigation_view); + BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view); if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) { bottomNavigationView.setVisibility(View.VISIBLE); @@ -344,7 +344,7 @@ public class NotificationsActivity extends FileActivity { } private void setLoadingMessage() { - emptyContentHeadline.setText(R.string.file_list_loading); + emptyContentHeadline.setText(R.string.notifications_loading_activity); emptyContentMessage.setText(""); emptyContentIcon.setVisibility(View.GONE); diff --git a/src/main/res/drawable-hdpi/folder_external.png b/src/main/res/drawable-hdpi/folder_external.png deleted file mode 100644 index c8528bbd44..0000000000 Binary files a/src/main/res/drawable-hdpi/folder_external.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_list_empty_home.png b/src/main/res/drawable-hdpi/ic_list_empty_home.png deleted file mode 100644 index 9de63e4b9a..0000000000 Binary files a/src/main/res/drawable-hdpi/ic_list_empty_home.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/folder_external.png b/src/main/res/drawable-mdpi/folder_external.png deleted file mode 100644 index 11df4216d0..0000000000 Binary files a/src/main/res/drawable-mdpi/folder_external.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_list_empty_home.png b/src/main/res/drawable-mdpi/ic_list_empty_home.png deleted file mode 100644 index 24ebf9d294..0000000000 Binary files a/src/main/res/drawable-mdpi/ic_list_empty_home.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/folder_external.png b/src/main/res/drawable-xhdpi/folder_external.png deleted file mode 100644 index 0c1120791b..0000000000 Binary files a/src/main/res/drawable-xhdpi/folder_external.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_list_empty_home.png b/src/main/res/drawable-xhdpi/ic_list_empty_home.png deleted file mode 100644 index a244aed1f6..0000000000 Binary files a/src/main/res/drawable-xhdpi/ic_list_empty_home.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/folder_external.png b/src/main/res/drawable-xxhdpi/folder_external.png deleted file mode 100644 index 85935b8846..0000000000 Binary files a/src/main/res/drawable-xxhdpi/folder_external.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_list_empty_home.png b/src/main/res/drawable-xxhdpi/ic_list_empty_home.png deleted file mode 100644 index 5e0e160d9c..0000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_list_empty_home.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_list_empty_home.png b/src/main/res/drawable-xxxhdpi/ic_list_empty_home.png deleted file mode 100644 index bee7a19c84..0000000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_list_empty_home.png and /dev/null differ diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5ec09ba6a6..f695d41dd1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -110,9 +110,7 @@ Your search returned no photos. Upload some videos or activate auto upload. Your search returned no videos. - , No uploads available - Upload some content or activate instant uploading. Upload some content or activate auto upload. folder Tap on a file to display additional information. diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index d8e73317b5..48a35de7f4 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -18,8 +18,6 @@ along with this program. If not, see . --> - - - - #777777 - #000000 -