n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New percent layout

Browse Source
This commit is contained in:
PeratX 2017-04-08 12:34:30 +08:00
parent d14f69a34d
commit f8b82fd71d
5 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/itxtech/daedalus/AboutActivity.java
View File

@ -36,6 +36,7 @@ public class AboutActivity extends AppCompatActivity {
WebView view = (WebView) findViewById(R.id.webView_about);
view.getSettings().setJavaScriptEnabled(true);
view.setBackgroundColor(0);
view.addJavascriptInterface(this, "JavascriptInterface");
view.setOnLongClickListener(new View.OnLongClickListener() {

2
app/src/main/res/layout/activity_about.xml
View File

@ -17,7 +17,7 @@
<WebView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:id="@+id/webView_about"
android:overScrollMode="never"
android:scrollbars="none"

31
app/src/main/res/layout/content_main.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<android.support.percent.PercentRelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -15,26 +15,39 @@
tools:context="org.itxtech.daedalus.MainActivity">
<ImageView
android:contentDescription="icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content" app:srcCompat="@mipmap/ic_launcher"
android:id="@+id/imageView"
android:id="@+id/imageView_icon"
android:layout_width="0dp"
android:layout_height="0dp"
android:clickable="false"
android:minHeight="120dp" android:minWidth="150dp"
app:srcCompat="@mipmap/ic_launcher"
app:layout_widthPercent="40%"
app:layout_heightPercent="20%"
app:layout_marginTopPercent="5%"
android:layout_alignParentTop="true" android:layout_centerHorizontal="true"/>
<TextView
android:text="@string/app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="30sp"
app:layout_marginTopPercent="5%"
android:layout_below="@id/imageView_icon"
android:textAppearance="@android:style/TextAppearance.Material" android:fontFamily="sans-serif"
android:layout_centerHorizontal="true" android:id="@+id/textView_app_name"/>
<TextView
android:text="@string/notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView_notice"
app:layout_marginTopPercent="5%"
android:textAppearance="@android:style/TextAppearance.Material" android:fontFamily="sans-serif"
android:layout_marginTop="46dp"
android:layout_below="@+id/imageView" android:layout_centerHorizontal="true"/>
android:layout_below="@+id/textView_app_name" android:layout_centerHorizontal="true"/>
<Button
android:text="@string/activate"
android:textSize="15sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button_activate"
android:layout_marginTop="60dp"
app:layout_marginTopPercent="10%"
android:layout_alignTop="@+id/textView_notice" android:layout_centerHorizontal="true"/>
</RelativeLayout>
</android.support.percent.PercentRelativeLayout>

2
app/src/main/res/values-zh/strings.xml
View File

@ -2,7 +2,7 @@
<resources>
<string name="app_name">Daedalus</string>
<string name="action_settings">设置</string>
<string name="notice">Daedalus: 方便易用的基于 CuteDNS 的科学上网工具。</string>
<string name="notice">方便易用的基于 CuteDNS 的科学上网工具。</string>
<string name="activate">启用</string>
<string name="deactivate">停用</string>
<string name="action_about">关于</string>

2
app/src/main/res/values/strings.xml
View File

@ -1,7 +1,7 @@
<resources>
<string name="app_name">Daedalus</string>
<string name="action_settings">Settings</string>
<string name="notice">Daedalus: The CuteDNS implementation on Android.</string>
<string name="notice">The CuteDNS implementation on Android.</string>
<string name="activate">Activate</string>
<string name="deactivate">Deactivate</string>
<string name="action_about">About</string>