Compare commits
	
		
			1 Commits
		
	
	
		
			v125030711
			...
			dcea40162c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| dcea40162c | 
							
								
								
									
										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 | ||||
| @@ -3,26 +3,77 @@ on: | ||||
|   pull_request: | ||||
|     branches: | ||||
|       - master | ||||
|       - chore-crowdin-ci | ||||
|  | ||||
| jobs: | ||||
|   Lint: | ||||
|   #  Lint: | ||||
|   #    runs-on: ubuntu-latest | ||||
|   #    steps: | ||||
|   #      - name: Check out repository code | ||||
|   #        uses: actions/checkout@v4 | ||||
|   #      - uses: actions/setup-java@v4 | ||||
|   #        with: | ||||
|   #          distribution: 'temurin' | ||||
|   #          java-version: '17' | ||||
|   #          cache: gradle | ||||
|   #      - name: Install klint | ||||
|   #        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/ | ||||
|   #      - name: Install detekt | ||||
|   #        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.7/detekt-cli-1.23.7.zip && unzip detekt-cli-1.23.7.zip | ||||
|   #      - name: Linting... | ||||
|   #        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 | ||||
|       - uses: actions/setup-java@v4 | ||||
|       - name: upload translation sources | ||||
|         uses: crowdin/github-action@v2 | ||||
|         with: | ||||
|           distribution: 'temurin' | ||||
|           java-version: '17' | ||||
|           cache: gradle | ||||
|       - name: Install klint | ||||
|         run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/ | ||||
|       - name: Install detekt | ||||
|         run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.7/detekt-cli-1.23.7.zip && unzip detekt-cli-1.23.7.zip | ||||
|       - name: Linting... | ||||
|         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' | ||||
|   build: | ||||
|     needs: Lint | ||||
|     uses: ./.gitea/workflows/common_build.yml | ||||
|           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.outcome == failure() | ||||
|         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.outcome == failure() | ||||
|         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 | ||||
|   | ||||
| @@ -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() | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,4 +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="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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -129,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> | ||||
|   | ||||
| @@ -131,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> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user