kanban/wedroid
2
0
Fork 0
Code Issues 4 Pull Requests Releases 1 Wiki Activity

Merge branch 'feature_boards_list' of ssh://git.norangeb.it:2222/kanban/wedroid into feature_login
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
noemi3 2019-12-28 19:53:23 +01:00
commit bce45d2605
11 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -33,10 +33,8 @@ android {
dependencies {
// standard
detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.2.2"
implementation project(':wrapper')
detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.2.2"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.1.0'
@ -81,5 +79,4 @@ dependencies {
androidTestImplementation "androidx.room:room-testing:$rootProject.roomVersion"
androidTestImplementation "androidx.arch.core:core-testing:$rootProject.androidxArchVersion"
androidTestImplementation "androidx.arch.core:core-testing:$rootProject.coreTestingVersion"
}

5
app/src/androidTest/java/it/unisannio/ding/ids/wedroid/app/data/dao/BoardDaoTest.kt
View File

@ -17,7 +17,6 @@ import org.junit.Test
import org.junit.runner.RunWith
import java.io.IOException
@RunWith(AndroidJUnit4::class)
class BoardDaoTest {
private lateinit var dao: BoardDao
@ -109,7 +108,3 @@ class BoardDaoTest {
}
}
}

6
app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/dao/BoardDao.kt
View File

@ -1,7 +1,11 @@
package it.unisannio.ding.ids.wedroid.app.data.dao
import androidx.lifecycle.LiveData
import androidx.room.*
import androidx.room.Dao
import androidx.room.Delete
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import it.unisannio.ding.ids.wedroid.app.data.entity.Board
@Dao

1
app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/entity/Board.kt
View File

@ -13,4 +13,3 @@ data class Board(
fun it.unisannio.ding.ids.wedroid.wrapper.entity.Board.convert(): Board {
return Board(this.id, this.title)
}

1
app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/BoardRepository.kt
View File

@ -159,4 +159,3 @@ class BoardRepository(
Log.e("RETROFIT", message)
}
}

9
app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/ServicesFactory.kt
View File

@ -1,6 +1,12 @@
package it.unisannio.ding.ids.wedroid.app.util
import it.unisannio.ding.ids.wedroid.wrapper.api.*
import it.unisannio.ding.ids.wedroid.wrapper.api.BoardService
import it.unisannio.ding.ids.wedroid.wrapper.api.CardCommentService
import it.unisannio.ding.ids.wedroid.wrapper.api.CardService
import it.unisannio.ding.ids.wedroid.wrapper.api.ChecklistService
import it.unisannio.ding.ids.wedroid.wrapper.api.ListService
import it.unisannio.ding.ids.wedroid.wrapper.api.SwimlanesService
import it.unisannio.ding.ids.wedroid.wrapper.api.UserService
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
@ -75,4 +81,3 @@ class ServicesFactory private constructor(
}
}
}

5
app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt
View File

@ -2,7 +2,7 @@ package it.unisannio.ding.ids.wedroid.app.util
import android.content.Context
class SharedPreferenceHelper(context : Context) : PreferenceReader, PreferenceWriter {
class SharedPreferenceHelper(context: Context) : PreferenceReader, PreferenceWriter {
private val sp = context.getSharedPreferences("userinfo", Context.MODE_PRIVATE)
override fun getBaseUrl(): String? {
@ -20,8 +20,7 @@ class SharedPreferenceHelper(context : Context) : PreferenceReader, PreferenceWr
override fun setBaseUrl(baseUrl: String?) {
val editor = sp.edit()
editor.putString("url", baseUrl).apply()
}
}
override fun setUserId(userId: String?) {
val editor = sp.edit()

3
app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt
View File

@ -118,7 +118,7 @@ class BoardsListsActivity : AppCompatActivity() {
val isPrivate = data.getBooleanExtra(NewBoardActivity.BOARD_PRIVATE, true)
viewModel.insertBoard(title, isPrivate, BoardBackgroundColor.LIMEGREEN) //TODO
viewModel.insertBoard(title, isPrivate, BoardBackgroundColor.LIMEGREEN) // TODO
}
companion object {
@ -126,4 +126,3 @@ class BoardsListsActivity : AppCompatActivity() {
const val LOGIN_CODE = 19
}
}

4
app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/LoginActivity.kt
View File

@ -37,7 +37,6 @@ class LoginActivity : AppCompatActivity() {
return
}
val userNameText = username.text.toString()
val passwordText = password.text.toString()
@ -47,8 +46,6 @@ class LoginActivity : AppCompatActivity() {
.build()
.create(LoginService::class.java)
service.login(userNameText, passwordText).enqueue(object : Callback<UserPrototype> {
override fun onFailure(call: Call<UserPrototype>, t: Throwable) {
Toast.makeText(
@ -82,7 +79,6 @@ class LoginActivity : AppCompatActivity() {
setResult(LOGIN_OK)
finish()
}
})
}

1
app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/BoardsListAdapter.kt
View File

@ -9,7 +9,6 @@ import androidx.recyclerview.widget.RecyclerView
import it.unisannio.ding.ids.wedroid.app.R
import it.unisannio.ding.ids.wedroid.app.data.entity.Board
class BoardsListAdapter internal constructor(
context: Context
) : RecyclerView.Adapter<BoardsListAdapter.BoardViewHolder>() {

1
app/src/test/java/it/unisannio/ding/ids/wedroid/app/TestHelper.kt
View File

@ -10,4 +10,3 @@ fun getPrivateFun(name: String, kClass: KClass<*>): KFunction<*>? {
.find { it.name == name }
.also { it?.isAccessible = true }
}