Skip to content

Commit e8fba39

Browse files
richardancarichardanca
committed
release apklis
1 parent 9e3b1d9 commit e8fba39

12 files changed

Lines changed: 48 additions & 45 deletions

File tree

‎.idea/codeStyles/Project.xml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
applicationId "com.richdevelop.weather_api"
1414
minSdkVersion 19
1515
targetSdkVersion 29
16-
versionCode 8
16+
versionCode 10
1717
versionName "1.0"
1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919
multiDexEnabled true
@@ -56,30 +56,30 @@ dependencies {
5656
implementation 'com.android.support:multidex:1.0.3'
5757

5858
/** Dark theme */
59-
implementation 'com.google.android.material:material:1.1.0-beta01'
59+
implementation 'com.google.android.material:material:1.2.0-alpha01'
6060

6161
/** ViewModel and LiveData */
6262
implementation 'androidx.core:core-ktx:1.1.0'
63-
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha05'
64-
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0-alpha05'
65-
implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0-alpha05'
66-
implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0-alpha05'
67-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-alpha05'
63+
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0-rc02'
64+
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0-rc02'
65+
implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0-rc02'
66+
implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0-rc02'
67+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-rc02'
6868
kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0'
6969
implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.1.0'
7070
implementation 'androidx.paging:paging-runtime:2.1.0'
7171
testImplementation 'androidx.paging:paging-common:2.1.0'
7272
implementation 'android.arch.paging:rxjava2:1.0.1'
73-
implementation 'androidx.room:room-runtime:2.1.0'
74-
implementation 'androidx.room:room-ktx:2.2.0-rc01'
75-
kapt 'androidx.room:room-compiler:2.1.0'
76-
implementation 'androidx.room:room-rxjava2:2.2.0-rc01'
73+
implementation 'androidx.room:room-runtime:2.2.1'
74+
implementation 'androidx.room:room-ktx:2.2.1'
75+
kapt 'androidx.room:room-compiler:2.2.1'
76+
implementation 'androidx.room:room-rxjava2:2.2.1'
7777

7878
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
7979
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
80-
implementation 'androidx.fragment:fragment-ktx:1.2.0-alpha04'
81-
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-alpha05'
82-
implementation 'androidx.activity:activity-ktx:1.1.0-alpha03'
80+
implementation 'androidx.fragment:fragment-ktx:1.2.0-rc02'
81+
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-rc02'
82+
implementation 'androidx.activity:activity-ktx:1.1.0-rc02'
8383
implementation 'androidx.appcompat:appcompat:1.1.0'
8484

8585

‎app/release/output.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
1+
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

‎app/src/main/AndroidManifest.xml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.richdevelop.weather_api">
3+
xmlns:tools="http://schemas.android.com/tools"
4+
package="com.richdevelop.weather_api">
45

5-
<uses-permission android:name="android.permission.INTERNET"/>
6-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
7-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
8-
9-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
10-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
6+
<uses-permission android:name="android.permission.INTERNET" />
7+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
8+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
9+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
10+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1111

1212
<application
1313
android:allowBackup="true"
1414
android:icon="@mipmap/ic_launcher"
1515
android:label="@string/app_name"
16+
android:networkSecurityConfig="@xml/network_security_config"
1617
android:roundIcon="@mipmap/ic_launcher_round"
1718
android:supportsRtl="true"
1819
android:theme="@style/AppTheme"
1920
android:usesCleartextTraffic="true"
20-
android:networkSecurityConfig="@xml/network_security_config">
21-
<activity android:name=".MainActivity"
22-
android:screenOrientation="portrait"
23-
android:theme="@style/AppTheme.NoActionBar">
21+
tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">
22+
<activity
23+
android:name=".MainActivity"
24+
android:screenOrientation="portrait"
25+
android:theme="@style/AppTheme.NoActionBar">
2426
<intent-filter>
25-
<action android:name="android.intent.action.MAIN"/>
27+
<action android:name="android.intent.action.MAIN" />
2628

27-
<category android:name="android.intent.category.LAUNCHER"/>
29+
<category android:name="android.intent.category.LAUNCHER" />
2830
</intent-filter>
2931
</activity>
3032
</application>

‎app/src/main/java/com/richdevelop/weather_api/MainActivity.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class MainActivity : SupportActivity() {
3232
window.setBackgroundDrawable(ContextCompat.getDrawable(this, R.drawable.yellow_bg))
3333
setContentView(R.layout.layout_main)
3434

35-
3635
Fragmentation.builder()
3736
// show stack view. Mode: BUBBLE, SHAKE, NONE
3837
.stackViewMode(Fragmentation.BUBBLE)
@@ -52,8 +51,7 @@ class MainActivity : SupportActivity() {
5251
if (grantResults[index] != PackageManager.PERMISSION_GRANTED) {
5352
// exit the app if one permission is not granted
5453
Toast.makeText(
55-
this, "Required permission '" + permissions[index]
56-
+ "' not granted, exiting", Toast.LENGTH_LONG
54+
this, resources.getString(R.string.permissions), Toast.LENGTH_LONG
5755
).show()
5856
finish()
5957
return

‎app/src/main/java/com/richdevelop/weather_api/fragments/MapFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@ class MapFragment : SupportFragment() {
187187
Configuration.getInstance().isDebugMode = true
188188

189189
/** Custom tiles with authentication*/
190-
//Configuration.getInstance().additionalHttpRequestProperties["Authorization"] = "Bearer ${ToDusAuth.getInstance().currentOwner?.owner?.credential?.token}"
190+
//Configuration.getInstance().additionalHttpRequestProperties["Authorization"] = "Bearer ${token}"
191191
// mapView.setTileSource(
192192
// XYTileSource(
193193
// "OSMPublicTransport", 6, 20, 256, ".png",
194-
// arrayOf("https://map.todus.cu/styles/osm-bright/"), "© OpenStreetMap contributors")
194+
// arrayOf("URL"), "© OpenStreetMap contributors")
195195
// )
196196

197197
val view = inflater.inflate(R.layout.fragment_map, container, false)

‎app/src/main/java/com/richdevelop/weather_api/fragments/TimeWeatherFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ class TimeWeatherFragment : SupportFragment() {
209209
private fun updateData() {
210210
val url =
211211
"/data/2.5/weather?APPID=aaff1a7a058627a71698a204d3fa78b7&units=metric&lang=" + Locale.getDefault().language
212-
val tempUrl =
213-
url + ("&lat=" + lastLatitude + "&lon=" + lastLongitude)
212+
val tempUrl = "$url&lat=$lastLatitude&lon=$lastLongitude"
214213

215214
val execute = @SuppressLint("StaticFieldLeak")
216215

‎app/src/main/java/com/richdevelop/weather_api/repository/room/Dao.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@ interface Dao {
1414

1515
@Query("SELECT * FROM ${TimeWeather.TABLE_NAME}")
1616
fun getTimeWeather(): LiveData<TimeWeather?>
17-
18-
@Query("SELECT * FROM ${TimeWeather.TABLE_NAME} WHERE dt < :timeOut")
19-
fun hasTimeWeather(timeOut: Long): Boolean
2017
}

‎app/src/main/res/drawable/bg_location.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
44
<solid
5-
android:color="?colorSurface"/>
5+
android:color="#00FFFFFF"/>
66
</shape>

0 commit comments

Comments
 (0)