From 38e3442cfdee125766202e18d155fbf360737d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96ppen?= Date: Thu, 10 Sep 2020 22:05:11 +0100 Subject: [PATCH] rename main package, add bookmark dialog complete --- .../{tva => gem}/ExampleInstrumentedTest.kt | 2 +- app/src/main/AndroidManifest.xml | 6 +- app/src/main/java/oppen/{tva => gem}/Gem.kt | 2 +- .../java/oppen/{tva => gem}/io/GemState.kt | 4 +- .../{tva => gem}/io/bookmarks/Bookmark.kt | 2 +- .../io/bookmarks/BookmarkEntity.kt | 2 +- .../{tva => gem}/io/bookmarks/BookmarksDB.kt | 2 +- .../{tva => gem}/io/bookmarks/BookmarksDao.kt | 2 +- .../io/bookmarks/BookmarksDatasource.kt | 2 +- .../io/bookmarks/RoomBookmarks.kt | 2 +- .../{tva => gem}/io/gemini/Datasource.kt | 4 +- .../io/gemini/DummyTrustManager.kt | 2 +- .../io/gemini/GeminiDatasource.kt | 6 +- .../{tva => gem}/io/gemini/GeminiResponse.kt | 6 +- .../{tva => gem}/io/gemini/GemtextHelper.kt | 2 +- .../{tva => gem}/io/gemini/RuntimeCache.kt | 2 +- .../io/history/uris/BasicURIHistory.kt | 2 +- .../io/history/uris/HistoryInterface.kt | 2 +- .../java/oppen/{tva => gem}/ui/GemActivity.kt | 56 +++++++++++-------- .../oppen/{tva => gem}/ui/GemViewModel.kt | 10 ++-- .../oppen/{tva => gem}/ui/GemtextAdapter.kt | 12 +++- .../ui/audio_player/AudioPlayer.kt | 12 ++-- .../oppen/gem/ui/bookmarks/BookmarkDialog.kt | 45 +++++++++++++++ .../ui/content_image/ImageDialog.kt | 6 +- .../ui/content_image/TouchImageView.java | 2 +- .../ui/content_text/TextDialog.kt | 6 +- .../{tva => gem}/ui/modals_menus/LinkPopup.kt | 4 +- .../ui/modals_menus/about/AboutDialog.kt | 6 +- .../ui/modals_menus/history/HistoryAdapter.kt | 4 +- .../ui/modals_menus/history/HistoryDialog.kt | 8 +-- .../ui/modals_menus/input/InputDialog.kt | 6 +- .../ui/modals_menus/overflow/OverflowPopup.kt | 7 +-- .../ui/modals_menus/set_home/SetHomeDialog.kt | 4 +- .../oppen/tva/ui/bookmarks/BookmarkDialog.kt | 30 ---------- app/src/main/res/drawable/vector_confirm.xml | 10 ++++ app/src/main/res/drawable/vector_home.xml | 27 ++------- app/src/main/res/layout/activity_gem.xml | 2 +- .../main/res/layout/dialog_content_image.xml | 2 +- .../res/layout/fragment_bookmark_dialog.xml | 9 ++- app/src/main/res/menu/add_bookmark.xml | 8 +++ .../{tva => gem}/io/GemtextHelperUnitTest.kt | 4 +- 41 files changed, 188 insertions(+), 144 deletions(-) rename app/src/androidTest/java/oppen/{tva => gem}/ExampleInstrumentedTest.kt (97%) rename app/src/main/java/oppen/{tva => gem}/Gem.kt (94%) rename app/src/main/java/oppen/{tva => gem}/io/GemState.kt (93%) rename app/src/main/java/oppen/{tva => gem}/io/bookmarks/Bookmark.kt (70%) rename app/src/main/java/oppen/{tva => gem}/io/bookmarks/BookmarkEntity.kt (90%) rename app/src/main/java/oppen/{tva => gem}/io/bookmarks/BookmarksDB.kt (87%) rename app/src/main/java/oppen/{tva => gem}/io/bookmarks/BookmarksDao.kt (90%) rename app/src/main/java/oppen/{tva => gem}/io/bookmarks/BookmarksDatasource.kt (92%) rename app/src/main/java/oppen/{tva => gem}/io/bookmarks/RoomBookmarks.kt (97%) rename app/src/main/java/oppen/{tva => gem}/io/gemini/Datasource.kt (82%) rename app/src/main/java/oppen/{tva => gem}/io/gemini/DummyTrustManager.kt (97%) rename app/src/main/java/oppen/{tva => gem}/io/gemini/GeminiDatasource.kt (98%) rename app/src/main/java/oppen/{tva => gem}/io/gemini/GeminiResponse.kt (94%) rename app/src/main/java/oppen/{tva => gem}/io/gemini/GemtextHelper.kt (97%) rename app/src/main/java/oppen/{tva => gem}/io/gemini/RuntimeCache.kt (95%) rename app/src/main/java/oppen/{tva => gem}/io/history/uris/BasicURIHistory.kt (97%) rename app/src/main/java/oppen/{tva => gem}/io/history/uris/HistoryInterface.kt (88%) rename app/src/main/java/oppen/{tva => gem}/ui/GemActivity.kt (87%) rename app/src/main/java/oppen/{tva => gem}/ui/GemViewModel.kt (90%) rename app/src/main/java/oppen/{tva => gem}/ui/GemtextAdapter.kt (96%) rename app/src/main/java/oppen/{tva => gem}/ui/audio_player/AudioPlayer.kt (93%) create mode 100644 app/src/main/java/oppen/gem/ui/bookmarks/BookmarkDialog.kt rename app/src/main/java/oppen/{tva => gem}/ui/content_image/ImageDialog.kt (95%) rename app/src/main/java/oppen/{tva => gem}/ui/content_image/TouchImageView.java (99%) rename app/src/main/java/oppen/{tva => gem}/ui/content_text/TextDialog.kt (87%) rename app/src/main/java/oppen/{tva => gem}/ui/modals_menus/LinkPopup.kt (91%) rename app/src/main/java/oppen/{tva => gem}/ui/modals_menus/about/AboutDialog.kt (92%) rename app/src/main/java/oppen/{tva => gem}/ui/modals_menus/history/HistoryAdapter.kt (94%) rename app/src/main/java/oppen/{tva => gem}/ui/modals_menus/history/HistoryDialog.kt (93%) rename app/src/main/java/oppen/{tva => gem}/ui/modals_menus/input/InputDialog.kt (91%) rename app/src/main/java/oppen/{tva => gem}/ui/modals_menus/overflow/OverflowPopup.kt (91%) rename app/src/main/java/oppen/{tva => gem}/ui/modals_menus/set_home/SetHomeDialog.kt (94%) delete mode 100644 app/src/main/java/oppen/tva/ui/bookmarks/BookmarkDialog.kt create mode 100644 app/src/main/res/drawable/vector_confirm.xml create mode 100644 app/src/main/res/menu/add_bookmark.xml rename app/src/test/java/oppen/{tva => gem}/io/GemtextHelperUnitTest.kt (95%) diff --git a/app/src/androidTest/java/oppen/tva/ExampleInstrumentedTest.kt b/app/src/androidTest/java/oppen/gem/ExampleInstrumentedTest.kt similarity index 97% rename from app/src/androidTest/java/oppen/tva/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/oppen/gem/ExampleInstrumentedTest.kt index 7e3b500..fb8f16d 100644 --- a/app/src/androidTest/java/oppen/tva/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/oppen/gem/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package oppen.tva +package oppen.gem import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 27b6f60..87090a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + package="oppen.gem"> - + diff --git a/app/src/main/java/oppen/tva/Gem.kt b/app/src/main/java/oppen/gem/Gem.kt similarity index 94% rename from app/src/main/java/oppen/tva/Gem.kt rename to app/src/main/java/oppen/gem/Gem.kt index 68f61b5..948f434 100644 --- a/app/src/main/java/oppen/tva/Gem.kt +++ b/app/src/main/java/oppen/gem/Gem.kt @@ -1,4 +1,4 @@ -package oppen.tva +package oppen.gem import android.app.Application diff --git a/app/src/main/java/oppen/tva/io/GemState.kt b/app/src/main/java/oppen/gem/io/GemState.kt similarity index 93% rename from app/src/main/java/oppen/tva/io/GemState.kt rename to app/src/main/java/oppen/gem/io/GemState.kt index d133f8f..5a42427 100644 --- a/app/src/main/java/oppen/tva/io/GemState.kt +++ b/app/src/main/java/oppen/gem/io/GemState.kt @@ -1,7 +1,7 @@ -package oppen.tva.io +package oppen.gem.io import android.net.Uri -import oppen.tva.io.gemini.GeminiResponse +import oppen.gem.io.gemini.GeminiResponse import java.net.URI sealed class GemState { diff --git a/app/src/main/java/oppen/tva/io/bookmarks/Bookmark.kt b/app/src/main/java/oppen/gem/io/bookmarks/Bookmark.kt similarity index 70% rename from app/src/main/java/oppen/tva/io/bookmarks/Bookmark.kt rename to app/src/main/java/oppen/gem/io/bookmarks/Bookmark.kt index 269c7b1..42bc218 100644 --- a/app/src/main/java/oppen/tva/io/bookmarks/Bookmark.kt +++ b/app/src/main/java/oppen/gem/io/bookmarks/Bookmark.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.bookmarks +package oppen.gem.io.bookmarks import java.net.URI diff --git a/app/src/main/java/oppen/tva/io/bookmarks/BookmarkEntity.kt b/app/src/main/java/oppen/gem/io/bookmarks/BookmarkEntity.kt similarity index 90% rename from app/src/main/java/oppen/tva/io/bookmarks/BookmarkEntity.kt rename to app/src/main/java/oppen/gem/io/bookmarks/BookmarkEntity.kt index a2d911c..bfe4876 100644 --- a/app/src/main/java/oppen/tva/io/bookmarks/BookmarkEntity.kt +++ b/app/src/main/java/oppen/gem/io/bookmarks/BookmarkEntity.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.bookmarks +package oppen.gem.io.bookmarks import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/oppen/tva/io/bookmarks/BookmarksDB.kt b/app/src/main/java/oppen/gem/io/bookmarks/BookmarksDB.kt similarity index 87% rename from app/src/main/java/oppen/tva/io/bookmarks/BookmarksDB.kt rename to app/src/main/java/oppen/gem/io/bookmarks/BookmarksDB.kt index 11fea12..9cdad1d 100644 --- a/app/src/main/java/oppen/tva/io/bookmarks/BookmarksDB.kt +++ b/app/src/main/java/oppen/gem/io/bookmarks/BookmarksDB.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.bookmarks +package oppen.gem.io.bookmarks import androidx.room.Database import androidx.room.RoomDatabase diff --git a/app/src/main/java/oppen/tva/io/bookmarks/BookmarksDao.kt b/app/src/main/java/oppen/gem/io/bookmarks/BookmarksDao.kt similarity index 90% rename from app/src/main/java/oppen/tva/io/bookmarks/BookmarksDao.kt rename to app/src/main/java/oppen/gem/io/bookmarks/BookmarksDao.kt index be0d5e5..f7c1773 100644 --- a/app/src/main/java/oppen/tva/io/bookmarks/BookmarksDao.kt +++ b/app/src/main/java/oppen/gem/io/bookmarks/BookmarksDao.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.bookmarks +package oppen.gem.io.bookmarks import androidx.room.* diff --git a/app/src/main/java/oppen/tva/io/bookmarks/BookmarksDatasource.kt b/app/src/main/java/oppen/gem/io/bookmarks/BookmarksDatasource.kt similarity index 92% rename from app/src/main/java/oppen/tva/io/bookmarks/BookmarksDatasource.kt rename to app/src/main/java/oppen/gem/io/bookmarks/BookmarksDatasource.kt index fdf79fe..01b6a8f 100644 --- a/app/src/main/java/oppen/tva/io/bookmarks/BookmarksDatasource.kt +++ b/app/src/main/java/oppen/gem/io/bookmarks/BookmarksDatasource.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.bookmarks +package oppen.gem.io.bookmarks import android.content.Context diff --git a/app/src/main/java/oppen/tva/io/bookmarks/RoomBookmarks.kt b/app/src/main/java/oppen/gem/io/bookmarks/RoomBookmarks.kt similarity index 97% rename from app/src/main/java/oppen/tva/io/bookmarks/RoomBookmarks.kt rename to app/src/main/java/oppen/gem/io/bookmarks/RoomBookmarks.kt index b5b4d94..2831569 100644 --- a/app/src/main/java/oppen/tva/io/bookmarks/RoomBookmarks.kt +++ b/app/src/main/java/oppen/gem/io/bookmarks/RoomBookmarks.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.bookmarks +package oppen.gem.io.bookmarks import android.content.Context import androidx.room.Room diff --git a/app/src/main/java/oppen/tva/io/gemini/Datasource.kt b/app/src/main/java/oppen/gem/io/gemini/Datasource.kt similarity index 82% rename from app/src/main/java/oppen/tva/io/gemini/Datasource.kt rename to app/src/main/java/oppen/gem/io/gemini/Datasource.kt index 63edb5c..4bc03fd 100644 --- a/app/src/main/java/oppen/tva/io/gemini/Datasource.kt +++ b/app/src/main/java/oppen/gem/io/gemini/Datasource.kt @@ -1,7 +1,7 @@ -package oppen.tva.io.gemini +package oppen.gem.io.gemini import android.content.Context -import oppen.tva.io.GemState +import oppen.gem.io.GemState import java.net.URI interface Datasource { diff --git a/app/src/main/java/oppen/tva/io/gemini/DummyTrustManager.kt b/app/src/main/java/oppen/gem/io/gemini/DummyTrustManager.kt similarity index 97% rename from app/src/main/java/oppen/tva/io/gemini/DummyTrustManager.kt rename to app/src/main/java/oppen/gem/io/gemini/DummyTrustManager.kt index cb1d459..d6e8c41 100644 --- a/app/src/main/java/oppen/tva/io/gemini/DummyTrustManager.kt +++ b/app/src/main/java/oppen/gem/io/gemini/DummyTrustManager.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.gemini +package oppen.gem.io.gemini import java.security.cert.X509Certificate import javax.net.ssl.TrustManager diff --git a/app/src/main/java/oppen/tva/io/gemini/GeminiDatasource.kt b/app/src/main/java/oppen/gem/io/gemini/GeminiDatasource.kt similarity index 98% rename from app/src/main/java/oppen/tva/io/gemini/GeminiDatasource.kt rename to app/src/main/java/oppen/gem/io/gemini/GeminiDatasource.kt index 49d4eb4..9d7fca7 100644 --- a/app/src/main/java/oppen/tva/io/gemini/GeminiDatasource.kt +++ b/app/src/main/java/oppen/gem/io/gemini/GeminiDatasource.kt @@ -1,10 +1,10 @@ -package oppen.tva.io.gemini +package oppen.gem.io.gemini import android.content.Context import androidx.core.net.toUri import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import oppen.tva.io.GemState +import oppen.gem.io.GemState import java.io.* import java.net.ConnectException import java.net.URI @@ -107,7 +107,7 @@ class GeminiDatasource(val context: Context): Datasource { val factory: SSLSocketFactory = sslContext.socketFactory - var socket: SSLSocket? = null + var socket: SSLSocket? try { socket = factory.createSocket(uri.host, port) as SSLSocket socket.enabledProtocols = arrayOf("TLSv1.2") diff --git a/app/src/main/java/oppen/tva/io/gemini/GeminiResponse.kt b/app/src/main/java/oppen/gem/io/gemini/GeminiResponse.kt similarity index 94% rename from app/src/main/java/oppen/tva/io/gemini/GeminiResponse.kt rename to app/src/main/java/oppen/gem/io/gemini/GeminiResponse.kt index 06450cd..b065451 100644 --- a/app/src/main/java/oppen/tva/io/gemini/GeminiResponse.kt +++ b/app/src/main/java/oppen/gem/io/gemini/GeminiResponse.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.gemini +package oppen.gem.io.gemini object GeminiResponse { @@ -11,8 +11,8 @@ object GeminiResponse { const val UNKNOWN = -1 fun parseHeader(header: String): Header { - var cleanHeader = header.replace("\\s+".toRegex(), " ") - var meta = "" + val cleanHeader = header.replace("\\s+".toRegex(), " ") + val meta: String when { header.startsWith("2") -> { val segments = cleanHeader.trim().split(" ") diff --git a/app/src/main/java/oppen/tva/io/gemini/GemtextHelper.kt b/app/src/main/java/oppen/gem/io/gemini/GemtextHelper.kt similarity index 97% rename from app/src/main/java/oppen/tva/io/gemini/GemtextHelper.kt rename to app/src/main/java/oppen/gem/io/gemini/GemtextHelper.kt index 065b0a6..ecd33f7 100644 --- a/app/src/main/java/oppen/tva/io/gemini/GemtextHelper.kt +++ b/app/src/main/java/oppen/gem/io/gemini/GemtextHelper.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.gemini +package oppen.gem.io.gemini import java.lang.StringBuilder diff --git a/app/src/main/java/oppen/tva/io/gemini/RuntimeCache.kt b/app/src/main/java/oppen/gem/io/gemini/RuntimeCache.kt similarity index 95% rename from app/src/main/java/oppen/tva/io/gemini/RuntimeCache.kt rename to app/src/main/java/oppen/gem/io/gemini/RuntimeCache.kt index 8121c65..f7145f3 100644 --- a/app/src/main/java/oppen/tva/io/gemini/RuntimeCache.kt +++ b/app/src/main/java/oppen/gem/io/gemini/RuntimeCache.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.gemini +package oppen.gem.io.gemini import androidx.collection.LruCache import java.net.URI diff --git a/app/src/main/java/oppen/tva/io/history/uris/BasicURIHistory.kt b/app/src/main/java/oppen/gem/io/history/uris/BasicURIHistory.kt similarity index 97% rename from app/src/main/java/oppen/tva/io/history/uris/BasicURIHistory.kt rename to app/src/main/java/oppen/gem/io/history/uris/BasicURIHistory.kt index b79b80e..4ea1c51 100644 --- a/app/src/main/java/oppen/tva/io/history/uris/BasicURIHistory.kt +++ b/app/src/main/java/oppen/gem/io/history/uris/BasicURIHistory.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.history.uris +package oppen.gem.io.history.uris import android.content.Context diff --git a/app/src/main/java/oppen/tva/io/history/uris/HistoryInterface.kt b/app/src/main/java/oppen/gem/io/history/uris/HistoryInterface.kt similarity index 88% rename from app/src/main/java/oppen/tva/io/history/uris/HistoryInterface.kt rename to app/src/main/java/oppen/gem/io/history/uris/HistoryInterface.kt index 6825526..9dee0e2 100644 --- a/app/src/main/java/oppen/tva/io/history/uris/HistoryInterface.kt +++ b/app/src/main/java/oppen/gem/io/history/uris/HistoryInterface.kt @@ -1,4 +1,4 @@ -package oppen.tva.io.history.uris +package oppen.gem.io.history.uris import android.content.Context diff --git a/app/src/main/java/oppen/tva/ui/GemActivity.kt b/app/src/main/java/oppen/gem/ui/GemActivity.kt similarity index 87% rename from app/src/main/java/oppen/tva/ui/GemActivity.kt rename to app/src/main/java/oppen/gem/ui/GemActivity.kt index c42590b..55dc330 100644 --- a/app/src/main/java/oppen/tva/ui/GemActivity.kt +++ b/app/src/main/java/oppen/gem/ui/GemActivity.kt @@ -1,4 +1,4 @@ -package oppen.tva.ui +package oppen.gem.ui import android.content.Context import android.content.Intent @@ -9,30 +9,29 @@ import android.view.inputmethod.EditorInfo import androidx.activity.viewModels import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.app.AppCompatDialog import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.snackbar.Snackbar +import oppen.gem.R +import oppen.gem.Gem +import oppen.gem.databinding.ActivityGemBinding +import oppen.gem.io.GemState +import oppen.gem.io.bookmarks.BookmarksDatasource +import oppen.gem.io.gemini.Datasource +import oppen.gem.io.gemini.GeminiResponse +import oppen.gem.io.gemini.RuntimeCache +import oppen.gem.io.history.uris.HistoryInterface +import oppen.gem.ui.audio_player.AudioPlayer +import oppen.gem.ui.bookmarks.BookmarkDialog +import oppen.gem.ui.content_image.ImageDialog +import oppen.gem.ui.content_text.TextDialog +import oppen.gem.ui.modals_menus.about.AboutDialog +import oppen.gem.ui.modals_menus.history.HistoryDialog +import oppen.gem.ui.modals_menus.input.InputDialog +import oppen.gem.ui.modals_menus.overflow.OverflowPopup +import oppen.gem.ui.modals_menus.set_home.SetHomeDialog +import oppen.gem.ui.modals_menus.LinkPopup import oppen.hideKeyboard -import oppen.tva.R -import oppen.tva.Gem -import oppen.tva.databinding.ActivityGemBinding -import oppen.tva.io.GemState -import oppen.tva.io.bookmarks.BookmarksDatasource -import oppen.tva.io.gemini.Datasource -import oppen.tva.io.gemini.GeminiResponse -import oppen.tva.io.gemini.RuntimeCache -import oppen.tva.io.history.uris.HistoryInterface -import oppen.tva.ui.audio_player.AudioPlayer -import oppen.tva.ui.bookmarks.BookmarkDialog -import oppen.tva.ui.content_image.ImageDialog -import oppen.tva.ui.content_text.TextDialog -import oppen.tva.ui.modals_menus.about.AboutDialog -import oppen.tva.ui.modals_menus.history.HistoryDialog -import oppen.tva.ui.modals_menus.input.InputDialog -import oppen.tva.ui.modals_menus.overflow.OverflowPopup -import oppen.tva.ui.modals_menus.set_home.SetHomeDialog -import oppen.tva.ui.modals_menus.LinkPopup import oppen.visibleRetainingSpace import java.io.File import java.io.FileInputStream @@ -48,6 +47,8 @@ class GemActivity : AppCompatActivity() { private val mediaPlayer = MediaPlayer() + private lateinit var bookmarkDatasource: BookmarksDatasource + private val model by viewModels() private lateinit var binding: ActivityGemBinding private lateinit var history: HistoryInterface @@ -77,6 +78,10 @@ class GemActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + + bookmarkDatasource = BookmarksDatasource.getDefault(applicationContext) + + binding = DataBindingUtil.setContentView(this, R.layout.activity_gem) binding.viewmodel = model binding.lifecycleOwner = this @@ -140,7 +145,14 @@ class GemActivity : AppCompatActivity() { inSearch = true } R.id.overflow_menu_bookmark -> { - BookmarkDialog(this, "test", "test").show() + val name = adapter.inferTitle() + BookmarkDialog(this, bookmarkDatasource, binding.addressEdit.text.toString(), name ?: ""){ + bookmarkDatasource.get { bookmarks -> + bookmarks.forEach {bookmark -> + println("Bookmark: ${bookmark.label}: ${bookmark.uri}") + } + } + }.show() } R.id.overflow_menu_bookmarks -> { //todo diff --git a/app/src/main/java/oppen/tva/ui/GemViewModel.kt b/app/src/main/java/oppen/gem/ui/GemViewModel.kt similarity index 90% rename from app/src/main/java/oppen/tva/ui/GemViewModel.kt rename to app/src/main/java/oppen/gem/ui/GemViewModel.kt index ef46323..6542c9d 100644 --- a/app/src/main/java/oppen/tva/ui/GemViewModel.kt +++ b/app/src/main/java/oppen/gem/ui/GemViewModel.kt @@ -1,10 +1,10 @@ -package oppen.tva.ui +package oppen.gem.ui import androidx.lifecycle.ViewModel -import oppen.tva.Gem -import oppen.tva.io.gemini.Datasource -import oppen.tva.io.GemState -import oppen.tva.io.bookmarks.BookmarksDatasource +import oppen.gem.Gem +import oppen.gem.io.gemini.Datasource +import oppen.gem.io.GemState +import oppen.gem.io.bookmarks.BookmarksDatasource import java.net.URI class GemViewModel: ViewModel() { diff --git a/app/src/main/java/oppen/tva/ui/GemtextAdapter.kt b/app/src/main/java/oppen/gem/ui/GemtextAdapter.kt similarity index 96% rename from app/src/main/java/oppen/tva/ui/GemtextAdapter.kt rename to app/src/main/java/oppen/gem/ui/GemtextAdapter.kt index b114694..e01e9f7 100644 --- a/app/src/main/java/oppen/tva/ui/GemtextAdapter.kt +++ b/app/src/main/java/oppen/gem/ui/GemtextAdapter.kt @@ -1,4 +1,4 @@ -package oppen.tva.ui +package oppen.gem.ui import android.annotation.SuppressLint import android.view.LayoutInflater @@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.gemtext_code_block.view.* import kotlinx.android.synthetic.main.gemtext_link.view.* import kotlinx.android.synthetic.main.gemtext_text.view.gemtext_text_textview -import oppen.tva.R +import oppen.gem.R import java.net.URI class GemtextAdapter(val onLink: (link: URI, longTap: Boolean, view: View?) -> Unit): RecyclerView.Adapter() { @@ -126,4 +126,12 @@ class GemtextAdapter(val onLink: (link: URI, longTap: Boolean, view: View?) -> U val linkParts = linkLine.substring(2).trim().split("\\s+".toRegex(), 2) return URI.create(linkParts.first()) } + + fun inferTitle(): String? { + lines.forEach { line -> + if(line.startsWith("#")) return line.replace("#", "").trim() + } + + return null + } } \ No newline at end of file diff --git a/app/src/main/java/oppen/tva/ui/audio_player/AudioPlayer.kt b/app/src/main/java/oppen/gem/ui/audio_player/AudioPlayer.kt similarity index 93% rename from app/src/main/java/oppen/tva/ui/audio_player/AudioPlayer.kt rename to app/src/main/java/oppen/gem/ui/audio_player/AudioPlayer.kt index 5205611..909a913 100644 --- a/app/src/main/java/oppen/tva/ui/audio_player/AudioPlayer.kt +++ b/app/src/main/java/oppen/gem/ui/audio_player/AudioPlayer.kt @@ -1,4 +1,4 @@ -package oppen.tva.ui.audio_player +package oppen.gem.ui.audio_player import android.content.Context import android.media.MediaMetadataRetriever @@ -6,9 +6,9 @@ import android.media.MediaPlayer import android.view.MenuInflater import androidx.appcompat.widget.PopupMenu import androidx.core.view.MenuCompat -import oppen.tva.R -import oppen.tva.databinding.ActivityGemBinding -import oppen.tva.io.GemState +import oppen.gem.R +import oppen.gem.databinding.ActivityGemBinding +import oppen.gem.io.GemState import oppen.visible object AudioPlayer { @@ -32,7 +32,7 @@ object AudioPlayer { binding.audioPlayButton.setImageResource(R.drawable.vector_pause) - mediaPlayer.setOnCompletionListener { player -> + mediaPlayer.setOnCompletionListener { _ -> binding.audioPlayButton.setImageResource(R.drawable.vector_play) } @@ -46,7 +46,7 @@ object AudioPlayer { } } - mediaPlayer.setOnInfoListener { _, what, extra -> + mediaPlayer.setOnInfoListener { _, what, _ -> when(what){ MediaPlayer.MEDIA_INFO_UNKNOWN -> println("MEDIA_INFO_UNKNOWN") MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING-> println("MEDIA_INFO_VIDEO_TRACK_LAGGING") diff --git a/app/src/main/java/oppen/gem/ui/bookmarks/BookmarkDialog.kt b/app/src/main/java/oppen/gem/ui/bookmarks/BookmarkDialog.kt new file mode 100644 index 0000000..9d97764 --- /dev/null +++ b/app/src/main/java/oppen/gem/ui/bookmarks/BookmarkDialog.kt @@ -0,0 +1,45 @@ +package oppen.gem.ui.bookmarks + +import android.content.Context +import android.view.View +import androidx.appcompat.app.AppCompatDialog +import kotlinx.android.synthetic.main.fragment_bookmark_dialog.view.* +import oppen.gem.R +import oppen.gem.io.bookmarks.Bookmark +import oppen.gem.io.bookmarks.BookmarksDatasource +import java.net.URI + + +class BookmarkDialog(context: Context, val bookmarkDatasource: BookmarksDatasource, val uri: String, val name: String, onDismiss: () -> Unit): AppCompatDialog(context, R.style.FSDialog) { + + init { + val view = View.inflate(context, R.layout.fragment_bookmark_dialog, null) + + setContentView(view) + + view.bookmark_toolbar.setNavigationIcon(R.drawable.vector_close) + view.bookmark_toolbar.setNavigationOnClickListener { + onDismiss() + dismiss() + } + + view.bookmark_name.setText(name) + view.bookmark_uri.setText(uri) + + view.bookmark_toolbar.inflateMenu(R.menu.add_bookmark) + view.bookmark_toolbar.setOnMenuItemClickListener {menuItem -> + if(menuItem.itemId == R.id.menu_action_save_bookmark){ + bookmarkDatasource.add(Bookmark( + label = view.bookmark_name.text.toString(), + uri = URI.create(view.bookmark_uri.text.toString()) + )){ + onDismiss() + dismiss() + } + } + + true + + } + } +} \ No newline at end of file diff --git a/app/src/main/java/oppen/tva/ui/content_image/ImageDialog.kt b/app/src/main/java/oppen/gem/ui/content_image/ImageDialog.kt similarity index 95% rename from app/src/main/java/oppen/tva/ui/content_image/ImageDialog.kt rename to app/src/main/java/oppen/gem/ui/content_image/ImageDialog.kt index 035a35d..b7256c7 100644 --- a/app/src/main/java/oppen/tva/ui/content_image/ImageDialog.kt +++ b/app/src/main/java/oppen/gem/ui/content_image/ImageDialog.kt @@ -1,4 +1,4 @@ -package oppen.tva.ui.content_image +package oppen.gem.ui.content_image import android.content.Context import android.graphics.Bitmap @@ -8,8 +8,8 @@ import android.view.View import androidx.appcompat.app.AppCompatDialog import androidx.appcompat.widget.PopupMenu import kotlinx.android.synthetic.main.dialog_content_image.view.* -import oppen.tva.R -import oppen.tva.io.GemState +import oppen.gem.R +import oppen.gem.io.GemState import java.io.FileOutputStream object ImageDialog { diff --git a/app/src/main/java/oppen/tva/ui/content_image/TouchImageView.java b/app/src/main/java/oppen/gem/ui/content_image/TouchImageView.java similarity index 99% rename from app/src/main/java/oppen/tva/ui/content_image/TouchImageView.java rename to app/src/main/java/oppen/gem/ui/content_image/TouchImageView.java index 56374b8..9e9bed5 100644 --- a/app/src/main/java/oppen/tva/ui/content_image/TouchImageView.java +++ b/app/src/main/java/oppen/gem/ui/content_image/TouchImageView.java @@ -1,4 +1,4 @@ -package oppen.tva.ui.content_image; +package oppen.gem.ui.content_image; diff --git a/app/src/main/java/oppen/tva/ui/content_text/TextDialog.kt b/app/src/main/java/oppen/gem/ui/content_text/TextDialog.kt similarity index 87% rename from app/src/main/java/oppen/tva/ui/content_text/TextDialog.kt rename to app/src/main/java/oppen/gem/ui/content_text/TextDialog.kt index 3540715..1048583 100644 --- a/app/src/main/java/oppen/tva/ui/content_text/TextDialog.kt +++ b/app/src/main/java/oppen/gem/ui/content_text/TextDialog.kt @@ -1,11 +1,11 @@ -package oppen.tva.ui.content_text +package oppen.gem.ui.content_text import android.content.Context import android.view.View import androidx.appcompat.app.AppCompatDialog import kotlinx.android.synthetic.main.dialog_content_text.view.* -import oppen.tva.R -import oppen.tva.io.GemState +import oppen.gem.R +import oppen.gem.io.GemState object TextDialog { diff --git a/app/src/main/java/oppen/tva/ui/modals_menus/LinkPopup.kt b/app/src/main/java/oppen/gem/ui/modals_menus/LinkPopup.kt similarity index 91% rename from app/src/main/java/oppen/tva/ui/modals_menus/LinkPopup.kt rename to app/src/main/java/oppen/gem/ui/modals_menus/LinkPopup.kt index 4c07952..aabeeea 100644 --- a/app/src/main/java/oppen/tva/ui/modals_menus/LinkPopup.kt +++ b/app/src/main/java/oppen/gem/ui/modals_menus/LinkPopup.kt @@ -1,9 +1,9 @@ -package oppen.tva.ui.modals_menus +package oppen.gem.ui.modals_menus import android.view.MenuInflater import android.view.View import androidx.appcompat.widget.PopupMenu -import oppen.tva.R +import oppen.gem.R object LinkPopup { diff --git a/app/src/main/java/oppen/tva/ui/modals_menus/about/AboutDialog.kt b/app/src/main/java/oppen/gem/ui/modals_menus/about/AboutDialog.kt similarity index 92% rename from app/src/main/java/oppen/tva/ui/modals_menus/about/AboutDialog.kt rename to app/src/main/java/oppen/gem/ui/modals_menus/about/AboutDialog.kt index 0f06d90..d18c693 100644 --- a/app/src/main/java/oppen/tva/ui/modals_menus/about/AboutDialog.kt +++ b/app/src/main/java/oppen/gem/ui/modals_menus/about/AboutDialog.kt @@ -1,4 +1,4 @@ -package oppen.tva.ui.modals_menus.about +package oppen.gem.ui.modals_menus.about import android.content.Context import android.content.Intent @@ -6,8 +6,8 @@ import android.net.Uri import android.view.View import androidx.appcompat.app.AppCompatDialog import kotlinx.android.synthetic.main.dialog_about.view.* -import oppen.tva.BuildConfig -import oppen.tva.R +import oppen.gem.BuildConfig +import oppen.gem.R object AboutDialog { diff --git a/app/src/main/java/oppen/tva/ui/modals_menus/history/HistoryAdapter.kt b/app/src/main/java/oppen/gem/ui/modals_menus/history/HistoryAdapter.kt similarity index 94% rename from app/src/main/java/oppen/tva/ui/modals_menus/history/HistoryAdapter.kt rename to app/src/main/java/oppen/gem/ui/modals_menus/history/HistoryAdapter.kt index 45bd9bc..ba039b0 100644 --- a/app/src/main/java/oppen/tva/ui/modals_menus/history/HistoryAdapter.kt +++ b/app/src/main/java/oppen/gem/ui/modals_menus/history/HistoryAdapter.kt @@ -1,4 +1,4 @@ -package oppen.tva.ui.modals_menus.history +package oppen.gem.ui.modals_menus.history import android.view.LayoutInflater import android.view.View @@ -6,7 +6,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.row_history.view.* import oppen.delay -import oppen.tva.R +import oppen.gem.R class HistoryAdapter(val history: List, val onClick:(address: String) -> Unit): RecyclerView.Adapter() { diff --git a/app/src/main/java/oppen/tva/ui/modals_menus/history/HistoryDialog.kt b/app/src/main/java/oppen/gem/ui/modals_menus/history/HistoryDialog.kt similarity index 93% rename from app/src/main/java/oppen/tva/ui/modals_menus/history/HistoryDialog.kt rename to app/src/main/java/oppen/gem/ui/modals_menus/history/HistoryDialog.kt index 6054f07..980ee27 100644 --- a/app/src/main/java/oppen/tva/ui/modals_menus/history/HistoryDialog.kt +++ b/app/src/main/java/oppen/gem/ui/modals_menus/history/HistoryDialog.kt @@ -1,4 +1,4 @@ -package oppen.tva.ui.modals_menus.history +package oppen.gem.ui.modals_menus.history import android.content.Context import android.view.MenuInflater @@ -10,9 +10,9 @@ import androidx.core.view.MenuCompat import androidx.recyclerview.widget.LinearLayoutManager import kotlinx.android.synthetic.main.dialog_about.view.close_tab_dialog import kotlinx.android.synthetic.main.dialog_history.view.* -import oppen.tva.R -import oppen.tva.io.gemini.RuntimeCache -import oppen.tva.io.history.uris.HistoryInterface +import oppen.gem.R +import oppen.gem.io.gemini.RuntimeCache +import oppen.gem.io.history.uris.HistoryInterface object HistoryDialog { fun show(context: Context, onHistoryItem: (address: String) -> Unit){ diff --git a/app/src/main/java/oppen/tva/ui/modals_menus/input/InputDialog.kt b/app/src/main/java/oppen/gem/ui/modals_menus/input/InputDialog.kt similarity index 91% rename from app/src/main/java/oppen/tva/ui/modals_menus/input/InputDialog.kt rename to app/src/main/java/oppen/gem/ui/modals_menus/input/InputDialog.kt index 9f07bb7..43c3b4a 100644 --- a/app/src/main/java/oppen/tva/ui/modals_menus/input/InputDialog.kt +++ b/app/src/main/java/oppen/gem/ui/modals_menus/input/InputDialog.kt @@ -1,11 +1,11 @@ -package oppen.tva.ui.modals_menus.input +package oppen.gem.ui.modals_menus.input import android.content.Context import android.view.View import androidx.appcompat.app.AppCompatDialog import kotlinx.android.synthetic.main.dialog_input_query.view.* -import oppen.tva.R -import oppen.tva.io.GemState +import oppen.gem.R +import oppen.gem.io.GemState import java.net.URLEncoder object InputDialog { diff --git a/app/src/main/java/oppen/tva/ui/modals_menus/overflow/OverflowPopup.kt b/app/src/main/java/oppen/gem/ui/modals_menus/overflow/OverflowPopup.kt similarity index 91% rename from app/src/main/java/oppen/tva/ui/modals_menus/overflow/OverflowPopup.kt rename to app/src/main/java/oppen/gem/ui/modals_menus/overflow/OverflowPopup.kt index ecf3faa..3def41a 100644 --- a/app/src/main/java/oppen/tva/ui/modals_menus/overflow/OverflowPopup.kt +++ b/app/src/main/java/oppen/gem/ui/modals_menus/overflow/OverflowPopup.kt @@ -1,4 +1,4 @@ -package oppen.tva.ui.modals_menus.overflow +package oppen.gem.ui.modals_menus.overflow import android.content.Context import android.graphics.Color @@ -12,7 +12,7 @@ import android.view.MenuItem import android.view.View import androidx.appcompat.widget.PopupMenu import androidx.core.view.MenuCompat -import oppen.tva.R +import oppen.gem.R object OverflowPopup { @@ -27,7 +27,7 @@ object OverflowPopup { true } MenuCompat.setGroupDividerEnabled(popup.menu, true) - insertMenuItemIcons(view.context, popup) + //insertMenuItemIcons(view.context, popup) popup.show() } } @@ -53,7 +53,6 @@ object OverflowPopup { */ private fun insertMenuItemIcon(context: Context, menuItem: MenuItem) { var icon: Drawable = menuItem.icon - if (icon == null) icon = ColorDrawable(Color.TRANSPARENT) val iconSize = context.resources.getDimensionPixelSize(R.dimen.menu_item_icon_size) icon.setBounds(0, 0, iconSize, iconSize) icon.setTint(Color.WHITE) diff --git a/app/src/main/java/oppen/tva/ui/modals_menus/set_home/SetHomeDialog.kt b/app/src/main/java/oppen/gem/ui/modals_menus/set_home/SetHomeDialog.kt similarity index 94% rename from app/src/main/java/oppen/tva/ui/modals_menus/set_home/SetHomeDialog.kt rename to app/src/main/java/oppen/gem/ui/modals_menus/set_home/SetHomeDialog.kt index fd19afc..a59114e 100644 --- a/app/src/main/java/oppen/tva/ui/modals_menus/set_home/SetHomeDialog.kt +++ b/app/src/main/java/oppen/gem/ui/modals_menus/set_home/SetHomeDialog.kt @@ -1,10 +1,10 @@ -package oppen.tva.ui.modals_menus.set_home +package oppen.gem.ui.modals_menus.set_home import android.content.Context import android.view.View import androidx.appcompat.app.AppCompatDialog import kotlinx.android.synthetic.main.dialog_set_home.view.* -import oppen.tva.R +import oppen.gem.R object SetHomeDialog { diff --git a/app/src/main/java/oppen/tva/ui/bookmarks/BookmarkDialog.kt b/app/src/main/java/oppen/tva/ui/bookmarks/BookmarkDialog.kt deleted file mode 100644 index 1b551ed..0000000 --- a/app/src/main/java/oppen/tva/ui/bookmarks/BookmarkDialog.kt +++ /dev/null @@ -1,30 +0,0 @@ -package oppen.tva.ui.bookmarks - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.WindowManager -import androidx.appcompat.app.AppCompatDialog -import androidx.fragment.app.DialogFragment -import kotlinx.android.synthetic.main.fragment_bookmark_dialog.view.* -import oppen.tva.R - - -class BookmarkDialog(context: Context, val uri: String, val name: String): AppCompatDialog(context, R.style.FSDialog) { - - init { - setContentView(R.layout.fragment_bookmark_dialog) - //getWindow()?.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); - } - - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - - - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/vector_confirm.xml b/app/src/main/res/drawable/vector_confirm.xml new file mode 100644 index 0000000..0432fa6 --- /dev/null +++ b/app/src/main/res/drawable/vector_confirm.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/vector_home.xml b/app/src/main/res/drawable/vector_home.xml index 466061c..2a8afa8 100644 --- a/app/src/main/res/drawable/vector_home.xml +++ b/app/src/main/res/drawable/vector_home.xml @@ -1,25 +1,10 @@ + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - - - - + android:fillColor="@android:color/white" + android:pathData="M10,19v-5h4v5c0,0.55 0.45,1 1,1h3c0.55,0 1,-0.45 1,-1v-7h1.7c0.46,0 0.68,-0.57 0.33,-0.87L12.67,3.6c-0.38,-0.34 -0.96,-0.34 -1.34,0l-8.36,7.53c-0.34,0.3 -0.13,0.87 0.33,0.87H5v7c0,0.55 0.45,1 1,1h3c0.55,0 1,-0.45 1,-1z"/> diff --git a/app/src/main/res/layout/activity_gem.xml b/app/src/main/res/layout/activity_gem.xml index 4d88bee..a233083 100644 --- a/app/src/main/res/layout/activity_gem.xml +++ b/app/src/main/res/layout/activity_gem.xml @@ -1,7 +1,7 @@ - + - diff --git a/app/src/main/res/menu/add_bookmark.xml b/app/src/main/res/menu/add_bookmark.xml new file mode 100644 index 0000000..f748e4d --- /dev/null +++ b/app/src/main/res/menu/add_bookmark.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/test/java/oppen/tva/io/GemtextHelperUnitTest.kt b/app/src/test/java/oppen/gem/io/GemtextHelperUnitTest.kt similarity index 95% rename from app/src/test/java/oppen/tva/io/GemtextHelperUnitTest.kt rename to app/src/test/java/oppen/gem/io/GemtextHelperUnitTest.kt index ddac319..488b870 100644 --- a/app/src/test/java/oppen/tva/io/GemtextHelperUnitTest.kt +++ b/app/src/test/java/oppen/gem/io/GemtextHelperUnitTest.kt @@ -1,6 +1,6 @@ -package oppen.tva.io +package oppen.gem.io -import oppen.tva.io.gemini.GemtextHelper +import oppen.gem.io.gemini.GemtextHelper import org.junit.Test import org.junit.Assert.*