Merge pull request #88 from DKU-Dgaja/an-feat(#86)-마이스터디-관련-페이지-ui-구현

[AN] feat(#86): 마이스터디 관련 페이지 UI 구현
DKU-Dgaja · Feb 1, 2024 · 6eed960 · 6eed960
2 parents 6894fb2 + 9bca1d5
commit 6eed960
Show file tree

Hide file tree

Showing 34 changed files with 823 additions and 74 deletions.
diff --git a/frontend/presentation/src/main/AndroidManifest.xml b/frontend/presentation/src/main/AndroidManifest.xml
@@ -2,6 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
+        <activity
+            android:name=".ui.home.ToDoActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.mystudy.MyStudyMainActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.home.MainHomeActivity"
             android:exported="false" />

diff --git a/frontend/presentation/src/main/java/com/takseha/presentation/ui/home/ToDoActivity.kt b/frontend/presentation/src/main/java/com/takseha/presentation/ui/home/ToDoActivity.kt
@@ -0,0 +1,12 @@
+package com.takseha.presentation.ui.home
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.takseha.presentation.R
+
+class ToDoActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_to_do)
+    }
+}
diff --git a/...end/presentation/src/main/java/com/takseha/presentation/ui/mystudy/MyStudyMainActivity.kt b/...end/presentation/src/main/java/com/takseha/presentation/ui/mystudy/MyStudyMainActivity.kt
@@ -0,0 +1,12 @@
+package com.takseha.presentation.ui.mystudy
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.takseha.presentation.R
+
+class MyStudyMainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_my_study_main)
+    }
+}
diff --git a/frontend/presentation/src/main/res/drawable/box_non_stroke_r8.xml b/frontend/presentation/src/main/res/drawable/box_non_stroke_r8.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="#EFF8FF"/>
+    <size
+        android:width="346dp"
+        android:height="52dp" />
+    <corners android:radius="8dp" />
+</shape>
diff --git a/frontend/presentation/src/main/res/drawable/ic_filter.png b/frontend/presentation/src/main/res/drawable/ic_filter.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_lock.png b/frontend/presentation/src/main/res/drawable/ic_lock.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_noti.png b/frontend/presentation/src/main/res/drawable/ic_noti.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_plus.png b/frontend/presentation/src/main/res/drawable/ic_plus.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_rank.png b/frontend/presentation/src/main/res/drawable/ic_rank.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_search.png b/frontend/presentation/src/main/res/drawable/ic_search.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_smile.png b/frontend/presentation/src/main/res/drawable/ic_smile.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_study_commit.png b/frontend/presentation/src/main/res/drawable/ic_study_commit.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_study_github_link.png b/frontend/presentation/src/main/res/drawable/ic_study_github_link.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_thumbs_up.png b/frontend/presentation/src/main/res/drawable/ic_thumbs_up.png
diff --git a/frontend/presentation/src/main/res/drawable/ic_todo_git.png b/frontend/presentation/src/main/res/drawable/ic_todo_git.png
diff --git a/frontend/presentation/src/main/res/drawable/img_study_background_1.png b/frontend/presentation/src/main/res/drawable/img_study_background_1.png
diff --git a/frontend/presentation/src/main/res/drawable/img_study_background_2.png b/frontend/presentation/src/main/res/drawable/img_study_background_2.png
diff --git a/frontend/presentation/src/main/res/drawable/logo_blog_700.png b/frontend/presentation/src/main/res/drawable/logo_blog_700.png
diff --git a/frontend/presentation/src/main/res/drawable/logo_git.png b/frontend/presentation/src/main/res/drawable/logo_git.png
diff --git a/frontend/presentation/src/main/res/drawable/progress_bar.xml b/frontend/presentation/src/main/res/drawable/progress_bar.xml
@@ -14,9 +14,9 @@
             android:fromDegrees="270"
             android:toDegrees="270" >
             <shape
-                android:innerRadiusRatio="2.1"
+                android:innerRadiusRatio="2.15"
                 android:shape="ring"
-                android:thickness="8dp" >
+                android:thickness="13dp" >
                 <gradient
                     android:endColor="@color/BASIC_BLUE"
                     android:startColor="@color/BASIC_GREEN"

diff --git a/frontend/presentation/src/main/res/layout/activity_main_home.xml b/frontend/presentation/src/main/res/layout/activity_main_home.xml
@@ -19,6 +19,7 @@
         android:layout_marginBottom="-20dp"
         android:background="@color/WHITE"
         app:cardCornerRadius="20dp"
+        android:elevation="60dp"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <LinearLayout