Minor layout tweaks. Fixed action bar color in ViewPostDetailActivity in dark mode.

6 files changed, 32 insertions, 10 deletions

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index efad9a60..10211a73 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index a512f6ba..df82cf06 100644
--- a/.idea/caches/gradle_models.ser
+++ b/.idea/caches/gradle_models.ser
diff --git a/app/build.gradle b/app/build.gradle
index 6fe85a03..ebe6c169 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "ml.docilealligator.infinityforreddit"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -33,14 +33,14 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
-    implementation 'com.google.android.material:material:1.1.0-alpha05'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha05'
+    implementation 'com.google.android.material:material:1.1.0-alpha07'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0-alpha04'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha04'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'com.google.android.exoplayer:exoplayer:2.9.6'
     implementation 'com.google.android.exoplayer:exoplayer-dash:2.9.6'
     implementation 'androidx.browser:browser:1.0.0'
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
index a982efab..2196b783 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.ColorFilter;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -19,6 +20,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -101,6 +103,7 @@ public class ViewPostDetailActivity extends AppCompatActivity {
     @BindView(R.id.gilded_number_text_view_view_post_detail) TextView mGildedNumberTextView;
     @BindView(R.id.crosspost_image_view_view_post_detail) ImageView mCrosspostImageView;
     @BindView(R.id.nsfw_text_view_view_post_detail) Chip mNSFWChip;
+    @BindView(R.id.link_text_view_view_post_detail) TextView linkTextView;
     @BindView(R.id.image_view_wrapper_view_post_detail) RelativeLayout mRelativeLayout;
 
     @BindView(R.id.load_wrapper_view_post_detail) RelativeLayout mLoadWrapper;
@@ -141,7 +144,9 @@ public class ViewPostDetailActivity extends AppCompatActivity {
 
         ((Infinity) getApplication()).getmAppComponent().inject(this);
 
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.colorPrimary)));
 
         mGlide = Glide.with(this);
         mLocale = getResources().getConfiguration().locale;
@@ -274,6 +279,10 @@ public class ViewPostDetailActivity extends AppCompatActivity {
             case Post.LINK_TYPE:
                 mTypeChip.setText("LINK");
 
+                linkTextView.setVisibility(View.VISIBLE);
+                String domain = Uri.parse(mPost.getUrl()).getHost();
+                linkTextView.setText(domain);
+
                 mImageView.setOnClickListener(view -> {
                     CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
                     // add share action to menu list
@@ -322,6 +331,10 @@ public class ViewPostDetailActivity extends AppCompatActivity {
             case Post.NO_PREVIEW_LINK_TYPE:
                 mTypeChip.setText("LINK");
 
+                linkTextView.setVisibility(View.VISIBLE);
+                String noPreviewLinkDomain = Uri.parse(mPost.getUrl()).getHost();
+                linkTextView.setText(noPreviewLinkDomain);
+
                 if(!mPost.getSelfText().equals("")) {
                     mContentMarkdownView.setVisibility(View.VISIBLE);
                     mContentMarkdownView.setMarkdown(getCustomSpannableConfiguration(), mPost.getSelfText());
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index b840e22e..f70949ce 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -101,7 +101,7 @@
                             android:id="@+id/type_text_view_view_post_detail"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp"
+                            android:layout_marginEnd="16dp"
                             android:textColor="@android:color/white"
                             android:layout_centerVertical="true"
                             app:chipBackgroundColor="@color/backgroundColorPrimaryDark"/>
@@ -152,6 +152,15 @@
 
                     </RelativeLayout>
 
+                    <TextView
+                        android:id="@+id/link_text_view_view_post_detail"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="16dp"
+                        android:textSize="12sp"
+                        android:visibility="gone"/>
+
                     <RelativeLayout
                         android:id="@+id/image_view_wrapper_view_post_detail"
                         android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index 92057a5e..c90ac9cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,6 +31,6 @@ task clean(type: Delete) {
 }
 
 ext {
-    roomVersion = '2.1.0-alpha06'
-    archLifecycleVersion = '2.1.0-alpha04'
+    roomVersion = '2.1.0-rc01'
+    archLifecycleVersion = '2.2.0-alpha01'
 }
\ No newline at end of file