Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

- kotlin 1.2.30 

- support library 27.1.0
- サムネイルをクロップしない設定を使った時の背景(白テーマ、黒テーマ)を半透明にした
This commit is contained in:
tateisu 2018-03-07 07:28:41 +09:00
parent eb97568e69
commit 46ea96f591
11 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apng_sample/build.gradle
View File

@ -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'

10
app/build.gradle
View File

@ -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'

2
app/src/main/java/jp/juggler/subwaytooter/ItemListAdapter.kt
View File

@ -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)

9
app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
View File

@ -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

7
app/src/main/res/drawable/bg_thumbnail.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorRippleEffect"
>
<item android:drawable="?attr/colorThumbnailBackground"/>
</ripple>

3
app/src/main/res/values/attrs.xml
View File

@ -70,6 +70,9 @@
<!-- カラムストリップの背景色 -->
<attr name="colorColumnStripBackground" format="color"/>
<!-- サムネイルの背景色 -->
<attr name="colorThumbnailBackground" format="color"/>
<attr name="btn_attachment" format="reference" />
<attr name="btn_boost" format="reference" />
<attr name="btn_close" format="reference" />

3
app/src/main/res/values/colors.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="Light_colorThumbnailBackground">#20000000</color>
<color name="Light_colorColumnListItemText">#80000000</color>
<color name="Light_colorTimeSmall">#80000000</color>
<color name="Light_colorColumnHeaderAcct">#80000000</color>
@ -30,7 +31,6 @@
<color name="Light_colorBackground">#fff</color>
<color name="Light_colorColumnStripBackground">#fff</color>
<color name="Light_colorPrimaryDark">#303030</color> <!-- ステータスバー背景 -->
<!-- 以下は白テーマでも黒テーマでもだいたい同じ -->
@ -46,6 +46,7 @@
<!-- Dark theme -->
<color name="Dark_colorThumbnailBackground">#20ffffff</color>
<color name="Dark_colorColumnListItemText">#66FFFFFF</color>
<color name="Dark_colorTimeSmall">#66FFFFFF</color>
<color name="Dark_colorColumnHeaderAcct">#66FFFFFF</color>

4
app/src/main/res/values/styles.xml
View File

@ -26,6 +26,7 @@
<item name="colorColumnListDragHandleBackground">
@color/Light_colorColumnListDragHandleBackground
</item>
<item name="colorThumbnailBackground">@color/Light_colorThumbnailBackground</item>
<item name="colorColumnListItemText">@color/Light_colorColumnListItemText</item>
<item name="colorTimeSmall">@color/Light_colorTimeSmall</item>
<item name="colorProfileBackgroundMask">@color/Light_colorProfileBackgroundMask</item>
@ -140,6 +141,8 @@
<item name="colorColumnListDragHandleBackground">
@color/Dark_colorColumnListDragHandleBackground
</item>
<item name="colorThumbnailBackground">@color/Dark_colorThumbnailBackground</item>
<item name="colorColumnListItemText">@color/Dark_colorColumnListItemText</item>
<item name="colorTimeSmall">@color/Dark_colorTimeSmall</item>
<item name="colorProfileBackgroundMask">@color/Dark_colorProfileBackgroundMask</item>
@ -219,6 +222,7 @@
<item name="ic_right">@drawable/ic_right_dark</item>
<item name="ic_volume_up">@drawable/ic_volume_up_dark</item>
<item name="ic_face">@drawable/ic_face_dark</item>
</style>
<style name="AppTheme.Dark.NoActionBar" parent="AppTheme.Dark">

2
build.gradle
View File

@ -1,6 +1,6 @@
buildscript {
ext.kotlin_version = '1.2.21'
ext.kotlin_version = '1.2.30'
ext.kotlin_coroutines_version = '0.21.2'
ext.anko_version='0.10.4'

2
colorpicker/build.gradle
View File

@ -16,7 +16,7 @@ android {
}
dependencies {
compile 'com.android.support:appcompat-v7:27.0.2'
compile 'com.android.support:appcompat-v7:27.1.0'
}
//apply plugin: 'com.getkeepsafe.dexcount'

2
emoji/build.gradle
View File

@ -27,7 +27,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
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'