Compare commits
	
		
			28 Commits
		
	
	
		
			v125010131
			...
			d5ec118679
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| d5ec118679 | |||
| a1c0241a58 | |||
|  | f38936f9b4 | ||
| a90ccec707 | |||
|  | 2564b19726 | ||
| 61c7bb20cc | |||
| 6a0f5baf0a | |||
| 39f9505c00 | |||
| 6a6d447456 | |||
|  | 0bb4fe6aed | ||
| 7df4c3368c | |||
| c69635b5ae | |||
| 3a829df70e | |||
| 7a0202689f | |||
| b20f6888f5 | |||
| 6b96eb358d | |||
| dfc1bf9fa3 | |||
|  | b173664ff0 | ||
| bc20a421ae | |||
| 794500355a | |||
| 44f9dd53d3 | |||
| 717d6b664c | |||
| e23289a3dc | |||
|  | 2f5ebe2420 | ||
| 1893904135 | |||
| a4cb28ba81 | |||
| ae3cada1c7 | |||
|  | 309500276f | 
							
								
								
									
										10
									
								
								.gitea/workflows/assets/crowdin.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								.gitea/workflows/assets/crowdin.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | ||||
| project_id_env: CROWDIN_PROJECT_ID | ||||
| api_token_env: CROWDIN_PERSONAL_TOKEN | ||||
| base_path: "../../../" | ||||
|  | ||||
| files: | ||||
|   - source: /androidApp/src/main/res/values/strings.xml | ||||
|     translation: /androidApp/src/main/res/values-%android_code%/%original_file_name% | ||||
|     translate_attributes: '0' | ||||
|     content_segmentation: '0' | ||||
| preserve_hierarchy: true | ||||
| @@ -26,9 +26,10 @@ jobs: | ||||
|       - uses: KengoTODA/actions-setup-docker-compose@v1 | ||||
|         with: | ||||
|           version: "2.23.3" | ||||
|       - name: run selfoss | ||||
|         run: | | ||||
|           docker compose -f .gitea/workflows/assets/docker-compose.yml up -d | ||||
|       #      TESTS ARE RUN LOCALLY | ||||
|       #      - name: run selfoss | ||||
|       #        run: | | ||||
|       #          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d | ||||
|       - name: coverage | ||||
|         run: | | ||||
|           ./gradlew :koverHtmlReport | ||||
| @@ -39,7 +40,8 @@ jobs: | ||||
|           retention-days: 1 | ||||
|           overwrite: true | ||||
|           include-hidden-files: true | ||||
|       - name: Clean | ||||
|         if: always() | ||||
|         run: | | ||||
|           docker compose -f .gitea/workflows/assets/docker-compose.yml stop | ||||
| #      TESTS ARE RUN LOCALLY | ||||
| #      - name: Clean | ||||
| #        if: always() | ||||
| #        run: | | ||||
| #          docker compose -f .gitea/workflows/assets/docker-compose.yml stop | ||||
|   | ||||
| @@ -16,6 +16,7 @@ jobs: | ||||
|         uses: actions/checkout@v4 | ||||
|         with: | ||||
|           fetch-depth: 0 | ||||
|           ref: master | ||||
|       - name: Config git | ||||
|         run: | | ||||
|           git config --global user.email aminecmi+giteadrone@pm.me | ||||
| @@ -50,7 +51,7 @@ jobs: | ||||
|           followtags: true | ||||
|           ssh_key: ${{ secrets.PRIVATE_KEY }} | ||||
|           tags: true | ||||
|           branch: release | ||||
|           branch: master | ||||
|       - name: copy file via ssh password | ||||
|         uses: appleboy/scp-action@v0.1.7 | ||||
|         with: | ||||
|   | ||||
| @@ -3,6 +3,7 @@ on: | ||||
|   pull_request: | ||||
|     branches: | ||||
|       - master | ||||
|       - chore-crowdin-ci | ||||
|  | ||||
| jobs: | ||||
|   Lint: | ||||
| @@ -23,6 +24,56 @@ jobs: | ||||
|         run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' | ||||
|       - name: Detecting... | ||||
|         run: ./detekt-cli-1.23.7/bin/detekt-cli -c detekt.yml --excludes '**/shared/build/**/*.kt' | ||||
|   translations: | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|       - name: Check out repository code | ||||
|         uses: actions/checkout@v4 | ||||
|       - name: upload translation sources | ||||
|         uses: crowdin/github-action@v2 | ||||
|         with: | ||||
|           config: './.gitea/workflows/assets/crowdin.yml' | ||||
|           upload_sources: true | ||||
|           upload_translations: false | ||||
|           download_translations: false | ||||
|           create_pull_request: false | ||||
|           push_translations: false | ||||
|         env: | ||||
|           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }} | ||||
|           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} | ||||
|       - name: wait | ||||
|         run: sleep 10s | ||||
|       - name: download translations | ||||
|         uses: crowdin/github-action@v2 | ||||
|         with: | ||||
|           config: './.gitea/workflows/assets/crowdin.yml' | ||||
|           upload_sources: false | ||||
|           upload_translations: false | ||||
|           download_translations: true | ||||
|           create_pull_request: false | ||||
|           push_translations: false | ||||
|         env: | ||||
|           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }} | ||||
|           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} | ||||
|       - name: Check for uncommitted changes | ||||
|         id: check-changes | ||||
|         uses: mskri/check-uncommitted-changes-action@v1.0.1 | ||||
|       - name: Commit Changes | ||||
|         if: steps.check-changes.outputs.changes != '' | ||||
|         run: | | ||||
|           git config --global user.email aminecmi+giteadrone@pm.me | ||||
|           git config --global user.name giteadrone | ||||
|           git add ./androidApp/src/main/res/* | ||||
|           git commit -m "translation: translation files" | ||||
|       - name: Push changes | ||||
|         if: steps.check-changes.outputs.changes != '' | ||||
|         uses: appleboy/git-push-action@v1.0.0 | ||||
|         with: | ||||
|           author_name: giteadrone | ||||
|           author_email: aminecmi+giteadrone@pm.me | ||||
|           remote: ${{ secrets.REMOTE_URL }} | ||||
|           ssh_key: ${{ secrets.PRIVATE_KEY }} | ||||
|           branch: ${{ github.head_ref || github.ref_name }} | ||||
|   build: | ||||
|     needs: Lint | ||||
|     uses: ./.gitea/workflows/common_build.yml | ||||
|   | ||||
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -324,3 +324,5 @@ crowdin.properties | ||||
|  | ||||
| .kotlin/ | ||||
| build-cache/ | ||||
|  | ||||
| act | ||||
|   | ||||
							
								
								
									
										55
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										55
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,3 +1,58 @@ | ||||
| **v125020581 | ||||
|  | ||||
| - fix: url can be empty ? | ||||
| - Changelog for v125020471 | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v125020471 | ||||
|  | ||||
| - chore: no more docker-compose. | ||||
| - bump: gradle plugin. | ||||
| - Merge pull request 'fix: check index exists.' (#183) from fix-index into master | ||||
| - fix: check index exists. | ||||
| - Changelog for v125020411 | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v125020411 | ||||
|  | ||||
| - Merge pull request 'bump' (#182) from bump into master | ||||
| - chore: non transiant R classes. | ||||
| - Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master | ||||
| - bump | ||||
| - fix: One more missing context. | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v125010241 | ||||
|  | ||||
| - Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master | ||||
| - refactor: context fragments issues. | ||||
| - logs: Context issues. | ||||
| - fix: Handle empty url issue, again. | ||||
| - fix: Link not opening. | ||||
| - Changelog for v125010201 | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v125010201 | ||||
|  | ||||
| - fix: Handle empty url issue. | ||||
| - Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master | ||||
| - chore: changing actions in reader fragment. | ||||
| - Changelog for v125010131 | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v125010131 | ||||
|  | ||||
| - fix: reload the adapter when it's needed. Fixes #128. (#176) | ||||
| - feat: basic auth and images loading. Fixes #172. (#175) | ||||
| - Changelog for v125010111 | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v125010111 | ||||
|  | ||||
| - Debug trying to fix context issues. (#174) | ||||
|   | ||||
| @@ -156,7 +156,7 @@ dependencies { | ||||
|     implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0") | ||||
|  | ||||
|     // Themes | ||||
|     implementation("com.github.rubensousa:floatingtoolbar:1.5.1") | ||||
|     implementation("com.leinardi.android:speed-dial:3.3.0") | ||||
|  | ||||
|     // Pager | ||||
|     implementation("me.relex:circleindicator:2.1.6") | ||||
|   | ||||
| @@ -56,7 +56,7 @@ class HomeActivityTest { | ||||
|     fun testMenuActions() { | ||||
|         onView(withId(R.id.action_search)).perform(click()) | ||||
|         onView( | ||||
|             withId(R.id.search_src_text), | ||||
|             withId(com.google.android.material.R.id.search_src_text), | ||||
|         ).check(matches(isFocused())) | ||||
|         onView(isRoot()).perform(ViewActions.pressBack()) | ||||
|  | ||||
|   | ||||
| @@ -65,19 +65,6 @@ class SettingsActivityGeneralTest { | ||||
|                 ), | ||||
|             ), | ||||
|         ) | ||||
|         onView(withSettingsCheckboxWidget(R.string.reader_static_bar_title)).check( | ||||
|             matches( | ||||
|                 allOf( | ||||
|                     isDisplayed(), | ||||
|                     not(isChecked()), | ||||
|                 ), | ||||
|             ), | ||||
|         ) | ||||
|         onView(withSettingsCheckboxFrame(R.string.reader_static_bar_title)).check( | ||||
|             matches( | ||||
|                 isEnabled(), | ||||
|             ), | ||||
|         ) | ||||
|         onView(withText(R.string.pref_general_category_displaying)).check(matches(isDisplayed())) | ||||
|         onView(withSettingsCheckboxWidget(R.string.pref_switch_card_view_title)).check( | ||||
|             matches( | ||||
| @@ -161,19 +148,6 @@ class SettingsActivityGeneralTest { | ||||
|  | ||||
|     @Test | ||||
|     fun testGeneralActionsCheckboxes() { | ||||
|         // article viewer settings | ||||
|         onView(withSettingsCheckboxFrame(R.string.reader_static_bar_title)).check( | ||||
|             matches( | ||||
|                 isEnabled(), | ||||
|             ), | ||||
|         ) | ||||
|         onView(withSettingsCheckboxWidget(R.string.pref_article_viewer_title)).perform(click()) | ||||
|         onView(withSettingsCheckboxFrame(R.string.reader_static_bar_title)).check( | ||||
|             matches( | ||||
|                 not(isEnabled()), | ||||
|             ), | ||||
|         ) | ||||
|  | ||||
|         onView(withSettingsCheckboxFrame(R.string.card_height_title)).check(matches(not(isEnabled()))) | ||||
|         onView(withSettingsCheckboxWidget(R.string.pref_switch_card_view_title)).perform(click()) | ||||
|         onView(withSettingsCheckboxFrame(R.string.card_height_title)).check(matches(isEnabled())) | ||||
|   | ||||
| @@ -31,7 +31,7 @@ import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity | ||||
| import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask | ||||
| import bou.amine.apps.readerforselfossv2.model.SelfossModel | ||||
| import bou.amine.apps.readerforselfossv2.repository.Repository | ||||
| import bou.amine.apps.readerforselfossv2.service.AppSettingsService | ||||
| @@ -599,7 +599,7 @@ class HomeActivity : | ||||
|     override fun onOptionsItemSelected(item: MenuItem): Boolean { | ||||
|         when (item.itemId) { | ||||
|             R.id.issue_tracker -> { | ||||
|                 baseContext.openUrlInBrowser(AppSettingsService.BUG_URL) | ||||
|                 baseContext.openUrlInBrowserAsNewTask(AppSettingsService.BUG_URL) | ||||
|                 return true | ||||
|             } | ||||
|  | ||||
|   | ||||
| @@ -161,12 +161,14 @@ class ReaderActivity : | ||||
|                     override fun onPageSelected(position: Int) { | ||||
|                         super.onPageSelected(position) | ||||
|  | ||||
|                         if (allItems[position].starred) { | ||||
|                             canRemoveFromFavorite() | ||||
|                         } else { | ||||
|                             canFavorite() | ||||
|                         if (!allItems.isNullOrEmpty() && allItems.size >= position) { | ||||
|                             if (allItems[position].starred) { | ||||
|                                 canRemoveFromFavorite() | ||||
|                             } else { | ||||
|                                 canFavorite() | ||||
|                             } | ||||
|                             readItem(allItems[position]) | ||||
|                         } | ||||
|                         readItem(allItems[position]) | ||||
|                     } | ||||
|                 }, | ||||
|             ) | ||||
|   | ||||
| @@ -6,9 +6,8 @@ import android.content.Intent | ||||
| import android.view.LayoutInflater | ||||
| import android.view.View | ||||
| import android.view.ViewGroup | ||||
| import android.widget.Button | ||||
| import android.widget.Toast | ||||
| import androidx.constraintlayout.widget.ConstraintLayout | ||||
| import androidx.appcompat.app.AlertDialog | ||||
| import androidx.recyclerview.widget.RecyclerView | ||||
| import bou.amine.apps.readerforselfossv2.android.R | ||||
| import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity | ||||
| @@ -32,69 +31,21 @@ class SourcesListAdapter( | ||||
|     private val items: ArrayList<SelfossModel.SourceDetail>, | ||||
| ) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(), | ||||
|     DIAware { | ||||
|     private val c: Context = app.baseContext | ||||
|     private lateinit var binding: SourceListItemBinding | ||||
|  | ||||
|     override val di: DI by closestDI(app) | ||||
|     private val repository: Repository by instance() | ||||
|     private val appSettingsService: AppSettingsService by instance() | ||||
|  | ||||
|     override fun onCreateViewHolder( | ||||
|         parent: ViewGroup, | ||||
|         viewType: Int, | ||||
|     ): ViewHolder { | ||||
|         binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) | ||||
|         return ViewHolder(binding.root) | ||||
|         val binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) | ||||
|         return ViewHolder(binding) | ||||
|     } | ||||
|  | ||||
|     override fun onBindViewHolder( | ||||
|         holder: ViewHolder, | ||||
|         position: Int, | ||||
|     ) { | ||||
|         val itm = items[position] | ||||
|  | ||||
|         val deleteBtn: Button = holder.mView.findViewById(R.id.deleteBtn) | ||||
|  | ||||
|         deleteBtn.setOnClickListener { | ||||
|             val (id, title) = items[position] | ||||
|             CoroutineScope(Dispatchers.IO).launch { | ||||
|                 val successfullyDeletedSource = repository.deleteSource(id, title) | ||||
|                 if (successfullyDeletedSource) { | ||||
|                     items.removeAt(position) | ||||
|                     notifyItemRemoved(position) | ||||
|                     notifyItemRangeChanged(position, itemCount) | ||||
|                 } else { | ||||
|                     Toast | ||||
|                         .makeText( | ||||
|                             app, | ||||
|                             R.string.can_delete_source, | ||||
|                             Toast.LENGTH_SHORT, | ||||
|                         ).show() | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         holder.mView.setOnClickListener { | ||||
|             val source = items[position] | ||||
|  | ||||
|             repository.setSelectedSource(source) | ||||
|             app.startActivity(Intent(app, UpsertSourceActivity::class.java)) | ||||
|         } | ||||
|  | ||||
|         if (itm.getIcon(repository.baseUrl).isEmpty()) { | ||||
|             binding.itemImage.setBackgroundAndText(itm.title.getHtmlDecoded()) | ||||
|         } else { | ||||
|             c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage, appSettingsService) | ||||
|         } | ||||
|  | ||||
|         if (!itm.error.isNullOrBlank()) { | ||||
|             binding.errorText.visibility = View.VISIBLE | ||||
|             binding.errorText.text = itm.error | ||||
|         } else { | ||||
|             binding.errorText.visibility = View.GONE | ||||
|         } | ||||
|  | ||||
|         binding.sourceTitle.text = itm.title.getHtmlDecoded() | ||||
|         holder.bind(items[position], position) | ||||
|     } | ||||
|  | ||||
|     override fun getItemId(position: Int) = position.toLong() | ||||
| @@ -104,6 +55,72 @@ class SourcesListAdapter( | ||||
|     override fun getItemCount(): Int = items.size | ||||
|  | ||||
|     inner class ViewHolder( | ||||
|         val mView: ConstraintLayout, | ||||
|     ) : RecyclerView.ViewHolder(mView) | ||||
|         val binding: SourceListItemBinding, | ||||
|     ) : RecyclerView.ViewHolder(binding.root) { | ||||
|         private val context: Context = app.applicationContext | ||||
|         private val repository: Repository by instance() | ||||
|         private val appSettingsService: AppSettingsService by instance() | ||||
|  | ||||
|         fun bind( | ||||
|             source: SelfossModel.SourceDetail, | ||||
|             position: Int, | ||||
|         ) { | ||||
|             binding.apply { | ||||
|                 sourceTitle.text = source.title.getHtmlDecoded() | ||||
|                 if (source.getIcon(repository.baseUrl).isEmpty()) { | ||||
|                     itemImage.setBackgroundAndText(source.title.getHtmlDecoded()) | ||||
|                 } else { | ||||
|                     context.circularDrawable(source.getIcon(repository.baseUrl), itemImage, appSettingsService) | ||||
|                 } | ||||
|  | ||||
|                 errorText.apply { | ||||
|                     visibility = if (!source.error.isNullOrBlank()) View.VISIBLE else View.GONE | ||||
|                     text = source.error | ||||
|                 } | ||||
|  | ||||
|                 deleteBtn.setOnClickListener { showDeleteConfirmationDialog(source, position) } | ||||
|  | ||||
|                 root.setOnClickListener { | ||||
|                     repository.setSelectedSource(source) | ||||
|                     app.startActivity(Intent(app, UpsertSourceActivity::class.java)) | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private fun showDeleteConfirmationDialog( | ||||
|             source: SelfossModel.SourceDetail, | ||||
|             position: Int, | ||||
|         ) { | ||||
|             AlertDialog | ||||
|                 .Builder(app) | ||||
|                 .setTitle(app.getString(R.string.confirm_delete_title)) | ||||
|                 .setMessage(app.getString(R.string.confirm_delete_message, source.title)) | ||||
|                 .setPositiveButton(android.R.string.ok) { _, _ -> deleteSource(source, position) } | ||||
|                 .setNegativeButton(android.R.string.cancel, null) | ||||
|                 .show() | ||||
|         } | ||||
|  | ||||
|         private fun deleteSource( | ||||
|             source: SelfossModel.SourceDetail, | ||||
|             position: Int, | ||||
|         ) { | ||||
|             CoroutineScope(Dispatchers.IO).launch { | ||||
|                 val successfullyDeletedSource = repository.deleteSource(source.id, source.title) | ||||
|                 launch(Dispatchers.Main) { | ||||
|                     if (successfullyDeletedSource) { | ||||
|                         items.removeAt(position) | ||||
|                         notifyItemRemoved(position) | ||||
|                         notifyItemRangeChanged(position, itemCount) | ||||
|                     } else { | ||||
|                         Toast | ||||
|                             .makeText( | ||||
|                                 app, | ||||
|                                 R.string.can_delete_source, | ||||
|                                 Toast.LENGTH_SHORT, | ||||
|                             ).show() | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -2,18 +2,14 @@ package bou.amine.apps.readerforselfossv2.android.fragments | ||||
|  | ||||
| import android.content.Context | ||||
| import android.content.Intent | ||||
| import android.content.res.ColorStateList | ||||
| import android.content.res.TypedArray | ||||
| import android.graphics.Bitmap | ||||
| import android.graphics.Typeface | ||||
| import android.graphics.drawable.ColorDrawable | ||||
| import android.os.Bundle | ||||
| import android.util.TypedValue | ||||
| import android.util.TypedValue.DATA_NULL_UNDEFINED | ||||
| import android.view.GestureDetector | ||||
| import android.view.InflateException | ||||
| import android.view.LayoutInflater | ||||
| import android.view.MenuItem | ||||
| import android.view.MotionEvent | ||||
| import android.view.View | ||||
| import android.view.ViewGroup | ||||
| @@ -23,7 +19,6 @@ import android.webkit.WebView | ||||
| import android.webkit.WebViewClient | ||||
| import android.widget.Toast | ||||
| import androidx.appcompat.app.AlertDialog | ||||
| import androidx.core.widget.NestedScrollView | ||||
| import androidx.fragment.app.Fragment | ||||
| import bou.amine.apps.readerforselfossv2.android.ImageActivity | ||||
| import bou.amine.apps.readerforselfossv2.android.R | ||||
| @@ -32,12 +27,15 @@ import bou.amine.apps.readerforselfossv2.android.model.ParecelableItem | ||||
| import bou.amine.apps.readerforselfossv2.android.model.toModel | ||||
| import bou.amine.apps.readerforselfossv2.android.model.toParcelable | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.bottombar.addHomeMadeActionItem | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.getColorFromAttr | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapFitCenter | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.glide.getGlideImageForResource | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.shareLink | ||||
| import bou.amine.apps.readerforselfossv2.model.MercuryModel | ||||
| import bou.amine.apps.readerforselfossv2.model.SelfossModel | ||||
| @@ -48,8 +46,7 @@ import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded | ||||
| import bou.amine.apps.readerforselfossv2.utils.getImages | ||||
| import bou.amine.apps.readerforselfossv2.utils.getThumbnail | ||||
| import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString | ||||
| import com.github.rubensousa.floatingtoolbar.FloatingToolbar | ||||
| import com.google.android.material.floatingactionbutton.FloatingActionButton | ||||
| import com.leinardi.android.speeddial.SpeedDialView | ||||
| import kotlinx.coroutines.CoroutineScope | ||||
| import kotlinx.coroutines.Dispatchers | ||||
| import kotlinx.coroutines.launch | ||||
| @@ -74,15 +71,17 @@ private const val DEFAULT_FONT_SIZE = 16 | ||||
| class ArticleFragment : | ||||
|     Fragment(), | ||||
|     DIAware { | ||||
|     private var colorOnSurface: Int = 0 | ||||
|     private var colorSurface: Int = 0 | ||||
|     private var fontSize: Int = DEFAULT_FONT_SIZE | ||||
|     private lateinit var item: SelfossModel.Item | ||||
|     private lateinit var url: String | ||||
|     private var url: String? = null | ||||
|     private lateinit var contentText: String | ||||
|     private lateinit var contentSource: String | ||||
|     private lateinit var contentImage: String | ||||
|     private lateinit var contentTitle: String | ||||
|     private lateinit var allImages: ArrayList<String> | ||||
|     private lateinit var fab: FloatingActionButton | ||||
|     private lateinit var fab: SpeedDialView | ||||
|     private lateinit var textAlignment: String | ||||
|     private lateinit var binding: FragmentArticleBinding | ||||
|  | ||||
| @@ -93,7 +92,6 @@ class ArticleFragment : | ||||
|     private var typeface: Typeface? = null | ||||
|     private var resId: Int = 0 | ||||
|     private var font = "" | ||||
|     private var staticBar = false | ||||
|  | ||||
|     private val mercuryApi: MercuryApi by instance() | ||||
|  | ||||
| @@ -120,6 +118,9 @@ class ArticleFragment : | ||||
|                 e.sendSilentlyWithAcra() | ||||
|             } | ||||
|  | ||||
|             colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface) | ||||
|             colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface) | ||||
|  | ||||
|             contentText = item.content | ||||
|             contentTitle = item.title.getHtmlDecoded() | ||||
|             contentImage = item.getThumbnail(repository.baseUrl) | ||||
| @@ -133,23 +134,11 @@ class ArticleFragment : | ||||
|             allImages = item.getImages() | ||||
|  | ||||
|             fontSize = appSettingsService.getFontSize() | ||||
|             staticBar = appSettingsService.isStaticBarEnabled() | ||||
|             font = appSettingsService.getFont() | ||||
|  | ||||
|             refreshAlignment() | ||||
|  | ||||
|             fab = binding.fab | ||||
|  | ||||
|             fab.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.colorAccent)) | ||||
|  | ||||
|             fab.rippleColor = resources.getColor(R.color.colorAccentDark) | ||||
|  | ||||
|             val floatingToolbar: FloatingToolbar = handleFloatingToolbar() | ||||
|  | ||||
|             if (staticBar) { | ||||
|                 fab.hide() | ||||
|                 floatingToolbar.show() | ||||
|             } | ||||
|             handleFloatingToolbar() | ||||
|  | ||||
|             binding.source.text = contentSource | ||||
|             if (typeface != null) { | ||||
| @@ -157,28 +146,13 @@ class ArticleFragment : | ||||
|             } | ||||
|  | ||||
|             handleContent() | ||||
|  | ||||
|             binding.nestedScrollView.setOnScrollChangeListener( | ||||
|                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY -> | ||||
|                     if (scrollY > oldScrollY) { | ||||
|                         floatingToolbar.hide() | ||||
|                         fab.hide() | ||||
|                     } else { | ||||
|                         if (staticBar) { | ||||
|                             floatingToolbar.show() | ||||
|                         } else { | ||||
|                             if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show() | ||||
|                         } | ||||
|                     } | ||||
|                 }, | ||||
|             ) | ||||
|         } catch (e: InflateException) { | ||||
|             e.sendSilentlyWithAcraWithName("webview not available") | ||||
|             try { | ||||
|             maybeIfContext { | ||||
|                 AlertDialog | ||||
|                     .Builder(requireContext()) | ||||
|                     .setMessage(requireContext().getString(R.string.webview_dialog_issue_message)) | ||||
|                     .setTitle(requireContext().getString(R.string.webview_dialog_issue_title)) | ||||
|                     .Builder(it) | ||||
|                     .setMessage(it.getString(R.string.webview_dialog_issue_message)) | ||||
|                     .setTitle(it.getString(R.string.webview_dialog_issue_title)) | ||||
|                     .setPositiveButton( | ||||
|                         android.R.string.ok, | ||||
|                     ) { _, _ -> | ||||
| @@ -186,8 +160,6 @@ class ArticleFragment : | ||||
|                         requireActivity().finish() | ||||
|                     }.create() | ||||
|                     .show() | ||||
|             } catch (e: IllegalStateException) { | ||||
|                 e.sendSilentlyWithAcraWithName("Context required is null") | ||||
|             } | ||||
|         } | ||||
|  | ||||
| @@ -196,8 +168,8 @@ class ArticleFragment : | ||||
|  | ||||
|     private fun handleContent() { | ||||
|         if (contentText.isEmptyOrNullOrNullString()) { | ||||
|             if (repository.isNetworkAvailable()) { | ||||
|                 getContentFromMercury() | ||||
|             if (repository.isNetworkAvailable() && url.isUrlValid()) { | ||||
|                 getContentFromMercury(url!!) | ||||
|             } | ||||
|         } else { | ||||
|             binding.titleView.text = contentTitle | ||||
| @@ -209,67 +181,84 @@ class ArticleFragment : | ||||
|  | ||||
|             if (!contentImage.isEmptyOrNullOrNullString() && context != null) { | ||||
|                 binding.imageView.visibility = View.VISIBLE | ||||
|                 requireContext().bitmapFitCenter(contentImage, binding.imageView, appSettingsService) | ||||
|                 maybeIfContext { it.bitmapFitCenter(contentImage, binding.imageView, appSettingsService) } | ||||
|             } else { | ||||
|                 binding.imageView.visibility = View.GONE | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private fun handleFloatingToolbar(): FloatingToolbar { | ||||
|         val floatingToolbar: FloatingToolbar = binding.floatingToolbar | ||||
|         if (appSettingsService.getPublicAccess()) { | ||||
|             floatingToolbar.setMenu(R.menu.reader_toolbar_no_read) | ||||
|         } | ||||
|         floatingToolbar.attachFab(fab) | ||||
|     private fun handleFloatingToolbar() { | ||||
|         fab = binding.speedDial | ||||
|         fab.mainFabClosedIconColor = colorOnSurface | ||||
|         fab.mainFabOpenedIconColor = colorOnSurface | ||||
|  | ||||
|         floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent)) | ||||
|         maybeIfContext { handleFloatingToolbarActionItems(it) } | ||||
|  | ||||
|         floatingToolbar.setClickListener( | ||||
|             object : FloatingToolbar.ItemClickListener { | ||||
|                 override fun onItemClick(item: MenuItem) { | ||||
|                     when (item.itemId) { | ||||
|                         R.id.share_action -> requireActivity().shareLink(url, contentTitle) | ||||
|                         R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item) | ||||
|                         R.id.unread_action -> | ||||
|                             try { | ||||
|                                 if (this@ArticleFragment.item.unread) { | ||||
|                                     CoroutineScope(Dispatchers.IO).launch { | ||||
|                                         repository.markAsRead(this@ArticleFragment.item) | ||||
|                                     } | ||||
|                                     this@ArticleFragment.item.unread = false | ||||
|                                     Toast | ||||
|                                         .makeText( | ||||
|                                             requireContext(), | ||||
|                                             R.string.marked_as_read, | ||||
|                                             Toast.LENGTH_LONG, | ||||
|                                         ).show() | ||||
|                                 } else { | ||||
|                                     CoroutineScope(Dispatchers.IO).launch { | ||||
|                                         repository.unmarkAsRead(this@ArticleFragment.item) | ||||
|                                     } | ||||
|                                     this@ArticleFragment.item.unread = true | ||||
|                                     Toast | ||||
|                                         .makeText( | ||||
|                                             context, | ||||
|                                             R.string.marked_as_unread, | ||||
|                                             Toast.LENGTH_LONG, | ||||
|                                         ).show() | ||||
|                                 } | ||||
|                             } catch (e: IllegalStateException) { | ||||
|                                 e.sendSilentlyWithAcraWithName("Context required is null") | ||||
|                             } | ||||
|  | ||||
|                         else -> Unit | ||||
|         fab.setOnActionSelectedListener { actionItem -> | ||||
|             when (actionItem.id) { | ||||
|                 R.id.share_action -> requireActivity().shareLink(url, contentTitle) | ||||
|                 R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item) | ||||
|                 R.id.unread_action -> | ||||
|                     if (this@ArticleFragment.item.unread) { | ||||
|                         CoroutineScope(Dispatchers.IO).launch { | ||||
|                             repository.markAsRead(this@ArticleFragment.item) | ||||
|                         } | ||||
|                         this@ArticleFragment.item.unread = false | ||||
|                         maybeIfContext { | ||||
|                             Toast | ||||
|                                 .makeText( | ||||
|                                     it, | ||||
|                                     R.string.marked_as_read, | ||||
|                                     Toast.LENGTH_LONG, | ||||
|                                 ).show() | ||||
|                         } | ||||
|                     } else { | ||||
|                         CoroutineScope(Dispatchers.IO).launch { | ||||
|                             repository.unmarkAsRead(this@ArticleFragment.item) | ||||
|                         } | ||||
|                         this@ArticleFragment.item.unread = true | ||||
|                         maybeIfContext { | ||||
|                             Toast | ||||
|                                 .makeText( | ||||
|                                     it, | ||||
|                                     R.string.marked_as_unread, | ||||
|                                     Toast.LENGTH_LONG, | ||||
|                                 ).show() | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                 override fun onItemLongClick(item: MenuItem?) { | ||||
|                     // We do nothing | ||||
|                 } | ||||
|             }, | ||||
|                 else -> Unit | ||||
|             } | ||||
|             false | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private fun handleFloatingToolbarActionItems(c: Context) { | ||||
|         fab.addHomeMadeActionItem( | ||||
|             R.id.share_action, | ||||
|             resources.getDrawable(R.drawable.ic_share_white_24dp), | ||||
|             R.string.reader_action_share, | ||||
|             colorOnSurface, | ||||
|             colorSurface, | ||||
|             c, | ||||
|         ) | ||||
|         fab.addHomeMadeActionItem( | ||||
|             R.id.open_action, | ||||
|             resources.getDrawable(R.drawable.ic_open_in_browser_white_24dp), | ||||
|             R.string.reader_action_open, | ||||
|             colorOnSurface, | ||||
|             colorSurface, | ||||
|             c, | ||||
|         ) | ||||
|         fab.addHomeMadeActionItem( | ||||
|             R.id.unread_action, | ||||
|             resources.getDrawable(R.drawable.ic_baseline_white_eye_24dp), | ||||
|             R.string.unmark, | ||||
|             colorOnSurface, | ||||
|             colorSurface, | ||||
|             c, | ||||
|         ) | ||||
|         return floatingToolbar | ||||
|     } | ||||
|  | ||||
|     private fun refreshAlignment() { | ||||
| @@ -282,7 +271,7 @@ class ArticleFragment : | ||||
|     } | ||||
|  | ||||
|     @Suppress("detekt:SwallowedException") | ||||
|     private fun getContentFromMercury() { | ||||
|     private fun getContentFromMercury(url: String) { | ||||
|         binding.progressBar.visibility = View.VISIBLE | ||||
|  | ||||
|         CoroutineScope(Dispatchers.Main).launch { | ||||
| @@ -321,9 +310,11 @@ class ArticleFragment : | ||||
|     } | ||||
|  | ||||
|     private fun handleLeadImage(leadImageUrl: String?) { | ||||
|         if (!leadImageUrl.isNullOrEmpty() && context != null) { | ||||
|             binding.imageView.visibility = View.VISIBLE | ||||
|             requireContext().bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService) | ||||
|         if (!leadImageUrl.isNullOrEmpty()) { | ||||
|             maybeIfContext { | ||||
|                 binding.imageView.visibility = View.VISIBLE | ||||
|                 it.bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService) | ||||
|             } | ||||
|         } else { | ||||
|             binding.imageView.visibility = View.GONE | ||||
|         } | ||||
| @@ -337,11 +328,10 @@ class ArticleFragment : | ||||
|                     view: WebView?, | ||||
|                     url: String, | ||||
|                 ): Boolean = | ||||
|                     if (context != null && | ||||
|                         url.isUrlValid() && | ||||
|                     if (url.isUrlValid() && | ||||
|                         binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE | ||||
|                     ) { | ||||
|                         requireContext().openUrlInBrowser(url) | ||||
|                         maybeIfContext { it.openUrlInBrowserAsNewTask(url) } | ||||
|                         true | ||||
|                     } else { | ||||
|                         false | ||||
| @@ -384,50 +374,33 @@ class ArticleFragment : | ||||
|  | ||||
|     @Suppress("detekt:LongMethod", "detekt:ImplicitDefaultLocale") | ||||
|     private fun htmlToWebview() { | ||||
|         val context: Context | ||||
|         try { | ||||
|             context = requireContext() | ||||
|         } catch (e: IllegalStateException) { | ||||
|             e.sendSilentlyWithAcraWithName("Context required is null") | ||||
|             return | ||||
|         } | ||||
|  | ||||
|         val colorOnSurface = TypedValue() | ||||
|         val colorSurface = TypedValue() | ||||
|  | ||||
|         try { | ||||
|         maybeIfContext { | ||||
|             val attrs: IntArray = intArrayOf(android.R.attr.fontFamily) | ||||
|             val a: TypedArray = context.obtainStyledAttributes(resId, attrs) | ||||
|             val a: TypedArray = it.obtainStyledAttributes(resId, attrs) | ||||
|  | ||||
|             binding.webcontent.settings.standardFontFamily = a.getString(0) | ||||
|             binding.webcontent.visibility = View.VISIBLE | ||||
|  | ||||
|             context.theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true) | ||||
|  | ||||
|             context.theme.resolveAttribute(R.attr.colorSurface, colorSurface, true) | ||||
|         } catch (e: IllegalStateException) { | ||||
|             e.sendSilentlyWithAcraWithName("Context issue when setting attributes, but context wasn't null before") | ||||
|             "" | ||||
|         } | ||||
|         binding.webcontent.visibility = View.VISIBLE | ||||
|  | ||||
|         val colorSurfaceString = | ||||
|             String.format( | ||||
|                 "#%06X", | ||||
|                 WHITE_COLOR_HEX and (if (colorSurface.data != DATA_NULL_UNDEFINED) colorSurface.data else WHITE_COLOR_HEX), | ||||
|                 WHITE_COLOR_HEX and (if (colorSurface != DATA_NULL_UNDEFINED) colorSurface else WHITE_COLOR_HEX), | ||||
|             ) | ||||
|  | ||||
|         val colorOnSurfaceString = | ||||
|             String.format( | ||||
|                 "#%06X", | ||||
|                 WHITE_COLOR_HEX and (if (colorOnSurface.data != DATA_NULL_UNDEFINED) colorOnSurface.data else 0), | ||||
|                 WHITE_COLOR_HEX and (if (colorOnSurface != DATA_NULL_UNDEFINED) colorOnSurface else 0), | ||||
|             ) | ||||
|  | ||||
|         binding.webcontent.settings.useWideViewPort = true | ||||
|         binding.webcontent.settings.loadWithOverviewMode = true | ||||
|         binding.webcontent.settings.javaScriptEnabled = false | ||||
|  | ||||
|         handleImageLoading() | ||||
|         try { | ||||
|             binding.webcontent.settings.useWideViewPort = true | ||||
|             binding.webcontent.settings.loadWithOverviewMode = true | ||||
|             binding.webcontent.settings.javaScriptEnabled = false | ||||
|  | ||||
|             handleImageLoading() | ||||
|  | ||||
|             val gestureDetector = | ||||
|                 GestureDetector( | ||||
|                     activity, | ||||
| @@ -441,49 +414,50 @@ class ArticleFragment : | ||||
|                     event, | ||||
|                 ) | ||||
|             } | ||||
|  | ||||
|             binding.webcontent.settings.layoutAlgorithm = | ||||
|                 WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING | ||||
|         } catch (e: IllegalStateException) { | ||||
|             e.sendSilentlyWithAcraWithName("Context is null but wasn't, and that's causing issues with webview config") | ||||
|             e.sendSilentlyWithAcraWithName("Gesture detector issue ?") | ||||
|             return | ||||
|         } | ||||
|  | ||||
|         try { | ||||
|             var baseUrl: String? = null | ||||
|             try { | ||||
|                 val itemUrl = URL(url) | ||||
|                 baseUrl = itemUrl.protocol + "://" + itemUrl.host | ||||
|             } catch (e: MalformedURLException) { | ||||
|                 e.sendSilentlyWithAcraWithName("htmlToWebview > $url") | ||||
|             } | ||||
|         binding.webcontent.settings.layoutAlgorithm = | ||||
|             WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING | ||||
|  | ||||
|             val fontName = | ||||
|         var baseUrl: String? = null | ||||
|         try { | ||||
|             val itemUrl = URL(url.orEmpty()) | ||||
|             baseUrl = itemUrl.protocol + "://" + itemUrl.host | ||||
|         } catch (e: MalformedURLException) { | ||||
|             e.sendSilentlyWithAcraWithName("htmlToWebview > ${url.orEmpty()}") | ||||
|         } | ||||
|  | ||||
|         val fontName: String = | ||||
|             maybeIfContext { | ||||
|                 when (font) { | ||||
|                     getString(R.string.open_sans_font_id) -> "Open Sans" | ||||
|                     getString(R.string.roboto_font_id) -> "Roboto" | ||||
|                     getString(R.string.source_code_pro_font_id) -> "Source Code Pro" | ||||
|                     it.getString(R.string.open_sans_font_id) -> "Open Sans" | ||||
|                     it.getString(R.string.roboto_font_id) -> "Roboto" | ||||
|                     it.getString(R.string.source_code_pro_font_id) -> "Source Code Pro" | ||||
|                     else -> "" | ||||
|                 } | ||||
|             }?.toString().orEmpty() | ||||
|  | ||||
|             val fontLinkAndStyle = | ||||
|                 if (font.isNotEmpty()) { | ||||
|                     """<link href="https://fonts.googleapis.com/css?family=${ | ||||
|                         fontName.replace( | ||||
|                             " ", | ||||
|                             "+", | ||||
|                         ) | ||||
|                     }" rel="stylesheet"> | ||||
|         val fontLinkAndStyle = | ||||
|             if (fontName.isNotEmpty()) { | ||||
|                 """<link href="https://fonts.googleapis.com/css?family=${ | ||||
|                     fontName.replace( | ||||
|                         " ", | ||||
|                         "+", | ||||
|                     ) | ||||
|                 }" rel="stylesheet"> | ||||
|                 |<style> | ||||
|                 |   * { | ||||
|                 |       font-family: '$fontName'; | ||||
|                 |   } | ||||
|                 |</style> | ||||
|                     """.trimMargin() | ||||
|                 } else { | ||||
|                     "" | ||||
|                 } | ||||
|  | ||||
|                 """.trimMargin() | ||||
|             } else { | ||||
|                 "" | ||||
|             } | ||||
|         try { | ||||
|             binding.webcontent.loadDataWithBaseURL( | ||||
|                 baseUrl, | ||||
|                 """<html> | ||||
| @@ -500,7 +474,7 @@ class ArticleFragment : | ||||
|                 |        color: ${ | ||||
|                     String.format( | ||||
|                         "#%06X", | ||||
|                         WHITE_COLOR_HEX and context.resources.getColor(R.color.colorAccent), | ||||
|                         WHITE_COLOR_HEX and (maybeIfContext { it.resources.getColor(R.color.colorAccent) } as Int), | ||||
|                     ) | ||||
|                 } !important; | ||||
|                 |      } | ||||
| @@ -557,10 +531,8 @@ class ArticleFragment : | ||||
|  | ||||
|     private fun openInBrowserAfterFailing() { | ||||
|         binding.progressBar.visibility = View.GONE | ||||
|         try { | ||||
|             requireContext().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item) | ||||
|         } catch (e: IllegalStateException) { | ||||
|             e.sendSilentlyWithAcraWithName("Context required is null") | ||||
|         maybeIfContext { | ||||
|             it.openItemUrlInBrowserAsNewTask(this@ArticleFragment.item) | ||||
|         } | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,5 @@ | ||||
| package bou.amine.apps.readerforselfossv2.android.fragments | ||||
|  | ||||
| import android.content.Context | ||||
| import android.graphics.Color | ||||
| import android.graphics.drawable.Drawable | ||||
| import android.graphics.drawable.GradientDrawable | ||||
| @@ -17,6 +16,7 @@ import bou.amine.apps.readerforselfossv2.android.R | ||||
| import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.glide.imageIntoViewTarget | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext | ||||
| import bou.amine.apps.readerforselfossv2.repository.Repository | ||||
| import bou.amine.apps.readerforselfossv2.service.AppSettingsService | ||||
| import bou.amine.apps.readerforselfossv2.utils.getColorHexCode | ||||
| @@ -60,8 +60,8 @@ class FilterSheetFragment : | ||||
|  | ||||
|         try { | ||||
|             CoroutineScope(Dispatchers.Main).launch { | ||||
|                 handleTagChips(requireContext()) | ||||
|                 handleSourceChips(requireContext()) | ||||
|                 handleTagChips() | ||||
|                 handleSourceChips() | ||||
|  | ||||
|                 binding.progressBar2.visibility = GONE | ||||
|                 binding.filterView.visibility = VISIBLE | ||||
| @@ -79,29 +79,39 @@ class FilterSheetFragment : | ||||
|         return binding.root | ||||
|     } | ||||
|  | ||||
|     private suspend fun handleSourceChips(context: Context) { | ||||
|     private suspend fun handleSourceChips() { | ||||
|         val sourceGroup = binding.sourcesGroup | ||||
|  | ||||
|         repository.getSourcesDetailsOrStats().forEachIndexed { _, source -> | ||||
|             val c = Chip(context) | ||||
|             val c: Chip? = | ||||
|                 maybeIfContext { | ||||
|                     Chip(it) | ||||
|                 } as Chip? | ||||
|  | ||||
|             if (c == null) { | ||||
|                 return | ||||
|             } | ||||
|  | ||||
|             c.ellipsize = TextUtils.TruncateAt.END | ||||
|  | ||||
|             context.imageIntoViewTarget( | ||||
|                 source.getIcon(repository.baseUrl), | ||||
|                 object : ViewTarget<Chip?, Drawable?>(c) { | ||||
|                     override fun onResourceReady( | ||||
|                         resource: Drawable, | ||||
|                         transition: Transition<in Drawable?>?, | ||||
|                     ) { | ||||
|                         try { | ||||
|                             c.chipIcon = resource | ||||
|                         } catch (e: Exception) { | ||||
|                             e.sendSilentlyWithAcraWithName("sources > onResourceReady") | ||||
|             maybeIfContext { | ||||
|                 it.imageIntoViewTarget( | ||||
|                     source.getIcon(repository.baseUrl), | ||||
|                     object : ViewTarget<Chip?, Drawable?>(c) { | ||||
|                         override fun onResourceReady( | ||||
|                             resource: Drawable, | ||||
|                             transition: Transition<in Drawable?>?, | ||||
|                         ) { | ||||
|                             try { | ||||
|                                 c.chipIcon = resource | ||||
|                             } catch (e: Exception) { | ||||
|                                 e.sendSilentlyWithAcraWithName("sources > onResourceReady") | ||||
|                             } | ||||
|                         } | ||||
|                     } | ||||
|                 }, | ||||
|                 appSettingsService, | ||||
|             ) | ||||
|                     }, | ||||
|                     appSettingsService, | ||||
|                 ) | ||||
|             } | ||||
|  | ||||
|             c.text = source.title.getHtmlDecoded() | ||||
|  | ||||
| @@ -137,13 +147,17 @@ class FilterSheetFragment : | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private suspend fun handleTagChips(context: Context) { | ||||
|     private suspend fun handleTagChips() { | ||||
|         val tagGroup = binding.tagsGroup | ||||
|  | ||||
|         val tags = repository.getTags() | ||||
|  | ||||
|         tags.forEachIndexed { _, tag -> | ||||
|             val c = Chip(context) | ||||
|             val c: Chip? = maybeIfContext { Chip(it) } as Chip? | ||||
|             if (c == null) { | ||||
|                 return | ||||
|             } | ||||
|  | ||||
|             c.ellipsize = TextUtils.TruncateAt.END | ||||
|             c.text = tag.tag | ||||
|  | ||||
|   | ||||
| @@ -2,24 +2,60 @@ package bou.amine.apps.readerforselfossv2.android.utils | ||||
|  | ||||
| import android.content.Context | ||||
| import android.content.Intent | ||||
| import android.util.TypedValue | ||||
| import androidx.annotation.AttrRes | ||||
| import androidx.annotation.ColorInt | ||||
| import androidx.fragment.app.Fragment | ||||
| import bou.amine.apps.readerforselfossv2.android.R | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName | ||||
| import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp | ||||
|  | ||||
| fun Context.shareLink( | ||||
|     itemUrl: String, | ||||
|     itemUrl: String?, | ||||
|     itemTitle: String, | ||||
| ) { | ||||
|     val sendIntent = Intent() | ||||
|     sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK | ||||
|     sendIntent.action = Intent.ACTION_SEND | ||||
|     sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp()) | ||||
|     sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle) | ||||
|     sendIntent.type = "text/plain" | ||||
|     startActivity( | ||||
|         Intent | ||||
|             .createChooser( | ||||
|                 sendIntent, | ||||
|                 getString(R.string.share), | ||||
|             ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), | ||||
|     ) | ||||
|     if (itemUrl.isUrlValid()) { | ||||
|         val sendIntent = Intent() | ||||
|         sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK | ||||
|         sendIntent.action = Intent.ACTION_SEND | ||||
|         sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl!!.toStringUriWithHttp()) | ||||
|         sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle) | ||||
|         sendIntent.type = "text/plain" | ||||
|         startActivity( | ||||
|             Intent | ||||
|                 .createChooser( | ||||
|                     sendIntent, | ||||
|                     getString(R.string.share), | ||||
|                 ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), | ||||
|         ) | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ColorInt | ||||
| fun Fragment.getColorFromAttr( | ||||
|     @AttrRes attrColor: Int, | ||||
|     resolveRefs: Boolean = true, | ||||
| ): Int { | ||||
|     val typedValue = TypedValue() | ||||
|     maybeIfContextWithLog { this.requireContext().theme.resolveAttribute(attrColor, typedValue, resolveRefs) } | ||||
|     return typedValue.data | ||||
| } | ||||
|  | ||||
| @Suppress("detekt:SwallowedException") | ||||
| fun Fragment.maybeIfContext(fn: (Context) -> Any): Any? { | ||||
|     try { | ||||
|         return fn(this.requireContext()) | ||||
|     } catch (e: Exception) { | ||||
|         // Do nothing | ||||
|         return null | ||||
|     } | ||||
| } | ||||
|  | ||||
| fun Fragment.maybeIfContextWithLog(fn: (Context) -> Any): Any? { | ||||
|     try { | ||||
|         return fn(this.requireContext()) | ||||
|     } catch (e: Exception) { | ||||
|         e.sendSilentlyWithAcraWithName("Fragment context issue...") | ||||
|         return null | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -15,12 +15,12 @@ import android.widget.Toast | ||||
| import bou.amine.apps.readerforselfossv2.android.R | ||||
| import bou.amine.apps.readerforselfossv2.android.ReaderActivity | ||||
| import bou.amine.apps.readerforselfossv2.model.SelfossModel | ||||
| import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp | ||||
| import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString | ||||
| import okhttp3.HttpUrl.Companion.toHttpUrlOrNull | ||||
|  | ||||
| fun Context.openItemUrl( | ||||
|     currentItem: Int, | ||||
|     linkDecoded: String, | ||||
|     linkDecoded: String?, | ||||
|     articleViewer: Boolean, | ||||
|     app: Activity, | ||||
| ) { | ||||
| @@ -37,12 +37,13 @@ fun Context.openItemUrl( | ||||
|             intent.putExtra("currentItem", currentItem) | ||||
|             app.startActivity(intent) | ||||
|         } else { | ||||
|             this.openUrlInBrowserAsNewTask(linkDecoded) | ||||
|             this.openUrlInBrowserAsNewTask(linkDecoded!!) | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| fun String.isUrlValid(): Boolean = this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches() | ||||
| fun String?.isUrlValid(): Boolean = | ||||
|     !this.isEmptyOrNullOrNullString() && this!!.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches() | ||||
|  | ||||
| fun String.isBaseUrlInvalid(): Boolean { | ||||
|     val baseUrl = this.toHttpUrlOrNull() | ||||
| @@ -56,14 +57,16 @@ fun String.isBaseUrlInvalid(): Boolean { | ||||
| } | ||||
|  | ||||
| fun Context.openItemUrlInBrowserAsNewTask(i: SelfossModel.Item) { | ||||
|     this.openUrlInBrowserAsNewTask(i.getLinkDecoded().toStringUriWithHttp()) | ||||
|     this.openUrlInBrowserAsNewTask(i.getLinkDecoded()) | ||||
| } | ||||
|  | ||||
| fun Context.openUrlInBrowserAsNewTask(url: String) { | ||||
|     val intent = Intent(Intent.ACTION_VIEW) | ||||
|     intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK | ||||
|     intent.data = Uri.parse(url) | ||||
|     this.mayBeStartActivity(intent) | ||||
| fun Context.openUrlInBrowserAsNewTask(url: String?) { | ||||
|     if (url.isUrlValid()) { | ||||
|         val intent = Intent(Intent.ACTION_VIEW) | ||||
|         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK | ||||
|         intent.data = Uri.parse(url) | ||||
|         this.mayBeStartActivity(intent) | ||||
|     } | ||||
| } | ||||
|  | ||||
| fun Context.openUrlInBrowser(url: String) { | ||||
|   | ||||
| @@ -1,6 +1,13 @@ | ||||
| package bou.amine.apps.readerforselfossv2.android.utils.bottombar | ||||
|  | ||||
| import android.content.Context | ||||
| import android.graphics.drawable.Drawable | ||||
| import androidx.annotation.IdRes | ||||
| import androidx.annotation.StringRes | ||||
| import bou.amine.apps.readerforselfossv2.android.R | ||||
| import com.ashokvarma.bottomnavigation.TextBadgeItem | ||||
| import com.leinardi.android.speeddial.SpeedDialActionItem | ||||
| import com.leinardi.android.speeddial.SpeedDialView | ||||
|  | ||||
| fun TextBadgeItem.removeBadge(): TextBadgeItem { | ||||
|     this.setText("") | ||||
| @@ -9,3 +16,25 @@ fun TextBadgeItem.removeBadge(): TextBadgeItem { | ||||
| } | ||||
|  | ||||
| fun TextBadgeItem.maybeShow(): TextBadgeItem = if (this.isHidden) this.show() else this | ||||
|  | ||||
| @Suppress("detekt:LongParameterList") | ||||
| fun SpeedDialView.addHomeMadeActionItem( | ||||
|     @IdRes actionId: Int, | ||||
|     actionIcon: Drawable, | ||||
|     @StringRes labelId: Int, | ||||
|     colorOnSurface: Int, | ||||
|     colorSurface: Int, | ||||
|     context: Context, | ||||
| ) { | ||||
|     this.addActionItem( | ||||
|         SpeedDialActionItem | ||||
|             .Builder(actionId, actionIcon) | ||||
|             .setFabBackgroundColor(context.resources.getColor(R.color.colorAccent)) | ||||
|             .setFabImageTintColor(colorOnSurface) | ||||
|             .setLabel(context.getString(labelId)) | ||||
|             .setLabelClickable(false) | ||||
|             .setLabelBackgroundColor(colorOnSurface) | ||||
|             .setLabelColor(colorSurface) | ||||
|             .create(), | ||||
|     ) | ||||
| } | ||||
|   | ||||
| @@ -7,6 +7,7 @@ import android.webkit.WebView | ||||
| import android.widget.ImageView | ||||
| import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView | ||||
| import bou.amine.apps.readerforselfossv2.service.AppSettingsService | ||||
| import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString | ||||
| import com.bumptech.glide.Glide | ||||
| import com.bumptech.glide.load.engine.DiskCacheStrategy | ||||
| import com.bumptech.glide.load.model.GlideUrl | ||||
| @@ -22,8 +23,12 @@ import kotlin.io.encoding.ExperimentalEncodingApi | ||||
|  | ||||
| private const val PRELOAD_IMAGE_TIMEOUT = 10000 | ||||
|  | ||||
| @Suppress("detekt:ReturnCount") | ||||
| @OptIn(ExperimentalEncodingApi::class) | ||||
| fun String.toGlideUrl(appSettingsService: AppSettingsService): GlideUrl { | ||||
| fun String.toGlideUrl(appSettingsService: AppSettingsService): Any { // GlideUrl Or String | ||||
|     if (this.isEmptyOrNullOrNullString()) { | ||||
|         return "" | ||||
|     } | ||||
|     if (appSettingsService.getBasicUserName().isNotEmpty()) { | ||||
|         val authString = "${appSettingsService.getBasicUserName()}:${appSettingsService.getBasicPassword()}" | ||||
|         val authBuf = Base64.encode(authString.toByteArray(Charsets.UTF_8)) | ||||
|   | ||||
| @@ -71,35 +71,13 @@ | ||||
|  | ||||
|     </androidx.core.widget.NestedScrollView> | ||||
|  | ||||
|     <FrameLayout | ||||
|         android:layout_width="match_parent" | ||||
|     <com.leinardi.android.speeddial.SpeedDialView | ||||
|         android:id="@+id/speedDial" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_gravity="start|bottom|end" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent"> | ||||
|  | ||||
|         <com.github.rubensousa.floatingtoolbar.FloatingToolbar | ||||
|             android:id="@+id/floatingToolbar" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="?attr/actionBarSize" | ||||
|             android:layout_gravity="bottom" | ||||
|             app:floatingMenu="@menu/reader_toolbar" /> | ||||
|  | ||||
|         <com.google.android.material.floatingactionbutton.FloatingActionButton | ||||
|             android:id="@+id/fab" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_gravity="end|bottom" | ||||
|             android:layout_marginEnd="16dp" | ||||
|             android:layout_marginBottom="16dp" | ||||
|             android:paddingTop="@dimen/activity_vertical_margin" | ||||
|             android:paddingBottom="@dimen/activity_vertical_margin" | ||||
|             android:src="@drawable/ic_add_white_24dp" | ||||
|             app:backgroundTint="?attr/colorAccent" | ||||
|             app:fabSize="mini" | ||||
|             app:rippleColor="?attr/colorAccentDark" /> | ||||
|     </FrameLayout> | ||||
|         android:layout_gravity="bottom|end" | ||||
|         app:layout_behavior="@string/speeddial_scrolling_view_snackbar_behavior" | ||||
|         app:sdMainFabClosedSrc="@drawable/ic_add_white_24dp" /> | ||||
|  | ||||
|     <FrameLayout | ||||
|         android:id="@+id/progressBar" | ||||
| @@ -119,4 +97,5 @@ | ||||
|             android:progressTint="?attr/colorAccent" /> | ||||
|     </FrameLayout> | ||||
|  | ||||
|  | ||||
| </androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| @@ -1,23 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <menu xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/unread_action" | ||||
|         android:icon="@drawable/ic_baseline_white_eye_24dp" | ||||
|         android:title="@string/unmark" | ||||
|         app:showAsAction="ifRoom" /> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/open_action" | ||||
|         android:icon="@drawable/ic_open_in_browser_white_24dp" | ||||
|         android:title="@string/reader_action_open" | ||||
|         app:showAsAction="ifRoom" /> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/share_action" | ||||
|         android:icon="@drawable/ic_share_white_24dp" | ||||
|         android:title="@string/reader_action_share" | ||||
|         app:showAsAction="ifRoom" /> | ||||
|  | ||||
| </menu> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Quant a"</string> | ||||
|     <string name="marked_as_read">"Element llegit"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Linksbündig</string> | ||||
|     <string name="reader_text_align_justify">Blocksatz</string> | ||||
|     <string name="settings_reader_font">Schriftgröße im Lesemodus</string> | ||||
|     <string name="reader_static_bar_title">Statische untere Leiste im Lesemodus</string> | ||||
|     <string name="reader_static_bar_on">Die untere Leiste wird dauerhaft angezeigt</string> | ||||
|     <string name="reader_static_bar_off">Die untere Leiste kann über einen schwebenden Button angezeigt werden</string> | ||||
|     <string name="remove_source">Quelle entfernen</string> | ||||
|     <string name="pref_theme_title">Heller/Dunkler Modus</string> | ||||
|     <string name="mode_dark">Dunkler Modus</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Über"</string> | ||||
|     <string name="marked_as_read">"Artikel gelesen"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Alinear a la izquierda</string> | ||||
|     <string name="reader_text_align_justify">Justificado</string> | ||||
|     <string name="settings_reader_font">Modo lectura</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Acerca de"</string> | ||||
|     <string name="marked_as_read">"Artículo leído"</string> | ||||
|     <string name="marked_as_unread">"Artículo no leído"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Aligner à gauche</string> | ||||
|     <string name="reader_text_align_justify">Justifier le texte</string> | ||||
|     <string name="settings_reader_font">Police du lecteur d\'articles</string> | ||||
|     <string name="reader_static_bar_title">Barre statique pour le visionneur d\'articles</string> | ||||
|     <string name="reader_static_bar_on">La barre sera affichée</string> | ||||
|     <string name="reader_static_bar_off">La barre sera affichée grâce au bouton</string> | ||||
|     <string name="remove_source">Supprimer la source</string> | ||||
|     <string name="pref_theme_title">Thème Clair/Sombre</string> | ||||
|     <string name="mode_dark">Thème sombre</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"À propos"</string> | ||||
|     <string name="marked_as_read">"Marqué comme lu"</string> | ||||
|     <string name="marked_as_unread">"Marqué comme non lu"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Aliñar á esquerda</string> | ||||
|     <string name="reader_text_align_justify">Xustificado</string> | ||||
|     <string name="settings_reader_font">Modo lector</string> | ||||
|     <string name="reader_static_bar_title">Barra inferior estática na vista de artigos</string> | ||||
|     <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string> | ||||
|     <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string> | ||||
|     <string name="remove_source">Eliminar fonte</string> | ||||
|     <string name="pref_theme_title">Modo Claro/Escuro</string> | ||||
|     <string name="mode_dark">Modo escuro</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Acerca de"</string> | ||||
|     <string name="marked_as_read">"Elemento lido"</string> | ||||
|     <string name="marked_as_unread">"Elemento non lido"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Tentang"</string> | ||||
|     <string name="marked_as_read">"Membaca item"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Informazioni"</string> | ||||
|     <string name="marked_as_read">"Articolo letto"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"정보"</string> | ||||
|     <string name="marked_as_read">"항목 읽기"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -23,6 +23,7 @@ | ||||
|     <string name="wrong_infos">"Controleer de gegevens nogmaals."</string> | ||||
|     <string name="all_posts_not_read">"Fout bij markeren als gelezen"</string> | ||||
|     <string name="all_posts_read">"Alle artikelen gemarkeerd als gelezen"</string> | ||||
|     <string name="undo_string">"Ongedaan maken"</string> | ||||
|     <string name="addStringNoUrl">"Login om bronnen toe te voegen"</string> | ||||
|     <string name="cant_get_sources">"Kan de lijst met bronnen niet ophalen"</string> | ||||
|     <string name="cant_create_source">"Kan bron niet creëeren"</string> | ||||
| @@ -105,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -131,5 +129,6 @@ | ||||
|     <string name="action_about">"Over"</string> | ||||
|     <string name="marked_as_read">"Artikel gelezen"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="undo_string">"Ongedaan maken"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Sobre"</string> | ||||
|     <string name="marked_as_read">"Item lido"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Sobre"</string> | ||||
|     <string name="marked_as_read">"Item lido"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"මේ ගැන"</string> | ||||
|     <string name="marked_as_read">"Item read"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"Hakkında"</string> | ||||
|     <string name="marked_as_read">"Öğeleri oku"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">左对齐</string> | ||||
|     <string name="reader_text_align_justify">左右对齐</string> | ||||
|     <string name="settings_reader_font">阅读器字体</string> | ||||
|     <string name="reader_static_bar_title">文章查看器中的静态底部栏</string> | ||||
|     <string name="reader_static_bar_on">底部栏将始终显示</string> | ||||
|     <string name="reader_static_bar_off">底部栏可以通过浮动按钮显示</string> | ||||
|     <string name="remove_source">删除源</string> | ||||
|     <string name="pref_theme_title">浅色/深色模式</string> | ||||
|     <string name="mode_dark">深色模式</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"关于我们"</string> | ||||
|     <string name="marked_as_read">"已读"</string> | ||||
|     <string name="marked_as_unread">"未读条目"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -106,9 +106,6 @@ | ||||
|     <string name="reader_text_align_left">Align left</string> | ||||
|     <string name="reader_text_align_justify">Justify</string> | ||||
|     <string name="settings_reader_font">Reader font</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -132,4 +129,6 @@ | ||||
|     <string name="action_about">"关于我们"</string> | ||||
|     <string name="marked_as_read">"已读"</string> | ||||
|     <string name="marked_as_unread">"未讀項目"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
							
								
								
									
										6
									
								
								androidApp/src/main/res/values/ids.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								androidApp/src/main/res/values/ids.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <resources> | ||||
|     <item name="unread_action" type="id" /> | ||||
|     <item name="open_action" type="id" /> | ||||
|     <item name="share_action" type="id" /> | ||||
| </resources> | ||||
| @@ -108,9 +108,6 @@ | ||||
|     <string name="source_code_pro_font_id" translatable="false">source_code_pro_medium</string> | ||||
|     <string name="open_sans_font_id" translatable="false">open_sans</string> | ||||
|     <string name="roboto_font_id" translatable="false">roboto</string> | ||||
|     <string name="reader_static_bar_title">Static bottom bar in the article viewer</string> | ||||
|     <string name="reader_static_bar_on">The bottom bar will always be displayed</string> | ||||
|     <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string> | ||||
|     <string name="remove_source">Remove source</string> | ||||
|     <string name="pref_theme_title">Light/Dark mode</string> | ||||
|     <string name="mode_dark">Dark mode</string> | ||||
| @@ -134,4 +131,6 @@ | ||||
|     <string name="action_about">"About"</string> | ||||
|     <string name="marked_as_read">"Item read"</string> | ||||
|     <string name="marked_as_unread">"Item unread"</string> | ||||
|     <string name="confirm_delete_title">Confirm Deletion</string> | ||||
|     <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string> | ||||
| </resources> | ||||
| @@ -30,14 +30,6 @@ | ||||
|         android:summaryOn="@string/pref_article_viewer_on" | ||||
|         android:title="@string/pref_article_viewer_title" | ||||
|         app:iconSpaceReserved="false"/> | ||||
|     <SwitchPreference | ||||
|         android:defaultValue="false" | ||||
|         android:dependency="prefer_article_viewer" | ||||
|         android:key="reader_static_bar" | ||||
|         android:summaryOff="@string/reader_static_bar_off" | ||||
|         android:summaryOn="@string/reader_static_bar_on" | ||||
|         android:title="@string/reader_static_bar_title" | ||||
|         app:iconSpaceReserved="false"/> | ||||
|  | ||||
|     <PreferenceCategory | ||||
|         android:title="@string/pref_general_category_displaying"> | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| plugins { | ||||
|     //trick: for the same plugin versions in all sub-modules | ||||
|     id("com.android.application").version("8.7.3").apply(false) | ||||
|     id("com.android.library").version("8.7.3").apply(false) | ||||
|     // trick: for the same plugin versions in all sub-modules | ||||
|     id("com.android.application").version("8.8.1").apply(false) | ||||
|     id("com.android.library").version("8.8.1").apply(false) | ||||
|     id("org.jetbrains.kotlin.android").version("2.1.0").apply(false) | ||||
|     kotlin("multiplatform").version("2.1.0").apply(false) | ||||
|     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false) | ||||
| @@ -16,7 +16,6 @@ allprojects { | ||||
|     } | ||||
| } | ||||
|  | ||||
|  | ||||
| tasks.register("clean", Delete::class) { | ||||
|     delete(layout.buildDirectory) | ||||
| } | ||||
|   | ||||
| @@ -0,0 +1,5 @@ | ||||
| **v125010131** | ||||
|  | ||||
| - fix: reload the adapter when it's needed. Fixes #128. (#176) | ||||
| - feat: basic auth and images loading. Fixes #172. (#175) | ||||
| - Changelog for v125010111 | ||||
| @@ -0,0 +1,6 @@ | ||||
| **v125010201** | ||||
|  | ||||
| - fix: Handle empty url issue. | ||||
| - Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master | ||||
| - chore: changing actions in reader fragment. | ||||
| - Changelog for v125010131 | ||||
| @@ -0,0 +1,8 @@ | ||||
| **v125010241** | ||||
|  | ||||
| - Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master | ||||
| - refactor: context fragments issues. | ||||
| - logs: Context issues. | ||||
| - fix: Handle empty url issue, again. | ||||
| - fix: Link not opening. | ||||
| - Changelog for v125010201 | ||||
| @@ -0,0 +1,7 @@ | ||||
| **v125020411** | ||||
|  | ||||
| - Merge pull request 'bump' (#182) from bump into master | ||||
| - chore: non transiant R classes. | ||||
| - Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master | ||||
| - bump | ||||
| - fix: One more missing context. | ||||
| @@ -0,0 +1,7 @@ | ||||
| **v125020471** | ||||
|  | ||||
| - chore: no more docker-compose. | ||||
| - bump: gradle plugin. | ||||
| - Merge pull request 'fix: check index exists.' (#183) from fix-index into master | ||||
| - fix: check index exists. | ||||
| - Changelog for v125020411 | ||||
| @@ -0,0 +1,4 @@ | ||||
| **v125020581** | ||||
|  | ||||
| - fix: url can be empty ? | ||||
| - Changelog for v125020471 | ||||
| @@ -18,8 +18,8 @@ kotlin.code.style=official | ||||
| #Android | ||||
| android.useAndroidX=true | ||||
| #android.nonTransitiveRClass=true | ||||
| android.enableJetifier=true | ||||
| android.nonTransitiveRClass=false | ||||
| android.enableJetifier=false | ||||
| android.nonTransitiveRClass=true | ||||
| #MPP | ||||
| kotlin.mpp.enableCInteropCommonization=true | ||||
| org.gradle.parallel=true | ||||
|   | ||||
							
								
								
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| #Mon Nov 25 22:48:24 CET 2024 | ||||
| #Sun Feb 09 14:44:52 CET 2025 | ||||
| distributionBase=GRADLE_USER_HOME | ||||
| distributionPath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip | ||||
| zipStoreBase=GRADLE_USER_HOME | ||||
| zipStorePath=wrapper/dists | ||||
|   | ||||
| @@ -127,8 +127,8 @@ class SelfossModel { | ||||
|         val tags: List<String>, | ||||
|         val author: String? = null, | ||||
|     ) { | ||||
|         fun getLinkDecoded(): String { | ||||
|             var stringUrl: String | ||||
|         fun getLinkDecoded(): String? { | ||||
|             var stringUrl: String? | ||||
|             stringUrl = | ||||
|                 if (link.contains("//news.google.com/news/") && link.contains("&url=")) { | ||||
|                     link.substringAfter("&url=") | ||||
| @@ -146,11 +146,7 @@ class SelfossModel { | ||||
|                 stringUrl = "http:$stringUrl" | ||||
|             } | ||||
|  | ||||
|             if (stringUrl.isEmptyOrNullOrNullString()) { | ||||
|                 throw ModelException("Link $link was translated to $stringUrl, but was empty. Handle this.") | ||||
|             } | ||||
|  | ||||
|             return stringUrl | ||||
|             return if (stringUrl.isEmptyOrNullOrNullString()) null else stringUrl | ||||
|         } | ||||
|  | ||||
|         fun sourceAuthorAndDate(): String { | ||||
|   | ||||
| @@ -53,7 +53,6 @@ class AppSettingsService( | ||||
|     private var activeAlignment: Int? = null | ||||
|  | ||||
|     private var fontSize: Int? = null | ||||
|     private var staticBar: Boolean? = null | ||||
|     private var font: String = "" | ||||
|     private var theme: Int? = null | ||||
|  | ||||
| @@ -386,17 +385,6 @@ class AppSettingsService( | ||||
|         return fontSize ?: DEFAULT_FONT_SIZE | ||||
|     } | ||||
|  | ||||
|     private fun refreshStaticBarEnabled() { | ||||
|         staticBar = settings.getBoolean(READER_STATIC_BAR, false) | ||||
|     } | ||||
|  | ||||
|     fun isStaticBarEnabled(): Boolean { | ||||
|         if (staticBar != null) { | ||||
|             refreshStaticBarEnabled() | ||||
|         } | ||||
|         return staticBar == true | ||||
|     } | ||||
|  | ||||
|     private fun refreshFont() { | ||||
|         font = settings.getString(READER_FONT, "") | ||||
|     } | ||||
| @@ -449,7 +437,6 @@ class AppSettingsService( | ||||
|         refreshActiveAllignment() | ||||
|         refreshFontSize() | ||||
|         refreshFont() | ||||
|         refreshStaticBarEnabled() | ||||
|         refreshCurrentTheme() | ||||
|     } | ||||
|  | ||||
| @@ -547,8 +534,6 @@ class AppSettingsService( | ||||
|  | ||||
|         const val READER_FONT = "reader_font" | ||||
|  | ||||
|         const val READER_STATIC_BAR = "reader_static_bar" | ||||
|  | ||||
|         const val READER_FONT_SIZE = "reader_font_size" | ||||
|  | ||||
|         const val TEXT_ALIGN = "text_align" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user