Skip to content

Commit

Permalink
Merge branch 'release/1.9.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
deandreamatias committed Feb 19, 2022
2 parents a06b38b + 272bb44 commit f2bb46d
Show file tree
Hide file tree
Showing 21 changed files with 97 additions and 104 deletions.
4 changes: 4 additions & 0 deletions .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"flutterSdkVersion": "2.8.1",
"flavors": {}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.buildlog/
.history
.svn/
.fvm/
.fvm/flutter_sdk
package-lock.json

# IntelliJ related
Expand Down
13 changes: 0 additions & 13 deletions .tool/env.dart

This file was deleted.

7 changes: 0 additions & 7 deletions .tool/prod_build.cmd

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.9.0](https://github.com/deandreamatias/tv-randshow/compare/v1.9.0...v1.9.0) (2022-02-19)

## [1.8.0](https://github.com/deandreamatias/tv-randshow/compare/v1.7.0...v1.8.0) (2021-10-30)

### Features
Expand Down
30 changes: 11 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
TV Randshow was created to help choose a random episode from your favorites TV shows.
The TV shows database comes from the TMDB and the app saves them in a database on the device. With the list of favorites, you can roll the dice of a TV show to get a random episode.

This project has been built using the [Flutter](https://flutter.dev/) framework, which allows to build an app for mobile, desktop & web, from a single codebase.
This project has been built using the [Flutter](https://flutter.dev/) framework, which allows to build an multiplatform app from a single codebase.

<p align="center">
<img src="./images/search.png" width="150" hspace="4">
Expand All @@ -38,38 +38,30 @@ This project has been built using the [Flutter](https://flutter.dev/) framework,
- **Support to Android and Web**
- **Dark mode**
- **Support to deeplink `https://tvrandshow.com/getRandomEpisode?tvshow=friends`**
- [Coming soon...](https://trello.com/b/ib0jdUzK)
- **Roadmap in [public Trello](https://trello.com/b/ib0jdUzK)**

## Build & run
## Build and run

### Requirements

- First, clone the repository with the 'git clone' command, or just download the zip.

```git
git clone [email protected]:deandreamatias/tv-randshow.git
```

- Then, download either Android Studio or Visual Studio Code, with their respective [Flutter editor plugins](https://flutter.dev/docs/get-started/editor). For more information about Flutter installation procedure, check the [official install guide](https://flutter.dev/docs/get-started/install).

- Install dependencies from pubspec.yaml by running `flutter packages get` from the project root (see [using packages documentation](https://flutter.dev/docs/development/packages-and-plugins/using-packages#adding-a-package-dependency-to-an-app) for details and how to do this in the editor).

- Get your API Key from TMDB (see [this FAQ](https://www.themoviedb.org/faq/api) for more details) and paste in file `lib/config/env.dart`

- (Optional) If you want build to web, do you need follow [this steps](https://flutter.dev/docs/get-started/web)
1. Clone repository with 'git clone' command or just download the zip. `git clone [email protected]:deandreamatias/tv-randshow.git`
2. Then, download either Android Studio or Visual Studio Code, with their respective [Flutter editor plugins](https://flutter.dev/docs/get-started/editor). For more information about Flutter installation procedure, check the [official install guide](https://flutter.dev/docs/get-started/install).
3. Install dependencies from pubspec.yaml by running `flutter pub get` from the project root (see [using packages documentation](https://flutter.dev/docs/development/packages-and-plugins/using-packages#adding-a-package-dependency-to-an-app) for details and how to do this in the editor).
4. Get your API Key from TMDB (see [this FAQ](https://www.themoviedb.org/faq/api) for more details) and paste in file `lib/config/env.dart`
5. (Optional) If you want build to web, do you need follow [this steps](https://flutter.dev/docs/get-started/web)

### Run

CLI Debug: `flutter run --flavor dev -t lib/main_dev.dart`

### Tests

Integration tests (only mobile): `flutter drive --driver=test_driver/integration_test.dart --target=integration_test/app_test.dart -d [DEVICE_ID] --flavor dev`
Unit tests: `flutter test --flavor dev`
Integration tests (only mobile): `flutter drive --driver=test_driver/integration_test.dart --target=integration_test/app_test.dart -d [DEVICE_ID] --flavor dev --dart-define API_KEY=xxxxxxxxxxxxx`
Unit tests: `flutter test --dart-define API_KEY=xxxxxxxxxxxxx`

## Author

- **Matias de Andrea** - Mobile developer: [Website](https://deandreamatias.com), [GitHub](https://github.com/deandreamatias) & [Twitter](https://twitter.com/deandreamatias).
- **Matias de Andrea** - Mobile developer: [Website](https://deandreamatias.com), [GitHub](https://github.com/deandreamatias) and [Twitter](https://twitter.com/deandreamatias).

## Contributing

Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 30
compileSdkVersion 31

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -55,7 +55,7 @@ android {
defaultConfig {
applicationId "deandrea.matias.tv_randshow"
minSdkVersion 19
targetSdkVersion 30
targetSdkVersion 31
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package deandrea.matias.tv_randshow;

import androidx.test.rule.ActivityTestRule;
import dev.flutter.plugins.integration_test.FlutterTestRunner;
import io.flutter.embedding.android.FlutterActivity;
import org.junit.Rule;
import org.junit.runner.RunWith;

@RunWith(FlutterTestRunner.class)
public class FlutterActivityTest {
@Rule
public ActivityTestRule<FlutterActivity> rule =
new ActivityTestRule<>(FlutterActivity.class, true, false);
}
14 changes: 4 additions & 10 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,28 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<application
android:requestLegacyExternalStorage="true"
android:name="io.flutter.app.FlutterApplication"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name">
<meta-data
android:name="com.google.android.actions"
android:resource="@xml/actions" />
<activity
android:exported="true"
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:windowSoftInputMode="adjustResize">
<meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme" />
<meta-data
android:name="io.flutter.embedding.android.SplashScreenDrawable"
android:resource="@drawable/launch_background" />

<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter
android:autoVerify="true"
tools:targetApi="m">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
package deandrea.matias.tv_randshow

import androidx.annotation.NonNull;
import io.flutter.embedding.android.FlutterActivity
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugins.GeneratedPluginRegistrant

import android.os.Build
import android.view.ViewTreeObserver
import android.view.WindowManager
class MainActivity: FlutterActivity() {
override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine);
}
}
}
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
7 changes: 7 additions & 0 deletions assets/markdown/whats_news_en.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.9.0 - 2022/02/20

### Features

* Support Android 12
* Build with Flutter 2.8

## 1.8.0 - 2021/10/30

### Features
Expand Down
7 changes: 7 additions & 0 deletions assets/markdown/whats_news_es.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.9.0 - 2022/02/20

### Features

* Suporte a Android 12
* Construído con Flutter 2.8

## 1.8.0 - 2021/10/30

### Features
Expand Down
9 changes: 8 additions & 1 deletion assets/markdown/whats_news_pt.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
## 1.9.0 - 2022/02/20

### Features

* Soporte a Android 12
* Construido com Flutter 2.8

## 1.8.0 - 2021/10/30

### Features

* Aplicado o null safety
* Base de datos dinamica (web and mobile)
* Construido con Flutter 2.5
* Construido com Flutter 2.5

## 1.7.0 - 2021/07/08

Expand Down
1 change: 0 additions & 1 deletion integration_test/app_test.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_translate/flutter_translate.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/ui/router.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

import '../core/models/tvshow_details.dart';
import '../core/models/tvshow_result.dart';
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/views/info_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ class InfoView extends StatelessWidget {
title: Text(
translate(
kIsWeb ? 'app.info.app_title' : 'app.info.web_title'),
key: const Key(
key: Key(
kIsWeb ? 'app.info.app_title' : 'app.info.web_title'),
),
subtitle: Text(
translate(kIsWeb
? 'app.info.app_description'
: 'app.info.web_description'),
key: const Key(kIsWeb
key: Key(kIsWeb
? 'app.info.app_description'
: 'app.info.web_description'),
),
Expand Down
1 change: 0 additions & 1 deletion lib/ui/views/tab_view.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_translate/flutter_translate.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/ui/widgets/home_button.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_translate/flutter_translate.dart';
import 'package:unicons/unicons.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/ui/widgets/search_widget.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

import '../../core/models/result.dart';
Expand Down
64 changes: 32 additions & 32 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: tv_randshow
description: App to pick a random TV show episode

version: 1.8.1+21
version: 1.9.0+22

environment:
sdk: ">=2.12.0 <3.0.0"
Expand All @@ -11,43 +11,43 @@ dependencies:
sdk: flutter
flutter_localizations:
sdk: flutter
cached_network_image: ^3.1.0
dio: ^4.0.0
file_saver: ^0.0.10
flare_flutter: ^3.0.2
flutter_markdown: ^0.6.8
flutter_translate: ^3.0.1
get_it: ^7.2.0
hive: ^2.0.4
hive_flutter: ^1.1.0
in_app_review: ^2.0.3
injectable: ^1.5.0
json_annotation: ^4.3.0
package_info_plus: ^1.3.0
path_provider: ^2.0.5
permission_handler: 8.1.6
provider: ^5.0.0
sqflite: ^2.0.0+4
stacked: ^2.2.7
theme_provider: ^0.5.0
uni_links: ^0.5.1
unicons: ^2.0.2
url_launcher: ^6.0.12
flutter_pagewise: ^2.0.1
cached_network_image: 3.2.0
dio: 4.0.4
file_saver: 0.0.10
flare_flutter: 3.0.2
flutter_markdown: 0.6.9
flutter_pagewise: 2.0.1
flutter_translate: 3.0.1
get_it: 7.2.0
hive: 2.0.5
hive_flutter: 1.1.0
in_app_review: 2.0.4
injectable: 1.5.3
json_annotation: 4.4.0
package_info_plus: 1.3.1
path_provider: 2.0.9
permission_handler: 9.1.0
provider: 6.0.2
sqflite: 2.0.2
stacked: 2.2.8
theme_provider: 0.5.0
uni_links: 0.5.1
unicons: 2.0.2
url_launcher: 6.0.20

dev_dependencies:
integration_test:
sdk: flutter
flutter_test:
sdk: flutter
build_runner: ^2.1.4
faker: ^2.0.0
flutter_launcher_icons: ^0.9.2
hive_generator: ^1.1.1
injectable_generator: ^1.5.2
json_serializable: ^6.0.1
mockito: ^5.0.16
flutter_lints: ^1.0.4
build_runner: 2.1.7
faker: 2.0.0
flutter_launcher_icons: 0.9.2
hive_generator: 1.1.2
injectable_generator: 1.5.3
json_serializable: 6.1.4
mockito: 5.1.0
flutter_lints: 1.0.4

flutter_native_splash:
image: assets/img/icon_launcher.png
Expand Down

0 comments on commit f2bb46d

Please sign in to comment.