Clean and prepare next release 2.10.1

README.md

@@ -10,7 +10,7 @@
 <a href="https://github.com/Five-Prayers/five-prayers-android/releases/latest" alt="Download: latest version" target="_blank"><img src="https://img.shields.io/github/v/release/Five-Prayers/five-prayers-android"></a>
 <a href="https://github.com/Five-Prayers/five-prayers-android/releases/latest" alt="Download: latest version" target="_blank"><img src="https://img.shields.io/github/downloads/Five-Prayers/five-prayers-android/total?logo=Github"></a>
 <a href="https://play.google.com/store/apps/details?id=com.hbouzidi.fiveprayers" alt="Download: latest version" target="_blank"><img src="https://PlayBadges.pavi2410.me/badge/downloads?id=com.hbouzidi.fiveprayers"></a>
- 
+<a href="https://apt.izzysoft.de/fdroid/index/apk/com.hbouzidi.fiveprayers/" alt="Download: latest version" target="_blank"><img src="https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/com.hbouzidi.fiveprayers"></a>
 </p>
 
 <hr>
@@ -19,18 +19,23 @@
  <img alt="Android app on Google Play" src="https://developer.android.com/images/brand/en_app_rgb_wo_45.png"/>
 </a>
 
-F-Droid Repo:<br>
-Download the current version by adding the following repo to the F-Droid App
+F-Droid Repos:
+<br>
+- Download the current version by adding the following repo to the F-Droid App
 [https://raw.githubusercontent.com/Five-Prayers/fdroid-repo-stable/main/fdroid/repo](https://raw.githubusercontent.com/Five-Prayers/fdroid-repo-stable/main/fdroid/repo)
 
 You can use this fingerprint to validate repo's signature : 
 
 ```
 C8 E3 6E 27 BA 66 CB 81 D9 24 9C 55 C6 7A 8E 53 21 AF DB CC F8 1E EB 0D 49 5E 8E 3A 01 FE 16 93
 ```
-
+
+- The App is also available on IzzyOnDroid F-Droid Repository :
+
 <p align="center">
- <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-en.svg" alt="Get it on F-Droid" height=80/> 
+ <a href="https://apt.izzysoft.de/fdroid/index/apk/com.hbouzidi.fiveprayers/" alt="IzzyOnDroid Link" target="_blank">
+ <img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height=80/>
+ </a>
 </p> 
 
 <hr>
@@ -42,14 +47,15 @@ C8 E3 6E 27 BA 66 CB 81 D9 24 9C 55 C6 7A 8E 53 21 AF DB CC F8 1E EB 0D 49 5E 8E
 
 [<img src="screenshots/pixel_4xl/Screenshot_0.png" width=160>](screenshots/pixel_4xl/Screenshot_0.png)
 [<img src="screenshots/pixel_4xl/Screenshot_1.png" width=160>](screenshots/pixel_4xl/Screenshot_1.png)
+[<img src="screenshots/pixel_4xl/Screenshot_2.png" width=160>](screenshots/pixel_4xl/Screenshot_2.png)
 [<img src="screenshots/pixel_4xl/Screenshot_3.png" width=160>](screenshots/pixel_4xl/Screenshot_3.png)
 [<img src="screenshots/pixel_4xl/Screenshot_4.png" width=160>](screenshots/pixel_4xl/Screenshot_4.png)
 [<img src="screenshots/pixel_4xl/Screenshot_5.png" width=160>](screenshots/pixel_4xl/Screenshot_5.png)
-[<img src="screenshots/pixel_4xl/Screenshot_7.png" width=160>](screenshots/pixel_4xl/Screenshot_7.png)
-[<img src="screenshots/pixel_4xl/Screenshot_8.png" width=160>](screenshots/pixel_4xl/Screenshot_8.png)
 [<img src="screenshots/pixel_4xl/Screenshot_9.png" width=160>](screenshots/pixel_4xl/Screenshot_9.png)
-[<img src="screenshots/pixel_4xl/Screenshot_10.png" width=160>](screenshots/pixel_4xl/Screenshot_10.png)
+[<img src="screenshots/pixel_4xl/Screenshot_11.png" width=160>](screenshots/pixel_4xl/Screenshot_11.png)
 [<img src="screenshots/pixel_4xl/Screenshot_12.png" width=160>](screenshots/pixel_4xl/Screenshot_12.png)
+[<img src="screenshots/pixel_4xl/Screenshot_13.png" width=160>](screenshots/pixel_4xl/Screenshot_13.png)
+[<img src="screenshots/pixel_4xl/Screenshot_17.png" width=160>](screenshots/pixel_4xl/Screenshot_17.png)
 
 ## Description
 

app/build.gradle

@@ -27,8 +27,8 @@ android {
  applicationId "com.hbouzidi.fiveprayers"
  minSdkVersion 16
  targetSdkVersion 33
- versionCode 40
- versionName "2.10.0"
+ versionCode 41
+ versionName "2.10.1"
  archivesBaseName = "$applicationId-v$versionCode($versionName)"
 
  vectorDrawables.useSupportLibrary = true
@@ -202,7 +202,7 @@ dependencies {
  implementation 'com.github.kizitonwose:CalendarView:1.0.4'
 
  //https://github.com/greenrobot/EventBus
- implementation 'org.greenrobot:eventbus:3.2.0'
+ implementation 'org.greenrobot:eventbus:3.3.1'
 
  //https://github.com/AppIntro/AppIntro
  implementation 'com.github.AppIntro:AppIntro:6.2.0'

compassqibla/build.gradle

@@ -39,7 +39,6 @@ dependencies {
  implementation 'androidx.core:core-ktx:1.8.0'
  implementation 'androidx.appcompat:appcompat:1.4.2'
  implementation 'com.google.android.material:material:1.6.1'
- implementation 'com.google.android.gms:play-services-location:20.0.0'
  testImplementation 'junit:junit:4.13.2'
  androidTestImplementation 'androidx.test.ext:junit:1.1.3'
  androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

compassqibla/src/main/java/com/hbouzidi/compassqibla/CompassQibla.kt

@@ -1,12 +1,10 @@
 package com.hbouzidi.compassqibla
 
-import android.annotation.SuppressLint
 import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
 import android.location.Location
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 
@@ -35,14 +33,6 @@ class CompassQibla {
  )
  }
 
- fun onPermissionGranted(onGranted: (permission: String) -> Unit) = apply {
- model.permission.observe(activity) { if (it.first) onGranted(it.second) }
- }
-
- fun onPermissionDenied(onDenied: () -> Unit) = apply {
- model.permission.observe(activity) { if (!it.first) onDenied() }
- }
-
  fun onDirectionChangeListener(onChange: (qiblaDirection: QiblaDirection) -> Unit) = apply {
  model.direction.observe(activity) { onChange(it) }
  }
@@ -74,19 +64,5 @@ class CompassQibla {
  override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {
  model.updateAccuracy(sensor, accuracy)
  }
-
- @SuppressLint("NewApi")
- fun requestLocationPermission() {
- val locationPermissionRequest = activity.registerForActivityResult(
- ActivityResultContracts.RequestMultiplePermissions()
- ) { permissions ->
- LocationUtils.handlePermission(
- permissions,
- { model.onPermissionUpdate(true, it) },
- { model.onPermissionUpdate(false) }
- )
- }
- LocationUtils.launchPermission(locationPermissionRequest)
- }
  }
 }

compassqibla/src/main/java/com/hbouzidi/compassqibla/CompassQiblaViewModel.kt

@@ -9,15 +9,9 @@ import kotlinx.coroutines.launch
 
 class CompassQiblaViewModel : ViewModel() {
 
- private val _locationAddress = MutableLiveData<Address>()
- val locationAddress get() = _locationAddress
-
  private val _direction = MutableLiveData<QiblaDirection>()
  val direction get() = _direction
 
- private val _permission = MutableLiveData<Pair<Boolean, String>>()
- val permission get() = _permission
-
  private val _accuracy = MutableLiveData<Pair<Sensor?, Int>>()
  val accuracy get() = _accuracy
 
@@ -27,10 +21,6 @@ class CompassQiblaViewModel : ViewModel() {
  }
  }
 
- fun onPermissionUpdate(isGranted: Boolean, message: String? = "") {
- _permission.value = Pair(isGranted, message ?: "")
- }
-
  fun updateAccuracy(sensor: Sensor?, accuracy: Int) {
  _accuracy.value = Pair(sensor, accuracy)
  }