Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[Team-04][Android][Linus_Jay][2주차 수요일 세번째 PR]" #203

Open
wants to merge 1 commit into
base: team-04
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {

defaultConfig {
applicationId "com.example.issu_tracker"
minSdk 23
minSdk 21
targetSdk 32
versionCode 1
versionName "1.0"
Expand All @@ -38,14 +38,6 @@ android {
}

dependencies {
//Room
implementation "androidx.room:room-ktx:2.4.2"
kapt "androidx.room:room-compiler:2.4.2"
implementation "androidx.room:room-runtime:2.4.2"
annotationProcessor "androidx.room:room-compiler:2.4.2"
// Glide
implementation 'com.github.bumptech.glide:glide:4.13.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.1"
// hilt
Expand All @@ -68,13 +60,12 @@ dependencies {

//cloud fireStore
implementation 'com.google.firebase:firebase-firestore-ktx'

//firebase for Google and Github Oauth login
implementation platform('com.google.firebase:firebase-bom:30.0.1')
implementation 'com.google.firebase:firebase-analytics-ktx'
implementation 'com.google.firebase:firebase-auth-ktx'
implementation 'com.google.android.gms:play-services-auth:20.2.0'
// Declare the dependency for the Cloud Storage library
implementation 'com.google.firebase:firebase-storage-ktx'

// Testing
testImplementation "androidx.arch.core:core-testing:2.1.0"
Expand All @@ -83,8 +74,4 @@ dependencies {
testImplementation 'androidx.test.ext:junit:1.1.2'
testImplementation "org.robolectric:robolectric:4.4"

// Markwon (display markdown)
implementation "io.noties.markwon:core:$markwon_version"
implementation "io.noties.markwon:editor:$markwon_version"
implementation "io.noties.markwon:image:$markwon_version"
}
9 changes: 4 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package="com.example.issu_tracker">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

<application
android:name=".IssueTrackerApplication"
Expand All @@ -13,12 +12,12 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Issutracker">
<activity
android:name=".ui.DetailIssueActivity"
android:exported="false" />
<activity
android:name=".ui.home.HomeActivity"
android:exported="true"></activity>
android:exported="true">

</activity>

<activity
android:name=".ui.login.LogInActivity"
android:exported="true">
Expand Down
9 changes: 3 additions & 6 deletions app/src/main/java/com/example/issu_tracker/data/Comment.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package com.example.issu_tracker.data

import java.io.Serializable

data class Comment(
val commentUser: User? = null,
val content: String = "",
val time: String = ""
) : Serializable
val commentUser: User?=null, val content: String="",
val time: String=""
)
11 changes: 6 additions & 5 deletions app/src/main/java/com/example/issu_tracker/data/Issue.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package com.example.issu_tracker.data

import java.io.Serializable
import com.google.gson.annotations.SerializedName

import java.lang.Exception

data class Label(val color: String = "", val content: String = "")

data class IssueDto(
var id: String = "",
val commets: List<Comment> = listOf(),
val description: String = "",
val label: List<Label> = listOf(),
Expand All @@ -15,19 +17,18 @@ data class IssueDto(
)

data class Issue(
var id: String,
val comments: List<Comment>,
val description: String,
val label: List<Label>,
val mileStone: String,
val state: Boolean,
val title: String,
val user: User
) : Serializable
)

fun IssueDto.toIssue(): Issue? {
return try {
Issue(id, commets, description, label, mileStone, state, title, user!!)
Issue(commets, description, label, mileStone, state, title, user!!)
} catch (e: Exception) {
null
}
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/example/issu_tracker/data/Label.kt

This file was deleted.

50 changes: 0 additions & 50 deletions app/src/main/java/com/example/issu_tracker/data/Repository.kt

This file was deleted.

12 changes: 1 addition & 11 deletions app/src/main/java/com/example/issu_tracker/data/User.kt
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
package com.example.issu_tracker.data

import androidx.room.Entity
import androidx.room.PrimaryKey
import java.io.Serializable

@Entity
data class User(val UID: String = "", val name: String = "", val userPhoto: String?=null) :
Serializable {
@PrimaryKey(autoGenerate = true)
var id: Int = 0
}

data class UserDto(val UID: String = "", val name: String = "", val userPhoto: String)
data class User(val UID: String="", val name: String="", val userPhoto: String? = null)

This file was deleted.

29 changes: 0 additions & 29 deletions app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
package com.example.issu_tracker.data.repository

import com.example.issu_tracker.data.Issue
import com.example.issu_tracker.data.User

interface HomeRepository {

// TODO 추후 반환타입 수정
suspend fun loadIssues(): List<Issue>
suspend fun updateIssueState(itemId: String, boolean: Boolean)

suspend fun deleteIssueList(list: List<Issue>)

suspend fun updateIssueListState(list: List<Issue>, boolean: Boolean)


}
Loading