Skip to content

Commit

Permalink
fix: 누락된 아이콘 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
404-forbidden committed Dec 5, 2024
1 parent 00a71da commit 396d4ac
Show file tree
Hide file tree
Showing 33 changed files with 770 additions and 18 deletions.
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/2024-02-CSC4004-2-1-PeopleOfDev.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

337 changes: 337 additions & 0 deletions .idea/assetWizardSettings.xml

Large diffs are not rendered by default.

329 changes: 329 additions & 0 deletions .idea/caches/deviceStreaming.xml

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions MomentUp/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@
<activity
android:name=".MainActivity"
android:exported="false" />
<activity
android:name=".CalendarActivity"
android:exported="false" >
<intent-filter>

</intent-filter>

</activity>
</application>

</manifest>
Binary file modified MomentUp/app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import androidx.fragment.app.Fragment
import com.example.momentup.databinding.ActivityHomeScreenBinding
import com.google.android.material.bottomnavigation.BottomNavigationView

class HomeScreenActivity : AppCompatActivity() {
/*class HomeScreenActivity : AppCompatActivity() {
private lateinit var binding: ActivityHomeScreenBinding
Expand Down Expand Up @@ -64,4 +64,4 @@ class HomeScreenActivity : AppCompatActivity() {
is ProfileFragment -> binding.bottomNavigation.selectedItemId = R.id.nav_profile
}
}
}
}*/
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public void onClick(View v) {
}
});
} else {
headImg.setImageDrawable(ContextCompat.getDrawable(itemView.getContext(), R.drawable.camera));
headImg.setImageDrawable(ContextCompat.getDrawable(itemView.getContext(), R.drawable.ic_camera_mono));
optBtnLl.setVisibility(View.GONE);
}
}
Expand Down
10 changes: 10 additions & 0 deletions MomentUp/app/src/main/res/drawable/ic_delete.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M12.555,13.947C12.555,14.146 12.476,14.336 12.335,14.477C12.195,14.618 12.004,14.697 11.805,14.697C11.606,14.697 11.415,14.618 11.275,14.477C11.134,14.336 11.055,14.146 11.055,13.947V9.775C11.055,9.576 11.134,9.385 11.275,9.245C11.415,9.104 11.606,9.025 11.805,9.025C12.004,9.025 12.195,9.104 12.335,9.245C12.476,9.385 12.555,9.576 12.555,9.775V13.947ZM9.111,13.947C9.111,14.146 9.032,14.336 8.891,14.477C8.751,14.618 8.56,14.697 8.361,14.697C8.162,14.697 7.971,14.618 7.831,14.477C7.69,14.336 7.611,14.146 7.611,13.947V9.775C7.611,9.576 7.69,9.385 7.831,9.245C7.971,9.104 8.162,9.025 8.361,9.025C8.56,9.025 8.751,9.104 8.891,9.245C9.032,9.385 9.111,9.576 9.111,9.775V13.947ZM7.524,3.216C7.524,2.995 7.612,2.783 7.768,2.627C7.925,2.47 8.136,2.382 8.357,2.382H11.811C12.27,2.382 12.644,2.756 12.644,3.216V4H7.524V3.216ZM16.916,4H14.311V3.216C14.311,1.837 13.19,0.716 11.811,0.716H8.357C6.979,0.716 5.857,1.837 5.857,3.216V4H3.083C2.818,4 2.564,4.105 2.376,4.293C2.189,4.48 2.083,4.735 2.083,5V5.5C2.083,5.765 2.189,6.02 2.376,6.207C2.564,6.395 2.818,6.5 3.083,6.5H3.192L3.586,16.53C3.606,17.046 3.826,17.535 4.199,17.893C4.571,18.251 5.068,18.451 5.585,18.451H14.582C15.098,18.451 15.595,18.251 15.967,17.893C16.34,17.535 16.559,17.046 16.579,16.53L16.974,6.488C17.228,6.475 17.467,6.366 17.642,6.182C17.817,5.998 17.916,5.754 17.917,5.5V5C17.917,4.448 17.468,4 16.916,4Z"
android:fillColor="#CCD3DB"
android:fillType="evenOdd"/>
</vector>
7 changes: 7 additions & 0 deletions MomentUp/app/src/main/res/drawable/notification_gray_bg.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">

<corners android:radius="24dp" />
<solid android:color="#9B9797" />

</shape>
6 changes: 3 additions & 3 deletions MomentUp/app/src/main/res/layout/alarm_recycler_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
android:layout_marginHorizontal="5dp"
android:layout_marginTop="10dp"
android:orientation="vertical"
app:cardCornerRadius="8dp">
app:cardCornerRadius="10dp">


<LinearLayout
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#16222F"
android:background="#15222F"
android:orientation="vertical"
android:padding="10dp">

Expand Down Expand Up @@ -70,7 +70,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="5dp"
android:src="@drawable/delete" />
android:src="@drawable/ic_delete" />

<Switch
android:id="@+id/switch_controller"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_logo"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_logo"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
Binary file not shown.
2 changes: 1 addition & 1 deletion MomentUp/app/src/main/res/values/style.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<!-- 캘린더의 요일에 적용되는 스타일 -->
<style name="CalenderViewWeekCustomText" parent="android:TextAppearance.DeviceDefault.Small">
<item name="android:textColor">@color/calendar_gray</item>
<item name="android:textColor">@color/gray3</item>
</style>

<!-- 연, 월을 표시하는 헤더에 적용되는 스타일 -->
Expand Down
2 changes: 1 addition & 1 deletion MomentUp/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
agp = "8.6.0"
kotlin = "1.9.10"
kotlin = "1.9.0"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
Expand Down

0 comments on commit 396d4ac

Please sign in to comment.