Skip to content

Commit 020a2be

Browse files
PeratXPeratX
committed
Released v1.3.0 & Optimized layouts
1 parent f96c634 commit 020a2be

File tree

8 files changed

+27
-31
lines changed

8 files changed

+27
-31
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "org.itxtech.daedalus"
1010
minSdkVersion 15
1111
targetSdkVersion 25
12-
versionCode 3
13-
versionName "1.2.0"
12+
versionCode 4
13+
versionName "1.3.0"
1414

1515
buildConfigField "String", "BUILD_TIME", "\"${System.currentTimeMillis()}\""
1616
buildConfigField "String", "GIT_COMMIT", "\"${gitCommit}\""

‎app/src/main/assets/about_html/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
<br>
4646
<img width="100" height="100" src="ic_launcher.png"><br>
4747
<div style="font-size: 25px;"><a href="https://github.com/iTXTech/Daedalus">Daedalus</a></div>
48-
<div id="version" style="font-size: 10px;">null</div>
49-
<div id="build_time" style="font-size: 10px;">null</div>
50-
<div id="git_commit" style="font-size: 10px;">null</div>
48+
<div id="version" style="font-size: 10px; color: gray;">Version: Unknown</div>
49+
<div id="build_time" style="font-size: 10px; color: gray;">Build time: Unknown</div>
50+
<div id="git_commit" style="font-size: 10px; color: gray;">Git commit: Unknown</div>
5151
<br>
5252
<img width="185" height="55" src="cutedns_logo.png">
5353
<br>
@@ -59,13 +59,13 @@
5959
<div style="font-size: 25px;"><a href="https://groups.google.com/forum/#!forum/neat-dns">Neat DNS</a></div>
6060
<br>
6161
<br>
62-
<div style="font-size: 12px; color: #FF4081">AIXYZ DNS is for academic use only!</div>
62+
<div style="font-size: 12px; color: #FF4081">AIXYZ DNS is for academic purposes only!</div>
6363
<div style="font-size: 12px; color: gray;">
6464
Users must comply with local laws and regulations.<br>
6565
</div>
6666
<br>
6767
<br>
68-
<div style="font-size: 8px; color: gray;">
68+
<div style="font-size: 10px; color: gray;">
6969
This program is free software: you can redistribute it and/or modify<br>
7070
it under the terms of the <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">GNU General Public License</a> as
7171
published by<br>
@@ -78,7 +78,7 @@
7878
GNU General Public License for more details.<br>
7979
<br>
8080
You should have received a copy of the GNU General Public License<br>
81-
along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.<br>
81+
along with this program. If not, see <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">http://www.gnu.org/licenses/</a>.<br>
8282
</div>
8383
</body>
8484
</html>

‎app/src/main/assets/about_html/index_zh.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
<br>
4646
<img width="100" height="100" src="ic_launcher.png"><br>
4747
<div style="font-size: 25px;"><a href="https://github.com/iTXTech/Daedalus">Daedalus</a></div>
48-
<div id="version" style="font-size: 10px;">null</div>
49-
<div id="build_time" style="font-size: 10px;">null</div>
50-
<div id="git_commit" style="font-size: 10px;">null</div>
48+
<div id="version" style="font-size: 10px; color: gray;">Version: Unknown</div>
49+
<div id="build_time" style="font-size: 10px; color: gray;">Build time: Unknown</div>
50+
<div id="git_commit" style="font-size: 10px; color: gray;">Git commit: Unknown</div>
5151
<br>
5252
<img width="185" height="55" src="cutedns_logo.png">
5353
<br>
@@ -65,7 +65,7 @@
6565
</div>
6666
<br>
6767
<br>
68-
<div style="font-size: 8px; color: gray;">
68+
<div style="font-size: 10px; color: gray;">
6969
This program is free software: you can redistribute it and/or modify<br>
7070
it under the terms of the <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">GNU General Public License</a> as
7171
published by<br>
@@ -78,7 +78,7 @@
7878
GNU General Public License for more details.<br>
7979
<br>
8080
You should have received a copy of the GNU General Public License<br>
81-
along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.<br>
81+
along with this program. If not, see <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">http://www.gnu.org/licenses/</a>.<br>
8282
</div>
8383
</body>
8484
</html>

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
android:layout_width="match_parent"
1515
android:layout_height="match_parent"/>
1616

17-
<FrameLayout
18-
android:id="@+id/id_content"
19-
android:layout_width="fill_parent"
20-
android:layout_height="fill_parent"
21-
android:paddingTop="@dimen/fragment_vertical_margin"
22-
android:paddingBottom="@dimen/activity_vertical_margin"/>
23-
2417
<android.support.design.widget.NavigationView
2518
android:id="@+id/nav_view"
2619
android:layout_width="wrap_content"

‎app/src/main/res/layout/app_bar_main.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,12 @@
2222

2323
</android.support.design.widget.AppBarLayout>
2424

25+
<RelativeLayout
26+
android:id="@+id/id_content"
27+
android:layout_width="match_parent"
28+
android:layout_height="match_parent"
29+
app:layout_behavior="@string/appbar_scrolling_view_behavior"
30+
tools:context=".activity.MainActivity"
31+
tools:showIn="@layout/app_bar_main"/>
32+
2533
</android.support.design.widget.CoordinatorLayout>

‎app/src/main/res/layout/fragment_about.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
android:id="@+id/fragment_about"
1010
android:layout_width="match_parent"
1111
android:layout_height="wrap_content"
12-
android:paddingLeft="@dimen/activity_horizontal_margin"
13-
android:paddingRight="@dimen/activity_horizontal_margin"
14-
android:paddingTop="@dimen/activity_vertical_margin"
15-
android:paddingBottom="@dimen/activity_vertical_margin"
1612
tools:context="org.itxtech.daedalus.activity.AboutActivity">
1713
</RelativeLayout>
1814
</ScrollView>

‎app/src/main/res/layout/fragment_dns_test.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:id="@+id/scrollView_server_test"
55
android:layout_width="match_parent"
6-
android:layout_height="wrap_content"
7-
android:paddingLeft="@dimen/activity_horizontal_margin"
8-
android:paddingRight="@dimen/activity_horizontal_margin"
9-
android:paddingTop="@dimen/activity_vertical_margin"
10-
android:paddingBottom="@dimen/activity_vertical_margin">
6+
android:layout_height="wrap_content">
117
<RelativeLayout
128
android:id="@+id/fragment_dns_test"
139
android:layout_width="match_parent"
14-
android:layout_height="wrap_content">
10+
android:layout_height="wrap_content"
11+
android:paddingTop="@dimen/activity_vertical_margin"
12+
android:paddingLeft="@dimen/activity_horizontal_margin"
13+
android:paddingRight="@dimen/activity_horizontal_margin">
1514

1615
<Spinner
1716
android:layout_width="match_parent"

‎app/src/main/res/values/dimens.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Default screen margins, per the Android Design guidelines. -->
33
<dimen name="activity_horizontal_margin">16dp</dimen>
44
<dimen name="activity_vertical_margin">16dp</dimen>
5-
<dimen name="fragment_vertical_margin">64dp</dimen>
5+
<dimen name="fragment_vertical_margin">16dp</dimen>
66
<dimen name="fab_margin">16dp</dimen>
77
<!-- Default screen margins, per the Android Design guidelines. -->
88
<dimen name="nav_header_vertical_spacing">16dp</dimen>

0 commit comments

Comments
 (0)