X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FBookmarksDatabaseViewActivity.java;h=a24e6948657b20642ab8cd22add9a41a18cfc5cd;hb=afe89bbfe094100ef11ead2e615c1df1bab1ec7d;hp=00bad900770f8f2feb1d43fc8b490ba49eab2fe3;hpb=c4ad9f457f41cbc86391e0099629cd94a235258a;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/BookmarksDatabaseViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/BookmarksDatabaseViewActivity.java
index 00bad900..a24e6948 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/BookmarksDatabaseViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/BookmarksDatabaseViewActivity.java
@@ -38,10 +38,10 @@ import android.widget.TextView;
 
 public class BookmarksDatabaseViewActivity extends AppCompatActivity {
     // `bookmarksDatabaseHandler` is used in `onCreate()` and `updateBookmarksListView()`.
-    BookmarksDatabaseHandler bookmarksDatabaseHandler;
+    private BookmarksDatabaseHandler bookmarksDatabaseHandler;
 
     // `bookmarksListView` is used in `onCreate()` and `updateBookmarksListView()`.
-    ListView bookmarksListView;
+    private ListView bookmarksListView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -77,7 +77,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity {
             @Override
             public View newView(Context context, Cursor cursor, ViewGroup parent) {
                 // Inflate the individual item layout.  `false` does not attach it to the root.
-                return getLayoutInflater().inflate(R.layout.bookmarks_database_view_linearlayout, parent, false);
+                return getLayoutInflater().inflate(R.layout.bookmarks_database_view_item_linearlayout, parent, false);
             }
 
             @Override
@@ -103,7 +103,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity {
                 bookmarkNameTextView.setText(bookmarkNameString);
                 // Make the font bold for folders.
                 if (isFolder) {
-                    // The first argument is `null` because we don't want to chage the font.
+                    // The first argument is `null` because we don't want to change the font.
                     bookmarkNameTextView.setTypeface(null, Typeface.BOLD);
                 } else {  // Reset the font to default.
                     bookmarkNameTextView.setTypeface(Typeface.DEFAULT);
@@ -116,12 +116,15 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity {
 
                 // Get the parent folder from the `Cursor` and display it in `bookmarkParentFolder`.
                 String bookmarkParentFolder = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHandler.PARENT_FOLDER));
+                ImageView parentFolderImageView = (ImageView) view.findViewById(R.id.bookmarks_database_view_parent_folder_icon);
                 TextView bookmarkParentFolderTextView = (TextView) view.findViewById(R.id.bookmarks_database_view_parent_folder);
                 // Make the folder name gray if it is the home folder.
                 if (bookmarkParentFolder.isEmpty()) {
+                    parentFolderImageView.setImageDrawable(ContextCompat.getDrawable(getApplicationContext(), R.drawable.folder_grey));
                     bookmarkParentFolderTextView.setText(R.string.home_folder);
-                    bookmarkParentFolderTextView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.grey));
+                    bookmarkParentFolderTextView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.grey_500));
                 } else {
+                    parentFolderImageView.setImageDrawable(ContextCompat.getDrawable(getApplicationContext(), R.drawable.folder_dark_blue));
                     bookmarkParentFolderTextView.setText(bookmarkParentFolder);
                     bookmarkParentFolderTextView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.black));
                 }