Xeorg
/
xesite_android
mirror of https://github.com/Xe/xesite_android
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix app on non-chromeos 

Signed-off-by: Christine Dodrill <me@christine.website>
This commit is contained in:
Cadey Ratio 2021-07-01 14:37:56 -04:00
parent cb6294c8fc
commit 4970df45e3
6 changed files with 108 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -53,8 +53,8 @@ android {
applicationId "website.christine.xesite" applicationId "website.christine.xesite"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 29 targetSdkVersion 29
versionCode 2 versionCode 3
versionName "1.0.3.1" versionName "1.0.3.2"
// The name for the application // The name for the application
resValue "string", "appName", twaManifest.name resValue "string", "appName", twaManifest.name

104
app/src/main/AndroidManifest.xml
View File

@ -22,22 +22,16 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="website.christine.xesite"> package="website.christine.xesite">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-feature android:name="org.chromium.arc" android:required="true" />
<application <application
android:name="Application" android:name="Application"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/appName" android:label="@string/appName"
android:manageSpaceActivity="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity" android:manageSpaceActivity="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar"> android:theme="@android:style/Theme.Translucent.NoTitleBar">
@ -45,29 +39,27 @@
android:name="asset_statements" android:name="asset_statements"
android:resource="@string/assetStatements" /> android:resource="@string/assetStatements" />
<meta-data
<meta-data android:name="web_manifest_url"
android:name="web_manifest_url" android:value="@string/webManifestUrl" />
android:value="@string/webManifestUrl" />
<meta-data <meta-data
android:name="twa_generator" android:name="twa_generator"
android:value="@string/generatorApp" /> android:value="@string/generatorApp" />
<activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity">
<activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity">
<meta-data <meta-data
android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL" android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL"
android:value="@string/launchUrl" /> android:value="@string/launchUrl" />
</activity> </activity>
<activity android:name="LauncherActivity" <activity
android:screenOrientation="unspecified" android:name="LauncherActivity"
android:alwaysRetainTaskState="true" android:alwaysRetainTaskState="true"
android:label="@string/launcherName"> android:label="@string/launcherName"
<meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL" android:screenOrientation="unspecified">
<meta-data
android:name="android.support.customtabs.trusted.DEFAULT_URL"
android:value="@string/launchUrl" /> android:value="@string/launchUrl" />
<meta-data <meta-data
@ -90,31 +82,33 @@
android:name="androix.browser.trusted.NAVIGATION_BAR_DIVIDER_COLOR_DARK" android:name="androix.browser.trusted.NAVIGATION_BAR_DIVIDER_COLOR_DARK"
android:resource="@color/navigationDividerColorDark" /> android:resource="@color/navigationDividerColorDark" />
<meta-data android:name="android.support.customtabs.trusted.SPLASH_IMAGE_DRAWABLE" <meta-data
android:resource="@drawable/splash"/> android:name="android.support.customtabs.trusted.SPLASH_IMAGE_DRAWABLE"
android:resource="@drawable/splash" />
<meta-data android:name="android.support.customtabs.trusted.SPLASH_SCREEN_BACKGROUND_COLOR" <meta-data
android:resource="@color/backgroundColor"/> android:name="android.support.customtabs.trusted.SPLASH_SCREEN_BACKGROUND_COLOR"
android:resource="@color/backgroundColor" />
<meta-data android:name="android.support.customtabs.trusted.SPLASH_SCREEN_FADE_OUT_DURATION" <meta-data
android:value="@integer/splashScreenFadeOutDuration"/> android:name="android.support.customtabs.trusted.SPLASH_SCREEN_FADE_OUT_DURATION"
android:value="@integer/splashScreenFadeOutDuration" />
<meta-data android:name="android.support.customtabs.trusted.FILE_PROVIDER_AUTHORITY" <meta-data
android:value="@string/providerAuthority"/> android:name="android.support.customtabs.trusted.FILE_PROVIDER_AUTHORITY"
android:value="@string/providerAuthority" />
<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" /> <meta-data
android:name="android.app.shortcuts"
android:resource="@xml/shortcuts" />
<meta-data android:name="android.support.customtabs.trusted.FALLBACK_STRATEGY" <meta-data
android:name="android.support.customtabs.trusted.FALLBACK_STRATEGY"
android:value="@string/fallbackType" /> android:value="@string/fallbackType" />
<meta-data
android:name="android.support.customtabs.trusted.SCREEN_ORIENTATION"
android:value="@string/orientation" />
<meta-data android:name="android.support.customtabs.trusted.SCREEN_ORIENTATION"
android:value="@string/orientation"/>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -122,24 +116,28 @@
</intent-filter> </intent-filter>
<intent-filter android:autoVerify="true"> <intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE"/> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https"
android:host="@string/hostName"/> <data
android:host="@string/hostName"
android:scheme="https" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.google.androidbrowserhelper.trusted.FocusActivity" /> <activity android:name="com.google.androidbrowserhelper.trusted.FocusActivity" />
<activity android:name="com.google.androidbrowserhelper.trusted.WebViewFallbackActivity" <activity
android:name="com.google.androidbrowserhelper.trusted.WebViewFallbackActivity"
android:configChanges="orientation|screenSize" /> android:configChanges="orientation|screenSize" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="@string/providerAuthority" android:authorities="@string/providerAuthority"
android:grantUriPermissions="true" android:exported="false"
android:exported="false"> android:grantUriPermissions="true">
<meta-data <meta-data
android:name="android.support.FILE_PROVIDER_PATHS" android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths" /> android:resource="@xml/filepaths" />
@ -150,17 +148,13 @@
android:enabled="@bool/enableNotification" android:enabled="@bool/enableNotification"
android:exported="@bool/enableNotification"> android:exported="@bool/enableNotification">
<intent-filter> <intent-filter>
<action android:name="android.support.customtabs.trusted.TRUSTED_WEB_ACTIVITY_SERVICE"/> <action android:name="android.support.customtabs.trusted.TRUSTED_WEB_ACTIVITY_SERVICE" />
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</service> </service>
<activity android:name="com.google.androidbrowserhelper.locationdelegation.PermissionRequestActivity" />
<activity android:name=
"com.google.androidbrowserhelper.locationdelegation.PermissionRequestActivity"/>
</application> </application>
</manifest> </manifest>

3
app/src/main/java/website/christine/xesite/Application.java
View File

@ -17,11 +17,8 @@ package website.christine.xesite;
public class Application extends android.app.Application { public class Application extends android.app.Application {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
} }
} }

4
app/src/main/java/website/christine/xesite/DelegationService.java
View File

@ -1,18 +1,14 @@
package website.christine.xesite; package website.christine.xesite;
import com.google.androidbrowserhelper.locationdelegation.LocationDelegationExtraCommandHandler; import com.google.androidbrowserhelper.locationdelegation.LocationDelegationExtraCommandHandler;
public class DelegationService extends public class DelegationService extends
com.google.androidbrowserhelper.trusted.DelegationService { com.google.androidbrowserhelper.trusted.DelegationService {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
registerExtraCommandHandler(new LocationDelegationExtraCommandHandler()); registerExtraCommandHandler(new LocationDelegationExtraCommandHandler());
} }
} }

3
app/src/main/java/website/christine/xesite/LauncherActivity.java
View File

@ -17,17 +17,14 @@ package website.christine.xesite;
import android.net.Uri; import android.net.Uri;
public class LauncherActivity public class LauncherActivity
extends com.google.androidbrowserhelper.trusted.LauncherActivity { extends com.google.androidbrowserhelper.trusted.LauncherActivity {
@Override @Override
protected Uri getLaunchingUrl() { protected Uri getLaunchingUrl() {
// Get the original launch Url. // Get the original launch Url.
Uri uri = super.getLaunchingUrl(); Uri uri = super.getLaunchingUrl();
return uri; return uri;
} }
} }

58
app/src/main/res/raw/web_app_manifest.json
View File

@ -1 +1,57 @@
{"name":"Christine Dodrill","short_name":"Christine","theme_color":"#ffcbe4","background_color":"#fa99ca","display":"standalone","scope":"/","start_url":"/","description":"Blog and Resume for Christine Dodrill","orientation":"any","icons":[{"src":"/static/img/avatar.png","sizes":"1024x1024"},{"src":"/static/favicon/android-icon-36x36.png","sizes":"36x36","type":"image/png","density":"0.75"},{"src":"/static/favicon/android-icon-48x48.png","sizes":"48x48","type":"image/png","density":"1.0"},{"src":"/static/favicon/android-icon-72x72.png","sizes":"72x72","type":"image/png","density":"1.5"},{"src":"/static/favicon/android-icon-96x96.png","sizes":"96x96","type":"image/png","density":"2.0"},{"src":"/static/favicon/android-icon-144x144.png","sizes":"144x144","type":"image/png","density":"3.0"},{"src":"/static/favicon/android-icon-192x192.png","sizes":"192x192","type":"image/png","density":"4.0"},{"src":"/static/favicon/android-launchericon-512-512.png","sizes":"512x512"}]} {
"name": "Christine Dodrill",
"short_name": "Christine",
"theme_color": "#ffcbe4",
"background_color": "#fa99ca",
"display": "standalone",
"scope": "/",
"start_url": "/",
"description": "Blog and Resume for Christine Dodrill",
"orientation": "any",
"icons": [
{
"src": "/static/img/avatar.png",
"sizes": "1024x1024"
},
{
"src": "/static/favicon/android-icon-36x36.png",
"sizes": "36x36",
"type": "image/png",
"density": "0.75"
},
{
"src": "/static/favicon/android-icon-48x48.png",
"sizes": "48x48",
"type": "image/png",
"density": "1.0"
},
{
"src": "/static/favicon/android-icon-72x72.png",
"sizes": "72x72",
"type": "image/png",
"density": "1.5"
},
{
"src": "/static/favicon/android-icon-96x96.png",
"sizes": "96x96",
"type": "image/png",
"density": "2.0"
},
{
"src": "/static/favicon/android-icon-144x144.png",
"sizes": "144x144",
"type": "image/png",
"density": "3.0"
},
{
"src": "/static/favicon/android-icon-192x192.png",
"sizes": "192x192",
"type": "image/png",
"density": "4.0"
},
{
"src": "/static/favicon/android-launchericon-512-512.png",
"sizes": "512x512"
}
]
}