diff --git a/.drone.yml b/.drone.yml index 93e3f27..87a0cb8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,9 +4,9 @@ name: default steps: - name: build - image: gradle:5.6.3 + image: nextcloudci/android:android-49 commands: - - gradle build + - ./gradlew build - name: notify image: appleboy/drone-telegram diff --git a/.idea/$CACHE_FILE$ b/.idea/$CACHE_FILE$ deleted file mode 100644 index f9784d3..0000000 --- a/.idea/$CACHE_FILE$ +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - Android - - - - - - \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 5c98b42..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Default ignored files -/workspace.xml \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..45b5654 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + +
+ + + + 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 + +
+
+
+
+ + +
+
\ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index a55e7a1..6e6eec1 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index d25b9f1..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/GPL_v__2_0.xml b/.idea/copyright/GPL_v__2_0.xml new file mode 100644 index 0000000..6ac8137 --- /dev/null +++ b/.idea/copyright/GPL_v__2_0.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fc7cb78..af0bbdd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,9 +1,14 @@ - - - /usr/bin/ghc - /usr/bin/stack + + + + + + + + + + - \ 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/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..c0fc443 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,35 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + defaultConfig { + applicationId "it.unisannio.ding.ids.wedroid.app" + minSdkVersion 24 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation project(':wrapper') + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/it/unisannio/ding/ids/wedroid/app/ExampleInstrumentedTest.kt b/app/src/androidTest/java/it/unisannio/ding/ids/wedroid/app/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..8910003 --- /dev/null +++ b/app/src/androidTest/java/it/unisannio/ding/ids/wedroid/app/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package it.unisannio.ding.ids.wedroid.app + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("it.unisannio.ding.ids.wedroid.app", appContext.packageName) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..253fb67 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt new file mode 100644 index 0000000..e5390c0 --- /dev/null +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt @@ -0,0 +1,14 @@ +package it.unisannio.ding.ids.wedroid.app + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import it.unisannio.ding.ids.wedroid.wrapper.api.BoardService + +class MainActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + val service : BoardService? = null + } +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..4fc2444 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..898f3ed Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..64ba76f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e5ed465 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b0907ca Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c18de9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..69b2233 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #008577 + #00574B + #D81B60 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..908274d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + wedroid + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/it/unisannio/ding/ids/wedroid/app/ExampleUnitTest.kt b/app/src/test/java/it/unisannio/ding/ids/wedroid/app/ExampleUnitTest.kt new file mode 100644 index 0000000..27c2f01 --- /dev/null +++ b/app/src/test/java/it/unisannio/ding/ids/wedroid/app/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package it.unisannio.ding.ids.wedroid.app + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f4ed563 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.60' + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.5.2' + 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 + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 6bef475..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -subprojects { - repositories { - jcenter() - } -} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..23339e0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..f6b961f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f04d6a2..d3fde33 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sun Nov 24 17:58:41 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/gradlew b/gradlew index e554bc1..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -1,21 +1,5 @@ #!/usr/bin/env sh -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - ############################################################################## ## ## Gradle start up script for UN*X @@ -44,7 +28,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -97,7 +81,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="/usr/lib/jvm/java-11-openjdk/bin/java" + JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -125,8 +109,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index 24467a1..e95643d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,19 +1,3 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS= @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..66df284 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app', ':wrapper' +rootProject.name='wedroid' diff --git a/settings.gradle.kts b/settings.gradle.kts deleted file mode 100644 index 0a5b415..0000000 --- a/settings.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/5.6.3/userguide/multi_project_builds.html - */ - -rootProject.name = "wedroid" -include("wrapper") diff --git a/wrapper/settings.gradle.kts b/wrapper/settings.gradle.kts deleted file mode 100644 index 0831cdf..0000000 --- a/wrapper/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/5.6.3/userguide/multi_project_builds.html - */ - -rootProject.name = "wekan-wrapper" diff --git a/wrapper/src/main/java/wekan/wrapper/api/BoardService.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/BoardService.java similarity index 87% rename from wrapper/src/main/java/wekan/wrapper/api/BoardService.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/BoardService.java index 78d7f27..ed74ea9 100644 --- a/wrapper/src/main/java/wekan/wrapper/api/BoardService.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/BoardService.java @@ -1,14 +1,14 @@ -package wekan.wrapper.api; - -import retrofit2.Call; -import retrofit2.http.*; -import wekan.wrapper.entity.Board; -import wekan.wrapper.entity.LabelPrototype; -import wekan.wrapper.entity.MemberPermission; -import wekan.wrapper.entity.BoardPrototype; +package it.unisannio.ding.ids.wedroid.wrapper.api; import java.util.List; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Board; +import it.unisannio.ding.ids.wedroid.wrapper.entity.BoardPrototype; +import it.unisannio.ding.ids.wedroid.wrapper.entity.LabelPrototype; +import it.unisannio.ding.ids.wedroid.wrapper.entity.MemberPermission; +import retrofit2.Call; +import retrofit2.http.*; + public interface BoardService { /** diff --git a/wrapper/src/main/java/wekan/wrapper/api/CardCommentService.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardCommentService.java similarity index 94% rename from wrapper/src/main/java/wekan/wrapper/api/CardCommentService.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardCommentService.java index e1c6dc5..c1d0b4f 100644 --- a/wrapper/src/main/java/wekan/wrapper/api/CardCommentService.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardCommentService.java @@ -1,8 +1,8 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Comment; import retrofit2.Call; import retrofit2.http.*; -import wekan.wrapper.entity.Comment; import java.util.List; diff --git a/wrapper/src/main/java/wekan/wrapper/api/CardService.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardService.java similarity index 93% rename from wrapper/src/main/java/wekan/wrapper/api/CardService.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardService.java index 19f5e96..4fcbce5 100644 --- a/wrapper/src/main/java/wekan/wrapper/api/CardService.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardService.java @@ -1,8 +1,8 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Card; import retrofit2.Call; import retrofit2.http.*; -import wekan.wrapper.entity.Card; import java.util.List; @@ -70,5 +70,5 @@ public interface CardService { @Headers("Content-Type: application/merge-patch+json") @PUT("/api/boards/{board}/lists/{list}/cards/{card}") Call putCard(@Path("board") String boardID, @Path("list") String listID, - @Path("card") String cardID, @Body Card card); + @Path("card") String cardID, @Body Card card); } diff --git a/wrapper/src/main/java/wekan/wrapper/api/ChecklistService.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/ChecklistService.java similarity index 94% rename from wrapper/src/main/java/wekan/wrapper/api/ChecklistService.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/ChecklistService.java index ca0047d..477d761 100644 --- a/wrapper/src/main/java/wekan/wrapper/api/ChecklistService.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/ChecklistService.java @@ -1,11 +1,11 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Checklist; +import it.unisannio.ding.ids.wedroid.wrapper.entity.ChecklistItem; +import it.unisannio.ding.ids.wedroid.wrapper.entity.ChecklistItemStatus; +import it.unisannio.ding.ids.wedroid.wrapper.entity.ChecklistPrototype; import retrofit2.Call; import retrofit2.http.*; -import wekan.wrapper.entity.Checklist; -import wekan.wrapper.entity.ChecklistItem; -import wekan.wrapper.entity.ChecklistPrototype; -import wekan.wrapper.entity.ChecklistItemStatus; import java.util.List; diff --git a/wrapper/src/main/java/wekan/wrapper/api/ListService.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/ListService.java similarity index 85% rename from wrapper/src/main/java/wekan/wrapper/api/ListService.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/ListService.java index c23ea8e..7e79754 100644 --- a/wrapper/src/main/java/wekan/wrapper/api/ListService.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/ListService.java @@ -1,8 +1,8 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.WList; import retrofit2.Call; import retrofit2.http.*; -import wekan.wrapper.entity.WList; import java.util.List; @@ -48,7 +48,7 @@ public interface ListService { * @return ID of the delete list */ @DELETE("/api/boards/{board}/lists/{list}") - Call deleteList (@Path("board") String boardId, @Path("list") String listId); + Call deleteList(@Path("board") String boardId, @Path("list") String listId); } diff --git a/wrapper/src/main/java/wekan/wrapper/api/LoginService.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/LoginService.java similarity index 77% rename from wrapper/src/main/java/wekan/wrapper/api/LoginService.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/LoginService.java index db1f7d9..925410b 100644 --- a/wrapper/src/main/java/wekan/wrapper/api/LoginService.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/LoginService.java @@ -1,10 +1,10 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.UserPrototype; import retrofit2.Call; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.POST; -import wekan.wrapper.entity.UserPrototype; public interface LoginService { diff --git a/wrapper/src/main/java/wekan/wrapper/api/SwimlanesService.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/SwimlanesService.java similarity index 92% rename from wrapper/src/main/java/wekan/wrapper/api/SwimlanesService.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/SwimlanesService.java index 8a3cae9..cac6d9f 100644 --- a/wrapper/src/main/java/wekan/wrapper/api/SwimlanesService.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/SwimlanesService.java @@ -1,8 +1,8 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Swimlane; import retrofit2.Call; import retrofit2.http.*; -import wekan.wrapper.entity.Swimlane; import java.util.List; diff --git a/wrapper/src/main/java/wekan/wrapper/api/UserService.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/UserService.java similarity index 88% rename from wrapper/src/main/java/wekan/wrapper/api/UserService.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/UserService.java index 9b23913..9213a4e 100644 --- a/wrapper/src/main/java/wekan/wrapper/api/UserService.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/api/UserService.java @@ -1,11 +1,10 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Action; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Board; +import it.unisannio.ding.ids.wedroid.wrapper.entity.User; import retrofit2.Call; import retrofit2.http.*; -import wekan.wrapper.entity.Action; -import wekan.wrapper.entity.Board; -import wekan.wrapper.entity.BoardPrototype; -import wekan.wrapper.entity.User; import java.util.List; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Action.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Action.java similarity index 81% rename from wrapper/src/main/java/wekan/wrapper/entity/Action.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Action.java index 8b091e8..3fb4a17 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Action.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Action.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Board.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Board.java similarity index 98% rename from wrapper/src/main/java/wekan/wrapper/entity/Board.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Board.java index 175afdf..9736f30 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Board.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Board.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/BoardBackgroundColor.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardBackgroundColor.java similarity index 92% rename from wrapper/src/main/java/wekan/wrapper/entity/BoardBackgroundColor.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardBackgroundColor.java index cc71175..32401d9 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/BoardBackgroundColor.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardBackgroundColor.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/BoardPermission.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardPermission.java similarity index 75% rename from wrapper/src/main/java/wekan/wrapper/entity/BoardPermission.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardPermission.java index 2a7b718..f74a396 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/BoardPermission.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardPermission.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/BoardPrototype.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardPrototype.java similarity index 98% rename from wrapper/src/main/java/wekan/wrapper/entity/BoardPrototype.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardPrototype.java index 9262b3d..2f9a766 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/BoardPrototype.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardPrototype.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/BoardView.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardView.java similarity index 83% rename from wrapper/src/main/java/wekan/wrapper/entity/BoardView.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardView.java index 7f04129..9c01c12 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/BoardView.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/BoardView.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Card.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Card.java similarity index 99% rename from wrapper/src/main/java/wekan/wrapper/entity/Card.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Card.java index b79bfff..25a58da 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Card.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Card.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; import java.util.Date; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Checklist.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Checklist.java similarity index 96% rename from wrapper/src/main/java/wekan/wrapper/entity/Checklist.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Checklist.java index dbd335d..937e3a2 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Checklist.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Checklist.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/ChecklistItem.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistItem.java similarity index 96% rename from wrapper/src/main/java/wekan/wrapper/entity/ChecklistItem.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistItem.java index bc43118..401410f 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/ChecklistItem.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistItem.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/ChecklistItemStatus.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistItemStatus.java similarity index 75% rename from wrapper/src/main/java/wekan/wrapper/entity/ChecklistItemStatus.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistItemStatus.java index f7f9cdb..177a1d1 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/ChecklistItemStatus.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistItemStatus.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; public class ChecklistItemStatus { private boolean isFinished; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/ChecklistPrototype.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistPrototype.java similarity index 96% rename from wrapper/src/main/java/wekan/wrapper/entity/ChecklistPrototype.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistPrototype.java index 1f36dce..05ac588 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/ChecklistPrototype.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ChecklistPrototype.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import java.util.ArrayList; import java.util.List; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Color.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Color.java similarity index 95% rename from wrapper/src/main/java/wekan/wrapper/entity/Color.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Color.java index 7841f36..450106a 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Color.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Color.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Comment.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Comment.java similarity index 96% rename from wrapper/src/main/java/wekan/wrapper/entity/Comment.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Comment.java index cef3fd1..f92df49 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Comment.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Comment.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Email.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Email.java similarity index 90% rename from wrapper/src/main/java/wekan/wrapper/entity/Email.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Email.java index f6e4a5f..cecc4e6 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Email.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Email.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import java.util.List; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Label.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Label.java similarity index 92% rename from wrapper/src/main/java/wekan/wrapper/entity/Label.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Label.java index 000fb6b..7765532 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Label.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Label.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/LabelPrototype.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/LabelPrototype.java similarity index 85% rename from wrapper/src/main/java/wekan/wrapper/entity/LabelPrototype.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/LabelPrototype.java index 221d342..ea43a54 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/LabelPrototype.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/LabelPrototype.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; /** * Describes the properties of the new label. diff --git a/wrapper/src/main/java/wekan/wrapper/entity/ListSortBy.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ListSortBy.java similarity index 86% rename from wrapper/src/main/java/wekan/wrapper/entity/ListSortBy.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ListSortBy.java index f70a795..9dfe66b 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/ListSortBy.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/ListSortBy.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/LoginToken.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/LoginToken.java similarity index 92% rename from wrapper/src/main/java/wekan/wrapper/entity/LoginToken.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/LoginToken.java index 495a8d1..f6f36bc 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/LoginToken.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/LoginToken.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; /** * contains the hash code of the access token and the date of that access diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Member.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Member.java similarity index 95% rename from wrapper/src/main/java/wekan/wrapper/entity/Member.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Member.java index 7d96c01..1125b7c 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Member.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Member.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; public class Member { private String userId; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/MemberPermission.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/MemberPermission.java similarity index 96% rename from wrapper/src/main/java/wekan/wrapper/entity/MemberPermission.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/MemberPermission.java index f3652d4..0e7049c 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/MemberPermission.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/MemberPermission.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; public class MemberPermission { /** diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Password.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Password.java similarity index 86% rename from wrapper/src/main/java/wekan/wrapper/entity/Password.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Password.java index cf6048f..51a26cd 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Password.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Password.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; public class Password { diff --git a/wrapper/src/main/java/wekan/wrapper/entity/PresentParentTask.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/PresentParentTask.java similarity index 88% rename from wrapper/src/main/java/wekan/wrapper/entity/PresentParentTask.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/PresentParentTask.java index 064fde3..0a7a33f 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/PresentParentTask.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/PresentParentTask.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Resume.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Resume.java similarity index 91% rename from wrapper/src/main/java/wekan/wrapper/entity/Resume.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Resume.java index d79a9d0..2028baf 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Resume.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Resume.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import java.util.List; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Service.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Service.java similarity index 93% rename from wrapper/src/main/java/wekan/wrapper/entity/Service.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Service.java index 392b532..660a29c 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Service.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Service.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; public class Service { diff --git a/wrapper/src/main/java/wekan/wrapper/entity/Swimlane.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Swimlane.java similarity index 96% rename from wrapper/src/main/java/wekan/wrapper/entity/Swimlane.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Swimlane.java index c814763..51ee2df 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/Swimlane.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/Swimlane.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/User.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/User.java similarity index 98% rename from wrapper/src/main/java/wekan/wrapper/entity/User.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/User.java index 8146d78..a689214 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/User.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/User.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/UserEmail.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserEmail.java similarity index 91% rename from wrapper/src/main/java/wekan/wrapper/entity/UserEmail.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserEmail.java index 51f61ae..7fc606d 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/UserEmail.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserEmail.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; public class UserEmail { public String getEmail() { diff --git a/wrapper/src/main/java/wekan/wrapper/entity/UserProfile.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserProfile.java similarity index 99% rename from wrapper/src/main/java/wekan/wrapper/entity/UserProfile.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserProfile.java index aeb0f39..817ec94 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/UserProfile.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserProfile.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import java.util.List; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/UserPrototype.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserPrototype.java similarity index 94% rename from wrapper/src/main/java/wekan/wrapper/entity/UserPrototype.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserPrototype.java index fee4e13..cb6ea6b 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/UserPrototype.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/UserPrototype.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; public class UserPrototype { diff --git a/wrapper/src/main/java/wekan/wrapper/entity/VerificationToken.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/VerificationToken.java similarity index 93% rename from wrapper/src/main/java/wekan/wrapper/entity/VerificationToken.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/VerificationToken.java index 1797ee7..7641e78 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/VerificationToken.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/VerificationToken.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import java.util.Date; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/WList.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/WList.java similarity index 97% rename from wrapper/src/main/java/wekan/wrapper/entity/WList.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/WList.java index 8790216..f081dd5 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/WList.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/WList.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; import com.google.gson.annotations.SerializedName; diff --git a/wrapper/src/main/java/wekan/wrapper/entity/WipLimit.java b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/WipLimit.java similarity index 83% rename from wrapper/src/main/java/wekan/wrapper/entity/WipLimit.java rename to wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/WipLimit.java index d2a21ff..338f8b7 100644 --- a/wrapper/src/main/java/wekan/wrapper/entity/WipLimit.java +++ b/wrapper/src/main/java/it/unisannio/ding/ids/wedroid/wrapper/entity/WipLimit.java @@ -1,4 +1,4 @@ -package wekan.wrapper.entity; +package it.unisannio.ding.ids.wedroid.wrapper.entity; class WipLimit { private int value; diff --git a/wrapper/src/test/java/wekan/wrapper/api/BoardServiceTest.java b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/BoardServiceTest.java similarity index 95% rename from wrapper/src/test/java/wekan/wrapper/api/BoardServiceTest.java rename to wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/BoardServiceTest.java index 9eadf93..2b009e3 100644 --- a/wrapper/src/test/java/wekan/wrapper/api/BoardServiceTest.java +++ b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/BoardServiceTest.java @@ -1,5 +1,10 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Board; +import it.unisannio.ding.ids.wedroid.wrapper.entity.BoardBackgroundColor; +import it.unisannio.ding.ids.wedroid.wrapper.entity.BoardPermission; +import it.unisannio.ding.ids.wedroid.wrapper.entity.BoardPrototype; +import it.unisannio.ding.ids.wedroid.wrapper.entity.PresentParentTask; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.After; @@ -7,7 +12,6 @@ import org.junit.Before; import org.junit.Test; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; -import wekan.wrapper.entity.*; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/wrapper/src/test/java/wekan/wrapper/api/CardCommentServiceTest.java b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardCommentServiceTest.java similarity index 97% rename from wrapper/src/test/java/wekan/wrapper/api/CardCommentServiceTest.java rename to wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardCommentServiceTest.java index 31ab537..e34daba 100644 --- a/wrapper/src/test/java/wekan/wrapper/api/CardCommentServiceTest.java +++ b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardCommentServiceTest.java @@ -1,5 +1,6 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Comment; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.After; @@ -7,7 +8,6 @@ import org.junit.Before; import org.junit.Test; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; -import wekan.wrapper.entity.Comment; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/wrapper/src/test/java/wekan/wrapper/api/CardServiceTest.java b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardServiceTest.java similarity index 98% rename from wrapper/src/test/java/wekan/wrapper/api/CardServiceTest.java rename to wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardServiceTest.java index be4bbe0..e8b6625 100644 --- a/wrapper/src/test/java/wekan/wrapper/api/CardServiceTest.java +++ b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/CardServiceTest.java @@ -1,13 +1,14 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; import org.junit.After; import org.junit.Before; import org.junit.Test; + +import it.unisannio.ding.ids.wedroid.wrapper.entity.Card; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; -import wekan.wrapper.entity.Card; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/wrapper/src/test/java/wekan/wrapper/api/ChecklistServiceTest.java b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/ChecklistServiceTest.java similarity index 96% rename from wrapper/src/test/java/wekan/wrapper/api/ChecklistServiceTest.java rename to wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/ChecklistServiceTest.java index 99d9784..b8b2e5c 100644 --- a/wrapper/src/test/java/wekan/wrapper/api/ChecklistServiceTest.java +++ b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/ChecklistServiceTest.java @@ -1,5 +1,9 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Checklist; +import it.unisannio.ding.ids.wedroid.wrapper.entity.ChecklistItem; +import it.unisannio.ding.ids.wedroid.wrapper.entity.ChecklistItemStatus; +import it.unisannio.ding.ids.wedroid.wrapper.entity.ChecklistPrototype; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.After; @@ -7,7 +11,6 @@ import org.junit.Before; import org.junit.Test; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; -import wekan.wrapper.entity.*; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/wrapper/src/test/java/wekan/wrapper/api/ListServiceTest.java b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/ListServiceTest.java similarity index 97% rename from wrapper/src/test/java/wekan/wrapper/api/ListServiceTest.java rename to wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/ListServiceTest.java index e75c85f..5db7826 100644 --- a/wrapper/src/test/java/wekan/wrapper/api/ListServiceTest.java +++ b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/ListServiceTest.java @@ -1,5 +1,6 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.WList; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.After; @@ -7,7 +8,6 @@ import org.junit.Before; import org.junit.Test; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; -import wekan.wrapper.entity.*; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/wrapper/src/test/java/wekan/wrapper/api/SwimlanesServiceTest.java b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/SwimlanesServiceTest.java similarity index 95% rename from wrapper/src/test/java/wekan/wrapper/api/SwimlanesServiceTest.java rename to wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/SwimlanesServiceTest.java index 7686589..29e35aa 100644 --- a/wrapper/src/test/java/wekan/wrapper/api/SwimlanesServiceTest.java +++ b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/SwimlanesServiceTest.java @@ -1,5 +1,7 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Color; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Swimlane; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.After; @@ -7,8 +9,6 @@ import org.junit.Before; import org.junit.Test; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; -import wekan.wrapper.entity.Color; -import wekan.wrapper.entity.Swimlane; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/wrapper/src/test/java/wekan/wrapper/api/UserServiceTest.java b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/UserServiceTest.java similarity index 96% rename from wrapper/src/test/java/wekan/wrapper/api/UserServiceTest.java rename to wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/UserServiceTest.java index 423722b..917f8e7 100644 --- a/wrapper/src/test/java/wekan/wrapper/api/UserServiceTest.java +++ b/wrapper/src/test/java/it/unisannio/ding/ids/wedroid/wrapper/api/UserServiceTest.java @@ -1,5 +1,9 @@ -package wekan.wrapper.api; +package it.unisannio.ding.ids.wedroid.wrapper.api; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Service; +import it.unisannio.ding.ids.wedroid.wrapper.entity.User; +import it.unisannio.ding.ids.wedroid.wrapper.entity.UserEmail; +import it.unisannio.ding.ids.wedroid.wrapper.entity.UserProfile; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.After; @@ -10,10 +14,6 @@ import static org.junit.Assert.*; import retrofit2.Call; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; -import wekan.wrapper.entity.Service; -import wekan.wrapper.entity.User; -import wekan.wrapper.entity.UserEmail; -import wekan.wrapper.entity.UserProfile; import javax.jws.soap.SOAPBinding; import java.io.IOException;