From ef8daed5714cd02f57774c86aab6bd0ca454fcb7 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Tue, 11 Jun 2019 19:59:23 +0800 Subject: [PATCH] Minor layout tweaks. Fixed action bar color in ViewPostDetailActivity in dark mode. --- .idea/caches/build_file_checksums.ser | Bin 533 -> 533 bytes .idea/caches/gradle_models.ser | Bin 252331 -> 254950 bytes app/build.gradle | 12 ++++++------ .../ViewPostDetailActivity.java | 15 ++++++++++++++- .../res/layout/activity_view_post_detail.xml | 11 ++++++++++- build.gradle | 4 ++-- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index efad9a6027f475ffdb824859933d8c1eb24d6d72..10211a734a8745ddab7c060421d3bc6d077d521b 100644 GIT binary patch delta 53 zcmV-50LuTB1eFAkm;^>NQJayRpAbJ2mcn)-OcdladQb%OLgJH40l5(q>ceOA^i%hj LUa2%e5mID$KR*_e delta 53 zcmV-50LuTB1eFAkm;@>KMPreipAe}2%$A7Aug^M99R$6KOoEe30l5(p<&?)z2sqIX L94!l|@rs>zgiaTb diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index a512f6ba23ef1278319cb39a1d2b375dc010db79..df82cf06a79722baea4cf09a93cf1f96629c4ed9 100644 GIT binary patch delta 42307 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 QJ=v{D%g>bA@`UOC2PdLd)c^nh delta 40971 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 Y+ia<8?BGcyEK5C!^DE^A*+2XL08r^!SO5S3 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 @@ + +