Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display displayReleaseFromJson is not needed when using @Keep proguard annotation. #42

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Display displayReleaseFromJson is not needed when using @Keep proguard annotation. #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
342e870
remove release from json
ziakhan110 Dec 30, 2023
4ed27d2
remove large gif
ziakhan110 Dec 30, 2023
88c6e43
resized giff
ziakhan110 Dec 30, 2023
fda6672
fix namespace issue
ziakhan110 Aug 22, 2024
68b517c
gradle changes
ziakhan110 Aug 22, 2024
bee6cbf
upgrade kotlin version
ziakhan110 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Sequence_small.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group 'com.namit.presentation_displays'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.9.22'
repositories {
google()
mavenCentral()
Expand All @@ -27,6 +27,8 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 33

namespace 'com.namit.presentation_displays'

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand All @@ -36,10 +38,19 @@ android {
lintOptions {
disable 'InvalidPackage'
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.android.support:support-annotations:28.0.0'
}
7 changes: 0 additions & 7 deletions lib/display.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@ Display displayFromJson(Map<String, dynamic> json) => Display(
name: json['name'],
rotation: json['rotation']);

/// for release please check response from invokeMethod
Display displayReleaseFromJson(Map<String, dynamic> json) => Display(
displayId: json['a'],
flag: json['b'],
name: json['d'],
rotation: json['c']);

/// The default Display id, which is the id of the built-in primary display
/// assuming there is one.
const int DEFAULT_DISPLAY = 0;
Expand Down
5 changes: 1 addition & 4 deletions lib/displays_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'dart:async';
import 'dart:convert';

import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:presentation_displays/display.dart';
Expand Down Expand Up @@ -65,9 +64,7 @@ class DisplayManager {
List<Display> displays = [];
for (var element in origins) {
final map = jsonDecode(jsonEncode(element));
displays.add(kReleaseMode
? displayReleaseFromJson(map as Map<String, dynamic>)
: displayFromJson(map as Map<String, dynamic>));
displays.add(displayFromJson(map as Map<String, dynamic>));
}
return displays;
}
Expand Down