mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
Reverted API version to v21, Android 5.0
This commit is contained in:
1 parent
37ede31227
commit
f3d64d23b2
4 files changed
+9
-27
No files matched your search
+1
-8
@@ -11,7 +11,7 @@ android {
|
|||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.rtbishop.look4sat"
|
applicationId "com.rtbishop.look4sat"
|
||||||
minSdkVersion 23
|
minSdkVersion 21
|
||||||
resConfigs "en,ru"
|
resConfigs "en,ru"
|
||||||
targetSdkVersion 31
|
targetSdkVersion 31
|
||||||
versionCode 255
|
versionCode 255
|
||||||
@@ -37,13 +37,6 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileOptions {
|
|
||||||
sourceCompatibility JavaVersion.VERSION_11
|
|
||||||
targetCompatibility JavaVersion.VERSION_11
|
|
||||||
}
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "11"
|
|
||||||
}
|
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
viewBinding true
|
viewBinding true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,12 +10,11 @@
|
|||||||
android:name=".presentation.Look4SatApplication"
|
android:name=".presentation.Look4SatApplication"
|
||||||
android:allowBackup="false"
|
android:allowBackup="false"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name">
|
||||||
android:usesCleartextTraffic="true">
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".presentation.Look4SatActivity"
|
android:name=".presentation.Look4SatActivity"
|
||||||
android:theme="@style/AppTheme.Splash"
|
android:exported="true"
|
||||||
android:exported="true">
|
android:theme="@style/AppTheme.Splash">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
|||||||
@@ -21,7 +21,10 @@ import android.content.Context
|
|||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.location.LocationManager
|
import android.location.LocationManager
|
||||||
import androidx.room.Room
|
import androidx.room.Room
|
||||||
import com.rtbishop.look4sat.data.*
|
import com.rtbishop.look4sat.data.LocalDataSource
|
||||||
|
import com.rtbishop.look4sat.data.PreferencesSource
|
||||||
|
import com.rtbishop.look4sat.data.RemoteDataSource
|
||||||
|
import com.rtbishop.look4sat.data.SatelliteRepo
|
||||||
import com.rtbishop.look4sat.domain.Predictor
|
import com.rtbishop.look4sat.domain.Predictor
|
||||||
import com.rtbishop.look4sat.framework.PreferencesProvider
|
import com.rtbishop.look4sat.framework.PreferencesProvider
|
||||||
import com.rtbishop.look4sat.framework.api.RemoteSource
|
import com.rtbishop.look4sat.framework.api.RemoteSource
|
||||||
@@ -34,11 +37,9 @@ import dagger.hilt.InstallIn
|
|||||||
import dagger.hilt.android.qualifiers.ApplicationContext
|
import dagger.hilt.android.qualifiers.ApplicationContext
|
||||||
import dagger.hilt.components.SingletonComponent
|
import dagger.hilt.components.SingletonComponent
|
||||||
import kotlinx.coroutines.CoroutineDispatcher
|
import kotlinx.coroutines.CoroutineDispatcher
|
||||||
import okhttp3.OkHttpClient
|
|
||||||
import retrofit2.Retrofit
|
import retrofit2.Retrofit
|
||||||
import retrofit2.converter.moshi.MoshiConverterFactory
|
import retrofit2.converter.moshi.MoshiConverterFactory
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
import javax.net.ssl.HostnameVerifier
|
|
||||||
|
|
||||||
@Module
|
@Module
|
||||||
@InstallIn(SingletonComponent::class)
|
@InstallIn(SingletonComponent::class)
|
||||||
@@ -100,13 +101,9 @@ object SatelliteDataModule {
|
|||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
fun provideSatelliteService(): SatelliteService {
|
fun provideSatelliteService(): SatelliteService {
|
||||||
val verifier = HostnameVerifier { _, _ -> true }
|
|
||||||
val httpClient = OkHttpClient.Builder().hostnameVerifier(verifier).build()
|
|
||||||
return Retrofit.Builder()
|
return Retrofit.Builder()
|
||||||
.baseUrl("https://db.satnogs.org/api/")
|
.baseUrl("https://db.satnogs.org/api/")
|
||||||
.client(httpClient)
|
|
||||||
.addConverterFactory(MoshiConverterFactory.create())
|
.addConverterFactory(MoshiConverterFactory.create())
|
||||||
.build()
|
.build().create(SatelliteService::class.java)
|
||||||
.create(SatelliteService::class.java)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,15 +1,8 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
|
||||||
id 'kotlin'
|
id 'kotlin'
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
|
||||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
|
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
|
||||||
|
|
||||||
testImplementation "junit:junit:$junit_version"
|
testImplementation "junit:junit:$junit_version"
|
||||||
|
|||||||
Reference in new issue
Block a user