diff --git a/app/src/main/java/corewala/buran/ui/GemActivity.kt b/app/src/main/java/corewala/buran/ui/GemActivity.kt index 69633b5..7e7903c 100644 --- a/app/src/main/java/corewala/buran/ui/GemActivity.kt +++ b/app/src/main/java/corewala/buran/ui/GemActivity.kt @@ -46,7 +46,6 @@ import corewala.buran.ui.bookmarks.BookmarksDialog import corewala.buran.ui.content_image.ImageDialog import corewala.buran.ui.content_text.TextDialog import corewala.buran.ui.gemtext_adapter.AbstractGemtextAdapter -import corewala.buran.ui.modals_menus.about.AboutDialog import corewala.buran.ui.modals_menus.history.HistoryDialog import corewala.buran.ui.modals_menus.overflow.OverflowPopup import corewala.buran.ui.settings.SettingsActivity @@ -282,7 +281,7 @@ class GemActivity : AppCompatActivity() { ) { historyAddress -> gemRequest(historyAddress) } - R.id.overflow_menu_about -> AboutDialog.show(this) + R.id.overflow_menu_about -> gemRequest("") R.id.overflow_menu_settings -> { startActivity(Intent(this, SettingsActivity::class.java)) } @@ -840,13 +839,23 @@ class GemActivity : AppCompatActivity() { loadingView(false) binding.pullToRefresh.isRefreshing = false - val searchbase = prefs.getString( - "search_base", - Buran.DEFAULT_SEARCH_BASE - ) - val searchLink = "=> $searchbase ${getString(R.string.search)}" val title = "# ${getString(R.string.app_name)}" - adapter.render(listOf(title, searchLink)) + val sourceLink = "=> https://github.com/Corewala/Buran ${getString(R.string.source)}" + adapter.render(listOf( + title, + "", + getString(R.string.about_body), + "", + getString(R.string.about_ariane_source), + "", + getString(R.string.about_font), + "", + getString(R.string.about_glyphs), + "", + sourceLink, + getString(R.string.copyright) + )) + omniTerm.set("") } private fun isHostSigned(uri: URI): Boolean{ diff --git a/app/src/main/java/corewala/buran/ui/modals_menus/about/AboutDialog.kt b/app/src/main/java/corewala/buran/ui/modals_menus/about/AboutDialog.kt deleted file mode 100644 index fd29686..0000000 --- a/app/src/main/java/corewala/buran/ui/modals_menus/about/AboutDialog.kt +++ /dev/null @@ -1,45 +0,0 @@ -package corewala.buran.ui.modals_menus.about - -import android.content.Context -import android.content.Intent -import android.net.Uri -import android.os.Handler -import android.os.Looper -import android.view.View -import androidx.appcompat.app.AppCompatDialog -import androidx.appcompat.widget.AppCompatTextView -import kotlinx.android.synthetic.main.dialog_about.view.* -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch -import corewala.buran.R -import kotlinx.android.synthetic.main.dialog_content_text.view.* -import java.lang.StringBuilder -import java.security.SecureRandom -import java.security.Security -import javax.net.ssl.SSLContext -import javax.net.ssl.SSLSocket -import javax.net.ssl.SSLSocketFactory - -object AboutDialog { - - fun show(context: Context){ - val dialog = AppCompatDialog(context, R.style.AppTheme) - - val view = View.inflate(context, R.layout.dialog_about, null) - dialog.setContentView(view) - - view.about_toolbar.setNavigationIcon(R.drawable.vector_close) - view.about_toolbar.setNavigationOnClickListener { - dialog.dismiss() - } - - view.source_button.setOnClickListener { - context.startActivity(Intent(Intent.ACTION_VIEW).apply { - data = Uri.parse("https://github.com/Corewala/Buran") - }) - } - - dialog.show() - } - -} \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml deleted file mode 100644 index 75ec471..0000000 --- a/app/src/main/res/layout/dialog_about.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index dbd1258..ec2973b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -11,11 +11,12 @@ Partager Choisir comme Accueil Paramètres - Bourane: Un navigateur minimaliste pour le protocole Gemini par Corewala + Un navigateur minimaliste pour le protocole Gemini par Corewala Copyright © 2022 Corewala Bourane est basé sur le navigateur Ariane d\'ÖLAB sous la Licence Publique de l\'Union Européenne Les blocs de code sont rendus avec JetBrains Mono de JetBrains Les glyphes utilisés proviennent de Material Icons par Google + Source Vider le cache d\'exécution Historique Vider l\'historique diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df40160..0458cfc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,11 +11,12 @@ Share Set Home Settings - Buran: A simple Gemini protocol browser from Corewala + A simple Gemini protocol browser from Corewala Copyright © 2022 Corewala Buran is based on the Ariane browser by ÖLAB under the European Union Public Licence Code blocks are rendered using JetBrains Mono by JetBrains Glyphs used are from Material Icons by Google + Source Clear runtime cache History Clear history