yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Convert webview into an activity (#2470)

Browse Source 
Based on 65804ebb3a
This commit is contained in:
arkon
2020-01-10 22:22:12 -05:00
committed by GitHub
parent 8f82c8ad3d
commit 797553ce16
16 changed files with 229 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/drawable/ic_arrow_back_white_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>

9
app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
</vector>

9
app/src/main/res/drawable/ic_close_white_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

1
app/src/main/res/layout/main_activity.xml
View File

@@ -20,7 +20,6 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"

29
app/src/main/res/layout/webview_activity.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme"
app:navigationIcon="@drawable/ic_close_white_24dp" />
</com.google.android.material.appbar.AppBarLayout>
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

19
app/src/main/res/menu/web_view.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_forward"
android:title="@string/action_forward"
app:showAsAction="never" />
<item
android:id="@+id/action_refresh"
android:title="@string/action_refresh"
app:showAsAction="never" />
<item android:id="@+id/action_close"
android:title="@string/action_close"
app:showAsAction="never"/>
</menu>

23
app/src/main/res/menu/webview.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_web_back"
android:icon="@drawable/ic_arrow_back_white_24dp"
android:title="@string/action_webview_back"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_web_forward"
android:icon="@drawable/ic_arrow_forward_white_24dp"
android:title="@string/action_webview_forward"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_web_refresh"
android:icon="@drawable/ic_refresh_white_24dp"
android:title="@string/action_webview_refresh"
app:showAsAction="ifRoom" />
</menu>

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

@@ -95,8 +95,9 @@
<string name="action_restore">Restore</string>
<string name="action_open">Open</string>
<string name="action_login">Log in</string>
<string name="action_forward">Forward</string>
<string name="action_refresh">Refresh</string>
<string name="action_webview_back">Back</string>
<string name="action_webview_forward">Forward</string>
<string name="action_webview_refresh">Refresh</string>
<!-- Operations -->
<string name="deleting">Deleting…</string>

6
app/src/main/res/values/themes.xml
View File

@@ -44,7 +44,7 @@
<!--===========-->
<style name="Theme.Tachiyomi" parent="Theme.Base">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:statusBarColor">@color/colorPrimaryDark</item>
<item name="android:navigationBarColor">@color/colorPrimaryDark</item>
</style>
@@ -67,7 +67,7 @@
<item name="android:listDivider">@drawable/line_divider_dark</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:statusBarColor">@color/colorDarkPrimaryDark</item>
<item name="android:navigationBarColor">@color/colorDarkPrimaryDark</item>
<!-- Themes -->
@@ -97,7 +97,7 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:statusBarColor">@color/colorPrimaryDark</item>
<item name="android:navigationBarColor">@color/colorDarkPrimaryDark</item>
</style>