Released v1.3.0 & Optimized layouts

iTXTech · Apr 25, 2017 · 020a2be · 020a2be
1 parent f96c634
commit 020a2be
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 31 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.itxtech.daedalus"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 3
-        versionName "1.2.0"
+        versionCode 4
+        versionName "1.3.0"
 
         buildConfigField "String", "BUILD_TIME", "\"${System.currentTimeMillis()}\""
         buildConfigField "String", "GIT_COMMIT", "\"${gitCommit}\""

diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html
@@ -45,9 +45,9 @@
 <br>
 <img width="100" height="100" src="ic_launcher.png"><br>
 <div style="font-size: 25px;"><a href="https://github.com/iTXTech/Daedalus">Daedalus</a></div>
-<div id="version" style="font-size: 10px;">null</div>
-<div id="build_time" style="font-size: 10px;">null</div>
-<div id="git_commit" style="font-size: 10px;">null</div>
+<div id="version" style="font-size: 10px; color: gray;">Version: Unknown</div>
+<div id="build_time" style="font-size: 10px; color: gray;">Build time: Unknown</div>
+<div id="git_commit" style="font-size: 10px; color: gray;">Git commit: Unknown</div>
 <br>
 <img width="185" height="55" src="cutedns_logo.png">
 <br>
@@ -59,13 +59,13 @@
 <div style="font-size: 25px;"><a href="https://groups.google.com/forum/#!forum/neat-dns">Neat DNS</a></div>
 <br>
 <br>
-<div style="font-size: 12px; color: #FF4081">AIXYZ DNS is for academic use only!</div>
+<div style="font-size: 12px; color: #FF4081">AIXYZ DNS is for academic purposes only!</div>
 <div style="font-size: 12px; color: gray;">
     Users must comply with local laws and regulations.<br>
 </div>
 <br>
 <br>
-<div style="font-size: 8px; color: gray;">
+<div style="font-size: 10px; color: gray;">
     This program is free software: you can redistribute it and/or modify<br>
     it under the terms of the <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">GNU General Public License</a> as
     published by<br>
@@ -78,7 +78,7 @@
     GNU General Public License for more details.<br>
     <br>
     You should have received a copy of the GNU General Public License<br>
-    along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.<br>
+    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>
 </div>
 </body>
 </html>
diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html
@@ -45,9 +45,9 @@
 <br>
 <img width="100" height="100" src="ic_launcher.png"><br>
 <div style="font-size: 25px;"><a href="https://github.com/iTXTech/Daedalus">Daedalus</a></div>
-<div id="version" style="font-size: 10px;">null</div>
-<div id="build_time" style="font-size: 10px;">null</div>
-<div id="git_commit" style="font-size: 10px;">null</div>
+<div id="version" style="font-size: 10px; color: gray;">Version: Unknown</div>
+<div id="build_time" style="font-size: 10px; color: gray;">Build time: Unknown</div>
+<div id="git_commit" style="font-size: 10px; color: gray;">Git commit: Unknown</div>
 <br>
 <img width="185" height="55" src="cutedns_logo.png">
 <br>
@@ -65,7 +65,7 @@
 </div>
 <br>
 <br>
-<div style="font-size: 8px; color: gray;">
+<div style="font-size: 10px; color: gray;">
     This program is free software: you can redistribute it and/or modify<br>
     it under the terms of the <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">GNU General Public License</a> as
     published by<br>
@@ -78,7 +78,7 @@
     GNU General Public License for more details.<br>
     <br>
     You should have received a copy of the GNU General Public License<br>
-    along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.<br>
+    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>
 </div>
 </body>
 </html>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -14,13 +14,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
 
-    <FrameLayout
-            android:id="@+id/id_content"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:paddingTop="@dimen/fragment_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"/>
-
     <android.support.design.widget.NavigationView
             android:id="@+id/nav_view"
             android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
@@ -22,4 +22,12 @@
 
     </android.support.design.widget.AppBarLayout>
 
+    <RelativeLayout
+            android:id="@+id/id_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            tools:context=".activity.MainActivity"
+            tools:showIn="@layout/app_bar_main"/>
+
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
@@ -9,10 +9,6 @@
             android:id="@+id/fragment_about"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
             tools:context="org.itxtech.daedalus.activity.AboutActivity">
     </RelativeLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_dns_test.xml b/app/src/main/res/layout/fragment_dns_test.xml
@@ -3,15 +3,14 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/scrollView_server_test"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:paddingBottom="@dimen/activity_vertical_margin">
+        android:layout_height="wrap_content">
     <RelativeLayout
             android:id="@+id/fragment_dns_test"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/activity_vertical_margin"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin">
 
         <Spinner
                 android:layout_width="match_parent"

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -2,7 +2,7 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="fragment_vertical_margin">64dp</dimen>
+    <dimen name="fragment_vertical_margin">16dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="nav_header_vertical_spacing">16dp</dimen>