This repository has been archived by the owner on Mar 14, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into independent
- Loading branch information
Showing
47 changed files
with
710 additions
and
625 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,47 @@ | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="io.ente.photos"> | ||
| <application android:name="${applicationName}" android:label="@string/app_name" android:icon="@mipmap/launcher_icon" android:usesCleartextTraffic="true" android:requestLegacyExternalStorage="true" android:allowBackup="false" android:fullBackupContent="false" android:largeHeap="true"> | ||
|
|
||
| <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> | ||
| <activity android:name=".MainActivity" android:launchMode="singleTop" | ||
| android:theme="@style/LaunchTheme" | ||
| android:exported="true" | ||
| android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" | ||
| android:hardwareAccelerated="true" | ||
| android:windowSoftInputMode="adjustResize"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN"/> | ||
| <category android:name="android.intent.category.LAUNCHER"/> | ||
| </intent-filter> | ||
|
|
||
| <intent-filter> | ||
| <action android:name="android.intent.action.VIEW" /> | ||
| <category android:name="android.intent.category.DEFAULT" /> | ||
| <category android:name="android.intent.category.BROWSABLE" /> | ||
| <action android:name="android.intent.action.VIEW"/> | ||
| <category android:name="android.intent.category.DEFAULT"/> | ||
| <category android:name="android.intent.category.BROWSABLE"/> | ||
| <data android:scheme="ente"/> | ||
| </intent-filter> | ||
|
|
||
| <!--Filter to support sharing images into our app--> | ||
| <intent-filter android:label="@string/backup"> | ||
| <action android:name="android.intent.action.SEND" /> | ||
| <category android:name="android.intent.category.DEFAULT" /> | ||
| <data android:mimeType="image/*" /> | ||
| <action android:name="android.intent.action.SEND"/> | ||
| <category android:name="android.intent.category.DEFAULT"/> | ||
| <data android:mimeType="image/*"/> | ||
| </intent-filter> | ||
|
|
||
| <intent-filter android:label="@string/backup"> | ||
| <action android:name="android.intent.action.SEND_MULTIPLE" /> | ||
| <category android:name="android.intent.category.DEFAULT" /> | ||
| <data android:mimeType="image/*" /> | ||
| <action android:name="android.intent.action.SEND_MULTIPLE"/> | ||
| <category android:name="android.intent.category.DEFAULT"/> | ||
| <data android:mimeType="image/*"/> | ||
| </intent-filter> | ||
|
|
||
| <intent-filter android:label="@string/backup"> | ||
| <action android:name="android.intent.action.SEND" /> | ||
| <category android:name="android.intent.category.DEFAULT" /> | ||
| <data android:mimeType="video/*" /> | ||
| <action android:name="android.intent.action.SEND"/> | ||
| <category android:name="android.intent.category.DEFAULT"/> | ||
| <data android:mimeType="video/*"/> | ||
| </intent-filter> | ||
|
|
||
| <intent-filter android:label="@string/backup"> | ||
| <action android:name="android.intent.action.SEND_MULTIPLE" /> | ||
| <category android:name="android.intent.category.DEFAULT" /> | ||
| <data android:mimeType="video/*" /> | ||
| <action android:name="android.intent.action.SEND_MULTIPLE"/> | ||
| <category android:name="android.intent.category.DEFAULT"/> | ||
| <data android:mimeType="video/*"/> | ||
| </intent-filter> | ||
|
|
||
| </activity> | ||
|
|
@@ -53,24 +58,36 @@ | |
| </provider> | ||
| <!-- Don't delete the meta-data below. | ||
| This is used by the Flutter tool to generate GeneratedPluginRegistrant.java --> | ||
| <meta-data android:name="flutterEmbedding" android:value="2" /> | ||
| <meta-data android:name="asset_statements" android:resource="@string/asset_statements" /> | ||
| <meta-data android:name="io.sentry.dsn" android:value="https://[email protected]/4" /> | ||
| <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" /> | ||
| <meta-data android:name="flutterEmbedding" android:value="2"/> | ||
| <meta-data android:name="asset_statements" | ||
| android:resource="@string/asset_statements"/> | ||
| <meta-data android:name="io.sentry.dsn" | ||
| android:value="https://[email protected]/4"/> | ||
| <meta-data android:name="firebase_analytics_collection_deactivated" | ||
| android:value="true"/> | ||
| </application> | ||
|
|
||
| <!-- Android 11: https://developer.android.com/preview/privacy/package-visibility --> | ||
| <!-- https://developer.android.com/training/package-visibility/use-cases --> | ||
| <queries> | ||
| <intent> | ||
| <action android:name="android.intent.action.SENDTO" /> | ||
| <data android:scheme="mailto" /> | ||
| <action android:name="android.intent.action.SENDTO"/> | ||
| <data android:scheme="mailto"/> | ||
| </intent> | ||
| </queries> | ||
| <uses-permission android:name="android.permission.INTERNET"/> | ||
| <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> | ||
| <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" /> | ||
| <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | ||
| <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
| <uses-permission android:name="com.android.vending.BILLING" /> | ||
| <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION"/> | ||
| <uses-permission | ||
| android:name="android.permission.READ_MEDIA_IMAGES"/> <!-- If you want to read images--> | ||
| <uses-permission | ||
| android:name="android.permission.READ_MEDIA_VIDEO"/> <!-- If you want to read videos--> | ||
| <uses-permission | ||
| android:name="android.permission.READ_EXTERNAL_STORAGE" | ||
| android:maxSdkVersion="32"/> | ||
| <uses-permission | ||
| android:name="android.permission.WRITE_EXTERNAL_STORAGE" | ||
| android:maxSdkVersion="29" | ||
| tools:ignore="ScopedStorage"/> | ||
| <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | ||
| <uses-permission android:name="com.android.vending.BILLING"/> | ||
| </manifest> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,57 @@ | ||
| // @dart=2.9 | ||
|
|
||
| import 'package:flutter/material.dart'; | ||
| import 'package:photos/theme/ente_theme.dart'; | ||
| import 'package:photos/theme/text_style.dart'; | ||
|
|
||
| class SectionTitle extends StatelessWidget { | ||
| final String title; | ||
| final Alignment alignment; | ||
| final double opacity; | ||
| final String? title; | ||
| final RichText? titleWithBrand; | ||
|
|
||
| const SectionTitle( | ||
| this.title, { | ||
| this.opacity = 0.8, | ||
| Key key, | ||
| this.alignment = Alignment.centerLeft, | ||
| const SectionTitle({ | ||
| this.title, | ||
| this.titleWithBrand, | ||
| Key? key, | ||
| }) : super(key: key); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final enteTextTheme = getEnteTextTheme(context); | ||
| Widget child; | ||
| if (titleWithBrand != null) { | ||
| child = titleWithBrand!; | ||
| } else if (title != null) { | ||
| child = Text( | ||
| title!, | ||
| style: enteTextTheme.largeBold, | ||
| ); | ||
| } else { | ||
| child = const SizedBox.shrink(); | ||
| } | ||
| return Container( | ||
| margin: const EdgeInsets.fromLTRB(16, 12, 0, 0), | ||
| child: Column( | ||
| children: [ | ||
| Align( | ||
| alignment: alignment, | ||
| child: Text( | ||
| title, | ||
| style: | ||
| Theme.of(context).textTheme.headline6.copyWith(fontSize: 22), | ||
| ), | ||
| alignment: Alignment.centerLeft, | ||
| child: child, | ||
| ), | ||
| ], | ||
| ), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| RichText onEnteSection = RichText( | ||
| text: const TextSpan( | ||
| children: [ | ||
| TextSpan( | ||
| text: "On ", | ||
| style: TextStyle( | ||
| fontWeight: FontWeight.w600, | ||
| fontFamily: 'Inter', | ||
| fontSize: 21, | ||
| ), | ||
| ), | ||
| TextSpan(text: "ente", style: brandStyleSmall), | ||
| ], | ||
| ), | ||
| ); |
Oops, something went wrong.