diff --git a/apng_sample/build.gradle b/apng_sample/build.gradle index d6e72565..7c52b339 100644 --- a/apng_sample/build.gradle +++ b/apng_sample/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation project(':apng_android') - implementation 'com.android.support:appcompat-v7:27.0.2' + implementation 'com.android.support:appcompat-v7:27.1.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' diff --git a/app/build.gradle b/app/build.gradle index a84be9c7..6133e919 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,11 +69,11 @@ dependencies { implementation project(':emoji') implementation project(':apng_android') - compile 'com.android.support:support-v4:27.0.2' - compile 'com.android.support:appcompat-v7:27.0.2' - compile 'com.android.support:design:27.0.2' - compile 'com.android.support:customtabs:27.0.2' - compile 'com.android.support:support-v13:27.0.2' + compile 'com.android.support:support-v4:27.1.0' + compile 'com.android.support:appcompat-v7:27.1.0' + compile 'com.android.support:design:27.1.0' + compile 'com.android.support:customtabs:27.1.0' + compile 'com.android.support:support-v13:27.1.0' compile 'com.google.firebase:firebase-core:11.8.0' compile 'com.google.firebase:firebase-messaging:11.8.0' diff --git a/app/src/main/java/jp/juggler/subwaytooter/ItemListAdapter.kt b/app/src/main/java/jp/juggler/subwaytooter/ItemListAdapter.kt index ed4402a3..72d171d4 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ItemListAdapter.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ItemListAdapter.kt @@ -81,7 +81,7 @@ internal class ItemListAdapter( return headerType.viewType } - override fun onCreateViewHolder(parent : ViewGroup?, viewType : Int) : RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent : ViewGroup, viewType : Int) : RecyclerView.ViewHolder { when(viewType) { 0 -> { val holder = ItemViewHolder(activity) diff --git a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt index d768b1e8..1c56aa4f 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt @@ -1453,9 +1453,10 @@ internal class ItemViewHolder( ivMedia1 = myNetworkImageView { + background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_ddd + R.drawable.bg_thumbnail ) contentDescription = context.getString(R.string.thumbnail) scaleType = ImageView.ScaleType.CENTER_CROP @@ -1468,7 +1469,7 @@ internal class ItemViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_ddd + R.drawable.bg_thumbnail ) contentDescription = context.getString(R.string.thumbnail) scaleType = ImageView.ScaleType.CENTER_CROP @@ -1482,7 +1483,7 @@ internal class ItemViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_ddd + R.drawable.bg_thumbnail ) contentDescription = context.getString(R.string.thumbnail) scaleType = ImageView.ScaleType.CENTER_CROP @@ -1496,7 +1497,7 @@ internal class ItemViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_ddd + R.drawable.bg_thumbnail ) contentDescription = context.getString(R.string.thumbnail) scaleType = ImageView.ScaleType.CENTER_CROP diff --git a/app/src/main/res/drawable/bg_thumbnail.xml b/app/src/main/res/drawable/bg_thumbnail.xml new file mode 100644 index 00000000..ac59f2d3 --- /dev/null +++ b/app/src/main/res/drawable/bg_thumbnail.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 5fe4df6b..30cebff1 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -70,6 +70,9 @@ + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d1da0141..a6a5b14e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,5 +1,6 @@ + #20000000 #80000000 #80000000 #80000000 @@ -30,7 +31,6 @@ #fff #fff - #303030 @@ -46,6 +46,7 @@ + #20ffffff #66FFFFFF #66FFFFFF #66FFFFFF diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5566a7b6..0feea2b6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -26,6 +26,7 @@ @color/Light_colorColumnListDragHandleBackground + @color/Light_colorThumbnailBackground @color/Light_colorColumnListItemText @color/Light_colorTimeSmall @color/Light_colorProfileBackgroundMask @@ -140,6 +141,8 @@ @color/Dark_colorColumnListDragHandleBackground + @color/Dark_colorThumbnailBackground + @color/Dark_colorColumnListItemText @color/Dark_colorTimeSmall @color/Dark_colorProfileBackgroundMask @@ -219,6 +222,7 @@ @drawable/ic_right_dark @drawable/ic_volume_up_dark @drawable/ic_face_dark +