From 3177f2dc523da5659412127c4da11eecaa39daaf Mon Sep 17 00:00:00 2001 From: bbaktaeho Date: Fri, 12 Feb 2021 18:46:29 +0900 Subject: [PATCH] =?UTF-8?q?Save:=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 8 +- .../ui/main/album/AlbumDetailActivity.kt | 1 - .../presentation/ui/main/home/HomeFragment.kt | 1 - .../ui/main/timeline/TimelineAdapter.kt | 5 +- .../ui/tempmain/TempMainActivity.kt | 12 - .../main/res/layout/activity_time_line.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 2 +- app/src/main/res/layout/item_time_line.xml | 225 ++++++++++-------- app/src/main/res/layout/item_time_line2.xml | 130 ---------- .../main/res/layout/test_activity_main.xml | 119 --------- app/src/main/res/values/strings.xml | 15 ++ 12 files changed, 154 insertions(+), 367 deletions(-) delete mode 100644 app/src/main/java/com/example/noogabab/presentation/ui/tempmain/TempMainActivity.kt delete mode 100644 app/src/main/res/layout/item_time_line2.xml delete mode 100644 app/src/main/res/layout/test_activity_main.xml diff --git a/app/build.gradle b/app/build.gradle index c03b1d1..22c6cfa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,6 +43,7 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.viewpager2:viewpager2:1.0.0' implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.preference:preference:1.1.1' def room_version = "2.2.6" def lifecycle_version = "2.2.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9509ee6..3523c3d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,19 +5,19 @@ - - + + - + ): Recyc override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TimelineViewHolder { val inflate = LayoutInflater .from(parent.context) - .inflate(R.layout.item_time_line2, parent, false) + .inflate(R.layout.item_time_line, parent, false) return TimelineViewHolder(inflate) } diff --git a/app/src/main/java/com/example/noogabab/presentation/ui/tempmain/TempMainActivity.kt b/app/src/main/java/com/example/noogabab/presentation/ui/tempmain/TempMainActivity.kt deleted file mode 100644 index 1447e76..0000000 --- a/app/src/main/java/com/example/noogabab/presentation/ui/tempmain/TempMainActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.noogabab.presentation.ui.tempmain - -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle -import com.example.noogabab.R - -class TempMainActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_temp_main) - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_time_line.xml b/app/src/main/res/layout/activity_time_line.xml index 3bac3fa..6ce5ae5 100644 --- a/app/src/main/res/layout/activity_time_line.xml +++ b/app/src/main/res/layout/activity_time_line.xml @@ -26,7 +26,7 @@ android:id="@+id/recycler_timeline" android:layout_width="match_parent" android:layout_height="match_parent" - tools:listitem="@layout/item_time_line2" /> + tools:listitem="@layout/item_time_line" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_time_line2.xml b/app/src/main/res/layout/item_time_line2.xml deleted file mode 100644 index f557ee5..0000000 --- a/app/src/main/res/layout/item_time_line2.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/test_activity_main.xml b/app/src/main/res/layout/test_activity_main.xml deleted file mode 100644 index bcf3cae..0000000 --- a/app/src/main/res/layout/test_activity_main.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - -