diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index f4b342d..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Freedomotic \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8b9581e..075f7b4 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,8 +11,8 @@ + - - + \ No newline at end of file diff --git a/.idea/libraries/1_commons_io_1_3_2.xml b/.idea/libraries/1_commons_io_1_3_2.xml new file mode 100644 index 0000000..e26875d --- /dev/null +++ b/.idea/libraries/1_commons_io_1_3_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/animated_vector_drawable_26_0_0_alpha1.xml b/.idea/libraries/animated_vector_drawable_26_0_0_alpha1.xml new file mode 100644 index 0000000..61f8322 --- /dev/null +++ b/.idea/libraries/animated_vector_drawable_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_26_0_0_alpha1.xml b/.idea/libraries/appcompat_v7_26_0_0_alpha1.xml new file mode 100644 index 0000000..1803dc7 --- /dev/null +++ b/.idea/libraries/appcompat_v7_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/constraint_layout_1_0_2.xml b/.idea/libraries/constraint_layout_1_0_2.xml new file mode 100644 index 0000000..2452026 --- /dev/null +++ b/.idea/libraries/constraint_layout_1_0_2.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/constraint_layout_solver_1_0_2.xml b/.idea/libraries/constraint_layout_solver_1_0_2.xml new file mode 100644 index 0000000..1645e21 --- /dev/null +++ b/.idea/libraries/constraint_layout_solver_1_0_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/gson_2_2_4.xml b/.idea/libraries/gson_2_2_4.xml index 8e039c3..47ac204 100644 --- a/.idea/libraries/gson_2_2_4.xml +++ b/.idea/libraries/gson_2_2_4.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_26_0_0_alpha1.xml b/.idea/libraries/support_annotations_26_0_0_alpha1.xml new file mode 100644 index 0000000..6c673ac --- /dev/null +++ b/.idea/libraries/support_annotations_26_0_0_alpha1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_compat_26_0_0_alpha1.xml b/.idea/libraries/support_compat_26_0_0_alpha1.xml new file mode 100644 index 0000000..09bfd91 --- /dev/null +++ b/.idea/libraries/support_compat_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_core_ui_26_0_0_alpha1.xml b/.idea/libraries/support_core_ui_26_0_0_alpha1.xml new file mode 100644 index 0000000..a869dc1 --- /dev/null +++ b/.idea/libraries/support_core_ui_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_core_utils_26_0_0_alpha1.xml b/.idea/libraries/support_core_utils_26_0_0_alpha1.xml new file mode 100644 index 0000000..42da917 --- /dev/null +++ b/.idea/libraries/support_core_utils_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_fragment_26_0_0_alpha1.xml b/.idea/libraries/support_fragment_26_0_0_alpha1.xml new file mode 100644 index 0000000..d15d607 --- /dev/null +++ b/.idea/libraries/support_fragment_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_media_compat_26_0_0_alpha1.xml b/.idea/libraries/support_media_compat_26_0_0_alpha1.xml new file mode 100644 index 0000000..ca2b40e --- /dev/null +++ b/.idea/libraries/support_media_compat_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_19_1_0.xml b/.idea/libraries/support_v4_19_1_0.xml deleted file mode 100644 index 4d4d5e2..0000000 --- a/.idea/libraries/support_v4_19_1_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_26_0_0_alpha1.xml b/.idea/libraries/support_v4_26_0_0_alpha1.xml new file mode 100644 index 0000000..9a0d81f --- /dev/null +++ b/.idea/libraries/support_v4_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_26_0_0_alpha1.xml b/.idea/libraries/support_vector_drawable_26_0_0_alpha1.xml new file mode 100644 index 0000000..6732c68 --- /dev/null +++ b/.idea/libraries/support_vector_drawable_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index b153e48..b0a270f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,8 +3,34 @@ - + + + + + - - + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/FDAndroidClient/FDAndroidClient.iml b/FDAndroidClient/FDAndroidClient.iml index c7c7e74..41f2cee 100644 --- a/FDAndroidClient/FDAndroidClient.iml +++ b/FDAndroidClient/FDAndroidClient.iml @@ -1,5 +1,5 @@ - + @@ -10,69 +10,121 @@ - + + + - - - - - + + + + + + + + + - - + + + + + + + + + - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + + - + + + + + + + - - - - - + + + + + + + + + + - - + \ No newline at end of file diff --git a/FDAndroidClient/build.gradle b/FDAndroidClient/build.gradle index 784439f..dc84ec5 100644 --- a/FDAndroidClient/build.gradle +++ b/FDAndroidClient/build.gradle @@ -22,19 +22,18 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 19 - buildToolsVersion "19.1.0" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { applicationId "com.freedomotic.freedomotic" minSdkVersion 17 - targetSdkVersion 19 + targetSdkVersion 26 versionCode 1 versionName "1.0" } buildTypes { release { - runProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -47,15 +46,18 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) // You must install or update the Support Repository through the SDK manager to use this dependency. - compile 'com.android.support:support-v4:19.+' - compile 'com.squareup.retrofit:retrofit:1.6.1' + + + + + compile 'com.squareup.retrofit:retrofit:1.6.1' compile 'com.squareup.okhttp:okhttp-urlconnection:2.0.0' compile 'com.squareup.okhttp:okhttp:2.0.0' - compile 'com.octo.android.robospice:robospice:1.4.12' compile 'com.octo.android.robospice:robospice-retrofit:1.4.12' compile 'de.greenrobot:eventbus:2.2.1' - + compile 'com.android.support:appcompat-v7:26.+' + compile 'com.android.support.constraint:constraint-layout:1.0.2' } diff --git a/FDAndroidClient/src/main/AndroidManifest.xml b/FDAndroidClient/src/main/AndroidManifest.xml index 457c2b7..fdc0288 100644 --- a/FDAndroidClient/src/main/AndroidManifest.xml +++ b/FDAndroidClient/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ You should have received a copy of the GNU General Public License along with ~ Freedomotic; see the file COPYING. If not, see ~ . - --> - +--> @@ -29,7 +28,7 @@ android:label="@string/app_name" android:theme="@style/AppTheme"> @@ -47,9 +46,12 @@ + + + - + \ No newline at end of file diff --git a/FDAndroidClient/src/main/java/com/freedomotic/freedomotic/SplashScreen.java b/FDAndroidClient/src/main/java/com/freedomotic/freedomotic/SplashScreen.java new file mode 100644 index 0000000..a8ff9be --- /dev/null +++ b/FDAndroidClient/src/main/java/com/freedomotic/freedomotic/SplashScreen.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2009-2017 Freedomotic team http://freedomotic.com + * + * This file is part of Freedomotic + * + * This Program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2, or (at your option) any later version. + * + * This Program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * Freedomotic; see the file COPYING. If not, see + * . + */ + +package com.freedomotic.freedomotic; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +import java.util.Timer; +import java.util.TimerTask; + +public class SplashScreen extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splash_screen); + + + long delayInMillis = 2000; + Timer timer = new Timer(); + timer.schedule(new TimerTask() { + @Override public void run() { + startActivity(new Intent(SplashScreen.this,objectListActivity.class)); + finish(); + } + }, delayInMillis); + } +} diff --git a/FDAndroidClient/src/main/res/drawable-hdpi/freedomatic.png b/FDAndroidClient/src/main/res/drawable-hdpi/freedomatic.png new file mode 100644 index 0000000..df42038 Binary files /dev/null and b/FDAndroidClient/src/main/res/drawable-hdpi/freedomatic.png differ diff --git a/FDAndroidClient/src/main/res/layout/activity_splash_screen.xml b/FDAndroidClient/src/main/res/layout/activity_splash_screen.xml new file mode 100644 index 0000000..56000b1 --- /dev/null +++ b/FDAndroidClient/src/main/res/layout/activity_splash_screen.xml @@ -0,0 +1,43 @@ + + + + + + + diff --git a/FDAndroidClient/src/main/res/values/strings.xml b/FDAndroidClient/src/main/res/values/strings.xml index 3dd08ba..b4bf121 100644 --- a/FDAndroidClient/src/main/res/values/strings.xml +++ b/FDAndroidClient/src/main/res/values/strings.xml @@ -1,5 +1,4 @@ - - - diff --git a/build.gradle b/build.gradle index 37c36a1..ab73373 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/fd-android-client.iml b/fd-android-client.iml index 0bb6048..bc1b7d4 100644 --- a/fd-android-client.iml +++ b/fd-android-client.iml @@ -1,19 +1,19 @@ - + - + - + - - + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3a8bdb7..bbc4931 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -22,4 +22,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-3.3-all.zip