diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..7cacbdc --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,32 @@ +name: Build Battify + +on: + pull_request: + branches: [master] + push: + branches: [master] + +permissions: + contents: read + +concurrency: + group: battify-build-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + name: Build app project + runs-on: windows-latest + + steps: + - name: Check out source + uses: actions/checkout@v4 + + - name: Set up MSBuild + uses: microsoft/setup-msbuild@v2 + + - name: Restore dependencies + run: msbuild Battify/Battify.csproj /restore + + - name: Build app + run: msbuild Battify/Battify.csproj /m /p:Configuration=Release /p:Platform=AnyCPU /p:RestoreIgnoreFailedSources=true diff --git a/Battify/App.xaml b/Battify/App.xaml index 5d50abc..87f05dd 100644 --- a/Battify/App.xaml +++ b/Battify/App.xaml @@ -4,6 +4,9 @@ xmlns:local="clr-namespace:Battify" StartupUri="MainWindow.xaml"> - + + diff --git a/Battify/TrayControl.Designer.cs b/Battify/TrayControl.Designer.cs index 7e36fd0..537795d 100644 --- a/Battify/TrayControl.Designer.cs +++ b/Battify/TrayControl.Designer.cs @@ -57,7 +57,7 @@ private void InitializeComponent() // closeAppToolStripMenuItem // closeAppToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text; - closeAppToolStripMenuItem.Font = new Font("맑은 고딕", 10F); + closeAppToolStripMenuItem.Font = new Font("Noto Sans KR", 10F); closeAppToolStripMenuItem.ForeColor = Color.FromArgb(224, 224, 224); closeAppToolStripMenuItem.Name = "closeAppToolStripMenuItem"; closeAppToolStripMenuItem.Padding = new Padding(4, 6, 4, 6); @@ -69,7 +69,7 @@ private void InitializeComponent() // appearanceToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text; appearanceToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { changeTrayToolStripMenuItem, changeThemeToolStripMenuItem }); - appearanceToolStripMenuItem.Font = new Font("맑은 고딕", 10F); + appearanceToolStripMenuItem.Font = new Font("Noto Sans KR", 10F); appearanceToolStripMenuItem.ForeColor = Color.FromArgb(224, 224, 224); appearanceToolStripMenuItem.Name = "appearanceToolStripMenuItem"; appearanceToolStripMenuItem.Padding = new Padding(4, 6, 4, 6); @@ -80,7 +80,7 @@ private void InitializeComponent() // changeTrayToolStripMenuItem.BackColor = Color.FromArgb(30, 30, 30); changeTrayToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text; - changeTrayToolStripMenuItem.Font = new Font("맑은 고딕", 9F); + changeTrayToolStripMenuItem.Font = new Font("Noto Sans KR", 9F); changeTrayToolStripMenuItem.ForeColor = Color.FromArgb(224, 224, 224); changeTrayToolStripMenuItem.Name = "changeTrayToolStripMenuItem"; changeTrayToolStripMenuItem.Padding = new Padding(4, 6, 4, 6); @@ -92,7 +92,7 @@ private void InitializeComponent() // changeThemeToolStripMenuItem.BackColor = Color.FromArgb(30, 30, 30); changeThemeToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text; - changeThemeToolStripMenuItem.Font = new Font("맑은 고딕", 9F); + changeThemeToolStripMenuItem.Font = new Font("Noto Sans KR", 9F); changeThemeToolStripMenuItem.ForeColor = Color.FromArgb(224, 224, 224); changeThemeToolStripMenuItem.Name = "changeThemeToolStripMenuItem"; changeThemeToolStripMenuItem.Padding = new Padding(4, 6, 4, 6); @@ -104,7 +104,7 @@ private void InitializeComponent() // notificationToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text; notificationToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { muteToolStripMenuItem, togglePopupToolStripMenuItem }); - notificationToolStripMenuItem.Font = new Font("맑은 고딕", 10F); + notificationToolStripMenuItem.Font = new Font("Noto Sans KR", 10F); notificationToolStripMenuItem.ForeColor = Color.FromArgb(224, 224, 224); notificationToolStripMenuItem.Name = "notificationToolStripMenuItem"; notificationToolStripMenuItem.Padding = new Padding(4, 6, 4, 6); @@ -115,7 +115,7 @@ private void InitializeComponent() // muteToolStripMenuItem.BackColor = Color.FromArgb(30, 30, 30); muteToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text; - muteToolStripMenuItem.Font = new Font("맑은 고딕", 9F); + muteToolStripMenuItem.Font = new Font("Noto Sans KR", 9F); muteToolStripMenuItem.ForeColor = Color.FromArgb(224, 224, 224); muteToolStripMenuItem.Name = "muteToolStripMenuItem"; muteToolStripMenuItem.Padding = new Padding(4, 6, 4, 6); @@ -127,7 +127,7 @@ private void InitializeComponent() // togglePopupToolStripMenuItem.BackColor = Color.FromArgb(30, 30, 30); togglePopupToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text; - togglePopupToolStripMenuItem.Font = new Font("맑은 고딕", 9F); + togglePopupToolStripMenuItem.Font = new Font("Noto Sans KR", 9F); togglePopupToolStripMenuItem.ForeColor = Color.FromArgb(224, 224, 224); togglePopupToolStripMenuItem.Name = "togglePopupToolStripMenuItem"; togglePopupToolStripMenuItem.Padding = new Padding(4, 6, 4, 6); @@ -138,7 +138,7 @@ private void InitializeComponent() // showBattInfoToolStripMenuItem // showBattInfoToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text; - showBattInfoToolStripMenuItem.Font = new Font("맑은 고딕", 10F); + showBattInfoToolStripMenuItem.Font = new Font("Noto Sans KR", 10F); showBattInfoToolStripMenuItem.ForeColor = Color.White; showBattInfoToolStripMenuItem.Name = "showBattInfoToolStripMenuItem"; showBattInfoToolStripMenuItem.Padding = new Padding(4, 6, 4, 6); @@ -149,7 +149,7 @@ private void InitializeComponent() // infoItemToolStripMenuItem // infoItemToolStripMenuItem.Enabled = false; - infoItemToolStripMenuItem.Font = new Font("맑은 고딕", 7.8F, FontStyle.Italic, GraphicsUnit.Point, 0); + infoItemToolStripMenuItem.Font = new Font("Noto Sans KR", 7.8F, FontStyle.Italic, GraphicsUnit.Point, 0); infoItemToolStripMenuItem.ForeColor = Color.Silver; infoItemToolStripMenuItem.Name = "infoItemToolStripMenuItem"; infoItemToolStripMenuItem.Size = new Size(142, 28); diff --git a/Battify/TrayGuideWindow.xaml b/Battify/TrayGuideWindow.xaml index cd18ce6..6455fdf 100644 --- a/Battify/TrayGuideWindow.xaml +++ b/Battify/TrayGuideWindow.xaml @@ -101,7 +101,7 @@ Content="확인했어요" Style="{StaticResource DarkButtonStyle}" HorizontalAlignment="Right" - Width="190" + Width="160" Height="41" Click="ConfirmButton_Click" Margin="0,15,20,20"/>