mirror
/
ariane
mirror of https://git.sr.ht/~oppen/ariane
1
0
Fork 0
Code Issues Releases Wiki Activity

fix headings

This commit is contained in:
Öppen 2020-08-15 21:44:57 +01:00
parent 3ee7431485
commit 0ee7300da2
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/oppen/tva/io/history/Tab.kt
View File

@ -23,16 +23,4 @@ class Tab(val index: Int) {
}
}
}
fun popHistory(){
history.dropLast(1)
}
companion object{
fun new(index: Int, address: String): Tab {
val tab = Tab(index)
tab.add(address)
return tab
}
}
}

8
app/src/main/java/oppen/tva/ui/TvaActivity.kt
View File

@ -59,8 +59,12 @@ class TvaActivity : AppCompatActivity() {
}
private fun renderGemtext(state: TvaState.GeminiResponse) = runOnUiThread {
binding.addressEdit.setText(state.uri.toString())
adapter.render(state.lines)
if(state.header.startsWith("2") && state.header.contains("text/gemini")) {
binding.addressEdit.setText(state.uri.toString())
adapter.render(state.lines)
}else{
println("Server returned an error - or non gemtext mimetype: ${state.header}")
}
}
@ExperimentalStdlibApi

10
app/src/main/java/oppen/tva/ui/gemtext/GemtextAdapter.kt
View File

@ -39,8 +39,8 @@ class GemtextAdapter(val onLink: (link: URI) -> Unit): RecyclerView.Adapter<Gemt
return when(viewType){
typeText -> ViewHolder.Text( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
typeH1 -> ViewHolder.H1( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h1, parent, false) )
typeH2 -> ViewHolder.H1( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h2, parent, false) )
typeH3 -> ViewHolder.H1( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h3, parent, false) )
typeH2 -> ViewHolder.H2( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h2, parent, false) )
typeH3 -> ViewHolder.H3( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h3, parent, false) )
typeListItem -> ViewHolder.ListItem( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
typeLink -> ViewHolder.Link( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_link, parent, false) )
else -> ViewHolder.Text( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
@ -66,9 +66,9 @@ class GemtextAdapter(val onLink: (link: URI) -> Unit): RecyclerView.Adapter<Gemt
when(holder){
is ViewHolder.Text -> holder.itemView.gemtext_text_textview.text = line
is ViewHolder.H1 -> holder.itemView.gemtext_text_textview.text = line.substring(2)
is ViewHolder.H2 -> holder.itemView.gemtext_text_textview.text = line.substring(3)
is ViewHolder.H3 -> holder.itemView.gemtext_text_textview.text = line.substring(4)
is ViewHolder.H1 -> holder.itemView.gemtext_text_textview.text = line.substring(2).trim()
is ViewHolder.H2 -> holder.itemView.gemtext_text_textview.text = line.substring(3).trim()
is ViewHolder.H3 -> holder.itemView.gemtext_text_textview.text = line.substring(4).trim()
is ViewHolder.ListItem -> holder.itemView.gemtext_text_textview.text = "• ${line.substring(1)}".trim()
is ViewHolder.Link -> {
println("Tva: link: $line")