diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 1bec35e..a88ded0 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,8 +1,120 @@ + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+
+
+
diff --git a/app/src/main/java/bou/amine/apps/mteo/MainActivity.kt b/app/src/main/java/bou/amine/apps/mteo/MainActivity.kt index 6edc169..d55b0d2 100644 --- a/app/src/main/java/bou/amine/apps/mteo/MainActivity.kt +++ b/app/src/main/java/bou/amine/apps/mteo/MainActivity.kt @@ -135,6 +135,7 @@ class MainActivity : AppCompatActivity() { override fun onResponse(call: Call, response: Response) { Toast.makeText(this@MainActivity, "Ok", Toast.LENGTH_LONG).show() + textView.setText(response.body()?.hourly.toString()) swipeRefreshLayout.isRefreshing = false } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index de2cbee..770d2aa 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -19,6 +19,7 @@ android:layout_height="match_parent"> @@ -31,13 +32,11 @@ android:id="@+id/toolBar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - app:theme="@style/ToolBarStyle"/> + app:theme="@style/ToolBarStyle" /> @@ -47,15 +46,25 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:paddingBottom="55dp"> + + - - + + + diff --git a/build.gradle b/build.gradle index 1fb910c..786a871 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8969e12..4e9fb11 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Aug 03 13:12:38 CEST 2019 +#Fri Jan 17 11:06:28 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip