Skip to content

Commit 4e134d2

Browse files
joshspicerjoshspicer
authored
Merge pull request #28 from joshspicer/dev
1.4.1 bug fixes
2 parents 556f657 + 2627c51 commit 4e134d2

File tree

6 files changed

+59
-51
lines changed

6 files changed

+59
-51
lines changed

‎PiholeDashboard.iOS/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<key>CFBundleIdentifier</key>
88
<string>com.joshspicer.piholedashboard</string>
99
<key>CFBundleShortVersionString</key>
10-
<string>1.4</string>
10+
<string>1.4.1</string>
1111
<key>CFBundleVersion</key>
12-
<string>4</string>
12+
<string>1</string>
1313
<key>UILaunchStoryboardName</key>
1414
<string>LaunchScreen</string>
1515
<key>UIApplicationShortcutItems</key>

‎PiholeDashboard.ipa‎

-12.4 MB
Binary file not shown.

‎PiholeDashboard/App.xaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@
4949

5050
<Style TargetType="Button" ApplyToDerivedTypes="True">
5151
<Setter Property="FontFamily" Value="jose" />
52-
<Setter Property="TextColor" Value="White"/>
52+
<Setter Property="TextColor"
53+
Value="{AppThemeBinding
54+
Dark={StaticResource lightColor},
55+
Light={StaticResource darkColor}}"/>
5356
</Style>
5457

5558
<Style TargetType="RadioButton">

‎PiholeDashboard/Views/Configuration.xaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,14 @@
4747

4848
<!-- Help Menu -->
4949
<StackLayout Padding="15,0,0,60" >
50-
<Label FontAttributes="Bold" Margin="0" Padding="0,0,0,0" Text="Having Trouble?"/>
5150
<Button x:Name="helpButton" FontSize="16" Text="Toggle Help" Margin="0" Clicked="OpenHelp_Clicked" HorizontalOptions="Start"/>
5251
</StackLayout>
5352

5453
<!-- Credits -->
5554
<StackLayout VerticalOptions="EndAndExpand" HorizontalOptions="Center">
5655
<Label FontAttributes="Bold" Margin="0" HorizontalTextAlignment="Center" FontSize="12" Padding="0,0,0,0" Text="(c) Josh Spicer"/>
57-
<Label x:Name="github" FontAttributes="Bold" Margin="0" HorizontalTextAlignment="Center" FontSize="12" Padding="0,0,0,0" Text="Open Source on GitHub"/>
58-
56+
<Label x:Name="github" FontAttributes="Bold" Margin="0" HorizontalTextAlignment="Center" FontSize="12" Padding="0,0,0,0" Text="Open Source on GitHub (visit)"/>
5957
</StackLayout>
60-
6158
</StackLayout>
6259
</Grid>
6360
</ContentPage.Content>

‎PiholeDashboard/Views/Configuration.xaml.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,25 @@ async void QR_Clicked(object sender, EventArgs e)
5353
{
5454
var scanPage = new ZXingScannerPage();
5555

56-
scanPage.OnScanResult += (result) =>
56+
scanPage.OnScanResult += async (result) =>
5757
{
5858
// Stop scanning
5959
scanPage.IsScanning = false;
60+
scanPage.IsAnalyzing = false;
6061

6162
// Pop the page and show the result
6263
Device.BeginInvokeOnMainThread(async () =>
6364
{
64-
await Navigation.PopAsync();
65+
await Shell.Current.GoToAsync("///configuration");
66+
6567
if (isBackupSelected)
66-
config.PrimaryApiKey = result.Text;
67-
else
6868
config.BackupApiKey = result.Text;
69+
else
70+
config.PrimaryApiKey = result.Text;
6971

7072
ApiKeyLabel.Text = result.Text;
7173
});
74+
7275
};
7376

7477
// Navigate to our scanner page

‎PiholeDashboard/Views/HelpModal.xaml‎

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,67 +21,52 @@
2121
Padding="10,10,0,0"
2222
Text="Pi-Hole Uri" />
2323
<Label x:Name="uriHelpDetail"
24-
FontSize="Header"
25-
TextType="Html"
24+
TextType="Text"
25+
FontSize="Small"
2626
Padding="10,10,0,0">
2727
<Label.Text>
2828
The Pi-Hole URI is the beginning of whatever you use to connect to the Pi-Hole web interface. For example if you enter:
2929

30-
&lt;br&gt;&lt;br&gt;
31-
32-
&lt;code&gt; http://192.168.1.200:8181/admin &lt;/code&gt;
3330

34-
&lt;br&gt;&lt;br&gt;
31+
http://192.168.1.200:8181/admin
32+
3533

3634
to access the web interface, you should enter:
3735

38-
&lt;br&gt;&lt;br&gt;
3936

40-
&lt;code&gt; http://192.168.1.200:8181 &lt;/code&gt;
37+
http://192.168.1.200:8181
4138

42-
&lt;br&gt;&lt;br&gt;
4339

4440
into PiContrHOLE.
4541

46-
&lt;br&gt;&lt;br&gt;
47-
4842
Ensure you're entering the correct protocol (HTTP/HTTPS) and (if necessary) ports.
4943

5044
</Label.Text>
5145
</Label>
5246

5347
<Label x:Name="uriHelpDetail2"
54-
FontSize="Header"
55-
TextType="Html"
48+
FontSize="Small"
5649
Padding="10,10,0,0">
5750
<Label.Text>
58-
If your web interface is hosted over port 80 (the default) you do not need to specify it.
5951

60-
&lt;br&gt;&lt;br&gt;
52+
If your web interface is hosted over port 80 (the default) you do not need to specify it.
6153

6254
You can test the API by visiting:
6355

64-
&lt;br&gt;&lt;br&gt;
65-
66-
&lt;code&gt; http://YOUR_PI_IP/admin/api.php?summary &lt;/code&gt;
6756

57+
http://YOUR_PI_IP/admin/api.php?summary
6858

6959
</Label.Text>
7060
</Label>
7161

7262
<Label x:Name="uriHelpDetail3"
73-
FontSize="Header"
74-
TextType="Html"
63+
FontSize="Small"
7564
Padding="10,10,0,0">
7665
<Label.Text>
7766
If you see data on the screen, your pi-hole is setup correctly!
7867

79-
&lt;br&gt;&lt;br&gt;
80-
8168
If the page does not load, please first fix the configuration of your pi-hole and check your firewall settings.
8269

83-
&lt;br&gt;&lt;br&gt;
84-
8570
Note that if you are accessing your pi-hole outside of your local network, you must communicate over HTTPS (An iOS rule).
8671

8772
</Label.Text>
@@ -103,32 +88,25 @@ Note that if you are accessing your pi-hole outside of your local network, you m
10388
Padding="10,10,0,0"
10489
Text="WEBPASSWORD (API Key)" />
10590
<Label x:Name="apiHelpDetail"
106-
FontSize="Header"
107-
TextType="Html"
91+
FontSize="Small"
10892
Padding="10,10,0,0"
10993
>
11094
<Label.Text>
11195
One of the simplest ways to acquire the API Key is to, in the pi-hole webapp open:
11296

113-
&lt;br&gt;&lt;br&gt;
11497

115-
&lt;code&gt; Settings > API/Web Interface > Show API Token &lt;/code&gt;
98+
Settings > API/Web Interface > Show API Token
11699

117-
&lt;br&gt;&lt;br&gt;
118100

119101
If this doesn't work - there's an alternative! You'll need to connect to your pi-hole over SSH (or physically), browse to the file:
120102

121-
&lt;br&gt;&lt;br&gt;
122103

123-
&lt;code&gt; /etc/pihole/setupVars.conf &lt;/code&gt;
104+
/etc/pihole/setupVars.conf
124105

125-
&lt;br&gt;&lt;br&gt;
126106

127107
and copy the WEBPASSWORD entry.
128108

129-
&lt;br&gt;&lt;br&gt;
130-
131-
Enter *just* the part *after* the &lt;code&gt; WEBPASSWORD= &lt;/code&gt;
109+
Enter *just* the part *after* the WEBPASSWORD= .
132110
</Label.Text>
133111
</Label>
134112

@@ -142,23 +120,50 @@ Enter *just* the part *after* the &lt;code&gt; WEBPASSWORD= &lt;/code&gt;
142120
BorderColor="DarkGray"
143121
IsClippedToBounds="True"
144122
>
123+
<StackLayout>
124+
<Label x:Name="uiHelpHeader"
125+
FontSize="Header"
126+
FontAttributes="Bold"
127+
Padding="10,10,0,0"
128+
Text="Quick Tips" />
129+
<Label x:Name="uiHelpDetail"
130+
FontSize="Small"
131+
Padding="10,10,0,0"
132+
>
133+
<Label.Text>
134+
This app supports Dark mode! Toggle your iPhone's system dark mode setting to toggle.
135+
136+
137+
Long press (3D Touch) the app icon from your home screen to quickly enable/disable your primary pi-hole.
138+
139+
140+
</Label.Text>
141+
</Label>
142+
</StackLayout>
143+
</Frame>
144+
<Frame CornerRadius="10"
145+
HasShadow="False"
146+
x:Name="helpView4"
147+
HorizontalOptions="CenterAndExpand"
148+
Margin="15,20,15,0"
149+
BorderColor="DarkGray"
150+
IsClippedToBounds="True"
151+
>
145152
<StackLayout>
146153
<Label x:Name="moreInfoHelpHeader"
147154
FontSize="Header"
148155
FontAttributes="Bold"
149156
Padding="10,10,0,0"
150157
Text="Raise an Issue" />
151158
<Label x:Name="moreInfoHelpDetail"
152-
FontSize="Header"
153-
TextType="Html"
159+
FontSize="Small"
154160
Padding="10,10,0,0"
155161
>
156162
<Label.Text>
157-
This app has been tested against Pi-Hole v4.4 and (briefly) v5.0.
163+
This app has been tested against Pi-Hole v4.4 and v5.0.
158164

159-
&lt;br&gt;&lt;br&gt;
160165

161-
Visit &lt;code&gt;github.com/joshspicer/pihole-mobile-app &lt;/code&gt;for additional resources and to open an issue! Thanks!
166+
The best way to report a bug or request a feature is by visiting github.com/joshspicer/pihole-mobile-app and opening an issue. Thanks!
162167

163168

164169
</Label.Text>

0 commit comments

Comments
 (0)