-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1944 from pantasystem/feature/unuse-recyclerview-…
…url-preview OGPの表示や画像や動画を除くファイルの表示にRecyclerViewを使用するのをやめた
- Loading branch information
Showing
14 changed files
with
367 additions
and
336 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
modules/features/note/src/main/java/net/pantasystem/milktea/note/url/OtherFileView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package net.pantasystem.milktea.note.url | ||
|
||
import android.content.Context | ||
import android.util.AttributeSet | ||
import android.widget.ImageView | ||
import android.widget.TextView | ||
import androidx.constraintlayout.widget.ConstraintLayout | ||
import net.pantasystem.milktea.model.file.FilePreviewSource | ||
import net.pantasystem.milktea.note.R | ||
import net.pantasystem.milktea.note.R.layout | ||
import net.pantasystem.milktea.note.url.UrlPreviewHelper.setUrlPreviewThumbnail | ||
|
||
class OtherFileView @JvmOverloads constructor( | ||
context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 | ||
) : ConstraintLayout( | ||
context, attrs, defStyleAttr | ||
) { | ||
|
||
private val fileThumbnailView: ImageView | ||
private val fileNameView: TextView | ||
private val fileTypeView: TextView | ||
init { | ||
inflate(context, layout.view_other_file, this) | ||
fileThumbnailView = findViewById(R.id.fileThumbnailView) | ||
fileNameView = findViewById(R.id.fileNameView) | ||
fileTypeView = findViewById(R.id.fileTypeView) | ||
} | ||
|
||
fun setOtherFile(otherFile: FilePreviewSource) { | ||
fileThumbnailView.setUrlPreviewThumbnail(otherFile.thumbnailUrl) | ||
fileNameView.text = otherFile.name | ||
fileTypeView.text = otherFile.type | ||
} | ||
} |
146 changes: 0 additions & 146 deletions
146
modules/features/note/src/main/java/net/pantasystem/milktea/note/url/PreviewListAdapter.kt
This file was deleted.
Oops, something went wrong.
101 changes: 87 additions & 14 deletions
101
modules/features/note/src/main/java/net/pantasystem/milktea/note/url/UrlPreviewHelper.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
modules/features/note/src/main/java/net/pantasystem/milktea/note/url/UrlPreviewView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package net.pantasystem.milktea.note.url | ||
|
||
import android.content.Context | ||
import android.util.AttributeSet | ||
import android.widget.ImageView | ||
import android.widget.TextView | ||
import androidx.constraintlayout.widget.ConstraintLayout | ||
import net.pantasystem.milktea.common_android.ui.CircleOutlineHelper.setCircleOutline | ||
import net.pantasystem.milktea.model.url.UrlPreview | ||
import net.pantasystem.milktea.note.R | ||
import net.pantasystem.milktea.note.url.UrlPreviewHelper.setSiteIcon | ||
import net.pantasystem.milktea.note.url.UrlPreviewHelper.setUrlPreviewThumbnail | ||
|
||
class UrlPreviewView @JvmOverloads constructor( | ||
context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 | ||
): ConstraintLayout( | ||
context, attrs, defStyleAttr | ||
) { | ||
|
||
private val siteThumbnailView: ImageView | ||
private val siteTitleView: TextView | ||
private val siteDescription: TextView | ||
private val siteIconView: ImageView | ||
private val siteNameView: TextView | ||
|
||
init { | ||
inflate(context, R.layout.view_url_preview, this) | ||
siteThumbnailView = findViewById(R.id.siteThumbnailView) | ||
siteTitleView = findViewById(R.id.siteTitleView) | ||
siteDescription = findViewById(R.id.siteDescription) | ||
siteIconView = findViewById(R.id.siteIconView) | ||
siteNameView = findViewById(R.id.siteNameView) | ||
this.setCircleOutline(7) | ||
} | ||
|
||
fun setUrlPreview(urlPreview: UrlPreview) { | ||
siteThumbnailView.setUrlPreviewThumbnail(urlPreview.thumbnail) | ||
siteTitleView.text = urlPreview.title | ||
siteDescription.text = urlPreview.description | ||
siteIconView.setSiteIcon(urlPreview.icon) | ||
siteNameView.text = urlPreview.siteName | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.