Fixed UI problems introduced by dark theme.

16 files changed, 27 insertions, 35 deletions

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/NetworkComponent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java
index 4615898b..99a5ff3f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/NetworkComponent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java
@@ -5,8 +5,8 @@ import javax.inject.Singleton;
 import dagger.Component;
 
 @Singleton
-@Component(modules = NetworkModule.class)
-interface NetworkComponent {
+@Component(modules = AppModule.class)
+interface AppComponent {
     void inject(MainActivity mainActivity);
     void inject(LoginActivity loginActivity);
     void inject(PostFragment postFragment);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/NetworkModule.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AppModule.java
index d97929ac..baa2a396 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/NetworkModule.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AppModule.java
@@ -14,10 +14,10 @@ import retrofit2.Retrofit;
 import retrofit2.converter.scalars.ScalarsConverterFactory;
 
 @Module
-class NetworkModule {
+class AppModule {
     Application mApplication;
 
-    public NetworkModule(Application application) {
+    public AppModule(Application application) {
         mApplication = application;
     }
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentMultiLevelRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentMultiLevelRecyclerViewAdapter.java
index e9f29f3c..6191b334 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentMultiLevelRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentMultiLevelRecyclerViewAdapter.java
@@ -79,11 +79,11 @@ class CommentMultiLevelRecyclerViewAdapter extends MultiLevelAdapter {
 
         ((CommentViewHolder) holder).commentTimeTextView.setText(commentItem.getCommentTime());
         SpannableConfiguration spannableConfiguration = SpannableConfiguration.builder(mContext).linkResolver((view, link) -> {
-            if (link.startsWith("/u/")) {
+            if (link.startsWith("/u/") || link.startsWith("u/")) {
                 Intent intent = new Intent(mContext, ViewUserDetailActivity.class);
                 intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, link.substring(3));
                 mContext.startActivity(intent);
-            } else if (link.startsWith("/r/")) {
+            } else if (link.startsWith("/r/") || link.startsWith("r/")) {
                 Intent intent = new Intent(mContext, ViewSubredditDetailActivity.class);
                 intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, link.substring(3));
                 mContext.startActivity(intent);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java
index 1309bfdb..8137355b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java
@@ -3,18 +3,18 @@ package ml.docilealligator.infinityforreddit;
 import android.app.Application;
 
 public class Infinity extends Application {
-    private NetworkComponent mNetworkComponent;
+    private AppComponent mAppComponent;
 
     @Override
     public void onCreate() {
         super.onCreate();
 
-        mNetworkComponent = DaggerNetworkComponent.builder()
-                .networkModule(new NetworkModule(this))
+        mAppComponent = DaggerAppComponent.builder()
+                .appModule(new AppModule(this))
                 .build();
     }
 
-    public NetworkComponent getmNetworkComponent() {
-        return mNetworkComponent;
+    public AppComponent getmAppComponent() {
+        return mAppComponent;
     }
 }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/LoginActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/LoginActivity.java
index 063148f1..53b0e143 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/LoginActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/LoginActivity.java
@@ -41,7 +41,7 @@ public class LoginActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
 
-        ((Infinity) getApplication()).getmNetworkComponent().inject(this);
+        ((Infinity) getApplication()).getmAppComponent().inject(this);
 
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java
index 1989a47d..012c1503 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java
@@ -98,7 +98,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
         ButterKnife.bind(this);
 
-        ((Infinity) getApplication()).getmNetworkComponent().inject(this);
+        ((Infinity) getApplication()).getmAppComponent().inject(this);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java
index de03f164..4d9cd3c7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java
@@ -83,7 +83,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
         // Inflate the layout for this fragment
         View rootView = inflater.inflate(R.layout.fragment_post, container, false);
 
-        ((Infinity) getActivity().getApplication()).getmNetworkComponent().inject(this);
+        ((Infinity) getActivity().getApplication()).getmAppComponent().inject(this);
 
         ButterKnife.bind(this, rootView);
 
@@ -91,14 +91,6 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
 
         mLinearLayoutManager = new LinearLayoutManager(getActivity());
         mPostRecyclerView.setLayoutManager(mLinearLayoutManager);
-        /*FloatingActionButton fab = rootView.findViewById(R.id.fab_post_fragment);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });*/
 
         mPostType = getArguments().getInt(POST_TYPE_KEY);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java
index 717df7de..b04c10ef 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java
@@ -238,7 +238,7 @@ class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView.ViewHo
                                 .into(((DataViewHolder) holder).subredditIconGifImageView);
                     }
 
-                    ((DataViewHolder) holder).subredditNameTextView.setTextColor(mContext.getResources().getColor(R.color.colorPrimaryDark));
+                    ((DataViewHolder) holder).subredditNameTextView.setTextColor(mContext.getResources().getColor(R.color.textColorPrimaryDark));
                     ((DataViewHolder) holder).subredditNameTextView.setText(author);
 
                     ((DataViewHolder) holder).subredditIconNameLinearLayout.setOnClickListener(view -> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingFragment.java
index c109d767..1972be71 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingFragment.java
@@ -69,7 +69,7 @@ public class SubredditListingFragment extends Fragment implements FragmentCommun
         // Inflate the layout for this fragment
         View rootView = inflater.inflate(R.layout.fragment_subreddit_listing, container, false);
 
-        ((Infinity) getActivity().getApplication()).getmNetworkComponent().inject(this);
+        ((Infinity) getActivity().getApplication()).getmAppComponent().inject(this);
 
         ButterKnife.bind(this, rootView);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingFragment.java
index 832b5140..78153fdc 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingFragment.java
@@ -76,7 +76,7 @@ public class UserListingFragment extends Fragment implements FragmentCommunicato
         // Inflate the layout for this fragment
         View rootView = inflater.inflate(R.layout.fragment_user_listing, container, false);
 
-        ((Infinity) getActivity().getApplication()).getmNetworkComponent().inject(this);
+        ((Infinity) getActivity().getApplication()).getmAppComponent().inject(this);
 
         ButterKnife.bind(this, rootView);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
index 8b91b53b..bd57cd48 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
@@ -133,7 +133,7 @@ public class ViewPostDetailActivity extends AppCompatActivity {
 
         EventBus.getDefault().register(this);
 
-        ((Infinity) getApplication()).getmNetworkComponent().inject(this);
+        ((Infinity) getApplication()).getmAppComponent().inject(this);
 
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -557,11 +557,11 @@ public class ViewPostDetailActivity extends AppCompatActivity {
 
     private SpannableConfiguration getCustomSpannableConfiguration() {
         return SpannableConfiguration.builder(this).linkResolver((view, link) -> {
-            if(link.startsWith("/u/")) {
+            if(link.startsWith("/u/") || link.startsWith("u/")) {
                 Intent intent = new Intent(ViewPostDetailActivity.this, ViewUserDetailActivity.class);
                 intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, link.substring(3));
                 startActivity(intent);
-            } else if(link.startsWith("/r/")) {
+            } else if(link.startsWith("/r/") || link.startsWith("r/")) {
                 Intent intent = new Intent(ViewPostDetailActivity.this, ViewSubredditDetailActivity.class);
                 intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, link.substring(3));
                 startActivity(intent);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java
index 3178a507..d0e45c08 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java
@@ -79,7 +79,7 @@ public class ViewSubredditDetailActivity extends AppCompatActivity {
         setContentView(R.layout.activity_view_subreddit_detail);
         ButterKnife.bind(this);
 
-        ((Infinity) getApplication()).getmNetworkComponent().inject(this);
+        ((Infinity) getApplication()).getmAppComponent().inject(this);
 
         //Get status bar height
         int statusBarHeight = 0;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
index 0fb312fb..a55eb6c0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
@@ -76,7 +76,7 @@ public class ViewUserDetailActivity extends AppCompatActivity {
 
         ButterKnife.bind(this);
 
-        ((Infinity) getApplication()).getmNetworkComponent().inject(this);
+        ((Infinity) getApplication()).getmAppComponent().inject(this);
 
         //Get status bar height
         int statusBarHeight = 0;
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 8f1beb79..6f09b7e7 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -50,7 +50,7 @@
                 android:layout_height="24dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
-                android:tint="@color/textColorPrimaryDark"
+                android:tint="@color/backgroundColorPrimaryDark"
                 android:visibility="gone"
                 app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_linear_layout_view_item_best_post"
                 app:layout_constraintEnd_toStartOf="@+id/post_time_text_view_best_post_item"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 8e2257d5..6b6e8290 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#242424</color>
-    <color name="colorPrimaryDark">#141414</color>
+    <color name="colorPrimaryDark">#121212</color>
     <color name="colorAccent">#FF4081</color>
 
     <color name="minusButtonColor">#E91E63</color>
@@ -20,7 +20,7 @@
 
     <color name="grey">#424242</color>
 
-    <color name="backgroundColor">#181818</color>
+    <color name="backgroundColor">#121212</color>
 
-    <color name="backgroundColorPrimaryDark">#1976D2</color>
+    <color name="backgroundColorPrimaryDark">#1565C0</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a4943718..1112f7b3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,7 +14,7 @@
 
     <color name="textColorPrimaryDark">@color/colorPrimaryDark</color>
 
-    <color name="circularProgressBarBackground">#242424</color>
+    <color name="circularProgressBarBackground">#FFFFFF</color>
 
     <color name="dividerColor">#E0E0E0</color>