Skip to content

Commit

Permalink
Dev Commit | Preview release
Browse files Browse the repository at this point in the history
[ Note ]
- Thinking of switching to config file instead of settings because changing the file location
causes the settings to be created as new
thus the "Short Tour" keeps appearing.
  • Loading branch information
IchimakiKasura committed Jun 26, 2023
1 parent 3f0ccfc commit b30c6dc
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 15 deletions.
3 changes: 3 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ Instead it knows when the game has a new version available.

The App requires [NET-7](https://download.visualstudio.microsoft.com/download/pr/4b99bbc8-917a-417c-907b-d408341726a5/78b225344fbb9b80d3da3681e1d20d68/dotnet-runtime-7.0.5-win-x64.exe)

If you ever get a virus warning saying **"Trojan:Script/Wacatac.B!ml"** its 100% false positive<br>
and if you're not sure about it, Feel free to clone this repository and build it your own.

# Overview (out-dated picture)
| | |
|-|-|
Expand Down
3 changes: 3 additions & 0 deletions src/AppMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ namespace HoyoLauncher;

public partial class App
{

public static readonly bool IsPreview = true;

static readonly string AppName = Assembly.GetExecutingAssembly().GetName().Name;
public static readonly string Version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
public readonly static string UniqueHashBUILD = HoyoMain.GenerateMD5HASH();
Expand Down
2 changes: 1 addition & 1 deletion src/HoyoLauncher.Core/EventsHandle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
public sealed class EventsHandles
{
public static void WindowHomeLogo() =>
HoyoWindow.HoyoTitleIMG.Visibility = AppSettings.Settings.Default.CHECKBOX_TITLE ? Visibility.Collapsed : Visibility.Visible;
HoyoWindow.HoyoTitleIMG.Visibility = AppSettings.Settings.Default.CHECKBOX_TITLE ? Visibility.Visible : Visibility.Collapsed;
public static void WindowSideButtonToolTips()
{
HoyoWindow.GENSHIN_IMPACT_REWARDS.ButtonToolTip = ToolTips.GENSHIN_IMPACT_TIP;
Expand Down
3 changes: 2 additions & 1 deletion src/HoyoLauncher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
<AssemblyVersion>1.8.0.3</AssemblyVersion>
<FileVersion>1.8.0.3</FileVersion>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<Copyright>2023</Copyright>
<Copyright>Copyright © Ceele Launcher 2023</Copyright>
<NeutralLanguage>en</NeutralLanguage>
<ApplicationIcon>Resources\Icons\256.ico</ApplicationIcon>
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
</PropertyGroup>

<PropertyGroup Condition="$(Configuration) == Release">
Expand Down
6 changes: 3 additions & 3 deletions src/HoyoLauncherSettings/HoyoSettings.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
</RadioButton>
</Border>

<Border Name="RadioButtonDisableTitle_Click" Cursor="Hand" Background="Transparent" Height="26" Width="301" HorizontalAlignment="Center" Canvas.Top="147" VerticalAlignment="Top" Canvas.Left="11" Uid="Display the &quot;Hoyoverse&quot; Title Logo on Home screen?&#xa;&#xa;&#xa;&#xa;&#xa;&#xa;&#xa;[Requires App Restart]">
<RadioButton Name="RadioButtonDisableTitle" IsHitTestVisible="False" Content="Remove Hoyoverse Title on Home" Margin="0,0,100,9">
<Border Name="RadioButtonDisableTitle_Click" Cursor="Hand" Background="Transparent" Height="26" Width="301" HorizontalAlignment="Center" Canvas.Top="147" VerticalAlignment="Top" Canvas.Left="11" Uid="Display the Ceele Title Logo on Home screen?&#xa;&#xa;&#xa;&#xa;&#xa;&#xa;&#xa;[Requires App Restart]">
<RadioButton Name="RadioButtonDisableTitle" IsHitTestVisible="False" Content="Show Ceele Title on Home" Margin="0,0,100,9">
<RadioButton.RenderTransform>
<ScaleTransform ScaleX="1.5" ScaleY="1.5"/>
</RadioButton.RenderTransform>
Expand Down Expand Up @@ -328,8 +328,8 @@
Clear the Location on the "Location tab"
</Button.Uid>
</Button>
<Button Name="Button_ResetSettings" Content="Reset To Default" Style="{StaticResource MainButton}" BorderBrush="Gray" Foreground="#997f5f" FontSize="14" BorderThickness="2" Height="29" Canvas.Top="241" HorizontalAlignment="Left" VerticalAlignment="Center" Width="132" Canvas.Left="180" Uid="Reset all the settings to its default state.&#xa;&#xa;&#xa;&#xa;&#xa;&#xa;&#xa;[App Restart Optional]"/>

<Button Name="Button_ResetSettings" Content="Reset To Default" Style="{StaticResource MainButton}" BorderBrush="Gray" Foreground="#997f5f" FontSize="14" BorderThickness="2" Height="29" Canvas.Top="241" HorizontalAlignment="Left" VerticalAlignment="Center" Width="132" Canvas.Left="180" Uid="Reset all the settings to its default state.&#xa;&#xa;&#xa;&#xa;&#xa;&#xa;&#xa;[App Restart Optional]"/>
</Canvas>

<Canvas Name="About" Visibility="Collapsed">
Expand Down
5 changes: 4 additions & 1 deletion src/HoyoLauncherSettings/HoyoSettings.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ public HoyoSettings()
HoyoSettingStatic = this;

VERSION.Text = App.Version;
BUILDHASH.Text = $"({App.UniqueHashBUILD})";

BUILDHASH.Text =
App.IsPreview ? $"({App.UniqueHashBUILD}) PREVIEW BUILD | NOT OFFICIAL VERSION" : $"({App.UniqueHashBUILD})";

Tooltip_Text.Text = "";

HoyoWindow.BLACK_THING.Visibility = Visibility.Visible;
Expand Down
10 changes: 5 additions & 5 deletions src/HoyoLauncherSettings/HyperLinkButtons.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ public partial class HoyoSettings
void GithubHome(object s, RoutedEventArgs e) =>
HoyoMain.ProcessStart("https://github.com/IchimakiKasura");
void GithubLicense(object s, RoutedEventArgs e) =>
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/HoyoLauncher/blob/master/LICENSE");
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/CeeleLauncher/blob/master/LICENSE");
void GithubProject(object s, RoutedEventArgs e) =>
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/HoyoLauncher");
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/CeeleLauncher");
void GithubPR(object s, RoutedEventArgs e) =>
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/HoyoLauncher/pulls");
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/CeeleLauncher/pulls");
void GithubIssue(object s, RoutedEventArgs e) =>
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/HoyoLauncher/issues");
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/CeeleLauncher/issues");

void MihoyoPage(object s, RoutedEventArgs e) =>
HoyoMain.ProcessStart("https://www.mihoyo.com/en/");
void HoyoversePage(object s, RoutedEventArgs e) =>
HoyoMain.ProcessStart("https://www.hoyoverse.com/en-us/");

void GithubIconButton(object s, MouseButtonEventArgs e) =>
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/HoyoLauncher");
HoyoMain.ProcessStart("https://github.com/IchimakiKasura/CeeleLauncher");
}
2 changes: 1 addition & 1 deletion src/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</Border.Background>
</Border>
</Border>
<Image Name="HoyoTitleIMG" Margin="226,269,226,269" Source="/Resources/CeeleLauncher.png" Stretch="Fill"/>
<Image Name="HoyoTitleIMG" Margin="226,287,226,251" Source="/Resources/CeeleLauncher.png" Stretch="Fill"/>
</Grid>

<Button Name="LaunchButton" Style="{StaticResource LaunchButton}" Margin="915,605,163,50" IsEnabled="false"/>
Expand Down
2 changes: 1 addition & 1 deletion src/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public MainWindow()
HoyoMain.Initialize();

#if !DEBUG
AppVersion.Text = App.Version;
AppVersion.Text = App.IsPreview ? App.Version+" PREVIEW BUILD | NOT OFFICIAL VERSION" : App.Version;
#else
AppVersion.Text += $": test ver({App.Version})";
Console.WriteLine("BUILD HASH: "+App.UniqueHashBUILD);
Expand Down
2 changes: 1 addition & 1 deletion src/Properties/Settings.Designer.cs

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

2 changes: 1 addition & 1 deletion src/Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<Value Profile="(Default)">https://hkrpg-launcher-static.hoyoverse.com/hkrpg_global/mdk/launcher/api/content?filter_adv=true&amp;language=en-us&amp;launcher_id=35&amp;key=vplOVX8Vn7cwG8yb</Value>
</Setting>
<Setting Name="CHECKBOX_TITLE" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>

0 comments on commit b30c6dc

Please sign in to comment.