Skip to content

feat: update font #399

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.

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

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
58304da
Updated submodule
rahulfancode Oct 19, 2020
5df97d6
Updated google_cast
rahulfancode Oct 19, 2020
42a1017
refactor(modules): fork modules and solved build error
rahulfancode Oct 19, 2020
11d1a2b
feat(cast): enable cast for same wifi hotspot
rahulfancode Nov 2, 2020
128c1f5
feat(core): code module updated
rahulfancode Nov 3, 2020
269562d
feat(rescan): rescan functionality added and devicepicker refactor
rahulfancode Nov 15, 2020
e31e384
fix(lint): disabled the lint for release build
rahulfancode Nov 17, 2020
868d6e8
feat(jarfiles): added jar files for jenkins build
rahulfancode Nov 17, 2020
30728da
fix(firetv): firetv issue wip
rahulfancode Nov 17, 2020
0c68404
fix(devicePicker): device picker view updated
rahulfancode Nov 18, 2020
d3de13b
lint enabled
rahulfancode Nov 18, 2020
2439921
fix(firetv): dialog improvements and firetv crash fix
rahulfancode Nov 19, 2020
a34af0c
feat(wrapper): wrapper classes added in connect sdk for better interface
rahulfancode Nov 27, 2020
b1a2bb3
refactor(minsdk): min sdk removed from manifest and added to build gr…
rahulfancode Nov 30, 2020
952d209
feat(notification): removed notification for chromecast and clear dev…
rahulfancode Dec 1, 2020
444e730
fix(crash): check in notification service on relaunch
rahulfancode Dec 7, 2020
8916a91
fix(service): made service not sticky
rahulfancode Dec 8, 2020
fea3f2f
fix(connectSDK): dialog show on destroyed activity and notification s…
rahulfancode Dec 19, 2020
4a960c1
fix(connectSDK): device picker crash fixed
rahulfancode Dec 23, 2020
33ed381
fix(firetv): fixed ANR problem on app restart
rahulfancode Jan 7, 2021
162c466
fix(service): stop the services when on app destory
rahulfancode Jan 8, 2021
44d037b
refactor(service): notification service logic changes
rahulfancode Jan 8, 2021
f8df928
fix(notification): Notification manager functionality removed
rahulfancode Jan 24, 2021
1ab829d
Merge branch 'fix/notification'
rahulfancode Jan 24, 2021
b299960
destory logic changes
rahulfancode Jan 26, 2021
8bf20b7
fix(device): clear device on exit
rahulfancode Jan 28, 2021
c2e167a
refactor(gradle): gradle upgraded
rahulfancode Feb 14, 2021
6657c7f
refactor(eventtype): changes event type from enum to string
rahulfancode Feb 24, 2021
b966c89
fix(upgrade): gradle upgraded
rahulfancode Jul 9, 2021
da7a249
fix(firestick): removed firestick discovery
rahulfancode Nov 25, 2021
56012cb
refactor(firetv): removed fire tv libs
rahulfancode Nov 29, 2021
be25068
fix(jar): removed jar file refrence from github
rahulfancode Dec 2, 2021
97f13a8
fix(firetv): removed unwanted imports
rahulfancode Dec 2, 2021
e9b4198
feat(lg): added support for lg tv
rahulfancode Dec 15, 2021
dafc2fd
reverted lg tv code
neeldream11 Dec 23, 2021
95cd8af
fix(pending): added mutability flag
rahulfancode Mar 26, 2022
6d3c378
feat(drm): drm implemented for casting
rahulfancode Jun 13, 2022
9439c3c
fix(null): null exception receiverId
rahulfancode Jun 14, 2022
e9f0d59
fix(cast-crash):fixed casting crash for only IP v6 devices (#2389)
kedarnath-naik Aug 4, 2022
b5efb77
chore(build.gradle): Upgrade java websocket to fix flipper upgrade
Aug 20, 2022
e640753
Merge pull request #1 from rahulfancode/chore/upgrade-java-websocket
rahulfancode Aug 25, 2022
5d4b73c
feat(font-update): replace noto_sans_display with roboto
rushikeshbhojane20 Mar 24, 2023
05dc792
fix(.xml-files): typo fixes
rushikeshbhojane20 Mar 24, 2023
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ local.properties

# Proguard folder generated by Eclipse
proguard/

*.pydevproject
.project
.metadata
Expand Down Expand Up @@ -50,3 +49,5 @@ local.properties
.buildpath

*.DS_Store

.idea/
10 changes: 3 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
[submodule "modules/google_cast"]
path = modules/google_cast
url = https://github.com/ConnectSDK/Connect-SDK-Android-Google-Cast.git
url = https://github.com/rahulfancode/Connect-SDK-Android-Google-Cast.git
branch = master
[submodule "core"]
path = core
url = https://github.com/ConnectSDK/Connect-SDK-Android-Core.git
branch = master
[submodule "modules/firetv"]
path = modules/firetv
url = https://github.com/ConnectSDK/Connect-SDK-Android-FireTV.git
branch = master
url = https://github.com/rahulfancode/Connect-SDK-Android-Core.git
branch = master
11 changes: 1 addition & 10 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.connectsdk"
android:versionCode="12"
android:versionName="1.6.0" >

<uses-sdk
android:minSdkVersion="10"
android:targetSdkVersion="22" />

<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.connectsdk">
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
<application />
</manifest>
36 changes: 19 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@ buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:4.2.2'
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand All @@ -23,7 +25,7 @@ jacoco {
toolVersion = "0.8.5"
}

task jacocoTestReport(type:JacocoReport, dependsOn: "check") {
task jacocoTestReport(type: JacocoReport, dependsOn: "check") {
group = "Reporting"

description = "Generate Jacoco coverage reports"
Expand Down Expand Up @@ -51,16 +53,18 @@ task jacocoTestReport(type:JacocoReport, dependsOn: "check") {
build.dependsOn jacocoTestReport

android {
compileSdkVersion 22
buildToolsVersion '22.0.1'

compileSdkVersion 28
packagingOptions {
exclude 'LICENSE.txt'
exclude 'META-INF/LICENSE'
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE'
}

defaultConfig {
minSdkVersion 21 // This over her
}

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
Expand Down Expand Up @@ -104,25 +108,23 @@ android.testOptions.unitTests.all {
}

dependencies {
compile files('core/libs/Java-WebSocket-1.3.7.jar')
compile files('core/libs/javax.jmdns_3.4.1-patch2.jar')

api 'com.android.support:appcompat-v7:22.2.1'

implementation 'org.java-websocket:Java-WebSocket:1.5.3'
implementation 'javax.jmdns:jmdns:3.4.1'
api 'com.android.support:appcompat-v7:28.0.0'
implementation fileTree(dir: 'modules/firetv/libs', include: '*.jar')

implementation 'com.android.support:support-v4:22.2.1'
implementation 'com.android.support:mediarouter-v7:22.2.1'
implementation 'com.google.android.gms:play-services-cast:7.8.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:mediarouter-v7:28.0.0'
implementation 'com.google.android.gms:play-services-cast:19.0.0'
implementation 'com.googlecode.plist:dd-plist:1.23'
implementation 'com.nimbusds:srp6a-android:2.0.2'
implementation 'net.i2p.crypto:eddsa:0.2.0'

testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-all:1.10.19'
testImplementation 'org.powermock:powermock-api-mockito:1.6.2'
testImplementation 'xmlunit:xmlunit:1.4'
implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.10'
implementation(group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.3.5') {
exclude module: 'org.apache.httpcomponents:httpclient'
}
}

apply from: 'maven-push.gradle'
2 changes: 1 addition & 1 deletion core
Submodule core updated from 11fa2e to 57c368
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ POM_DEVELOPER_NAME=change
SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots
RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2


android.enableJetifier=true
android.useAndroidX=true
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Tue Oct 27 15:34:52 IST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
1 change: 0 additions & 1 deletion modules/firetv
Submodule firetv deleted from 0c07d0
2 changes: 1 addition & 1 deletion modules/google_cast
Binary file added res/drawable/ic_notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions res/drawable/tv_icon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h5v2h8v-2h5c1.1,0 1.99,-0.9 1.99,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,17L3,17L3,5h18v12z"
android:fillColor="#787878"/>
</vector>
29 changes: 29 additions & 0 deletions res/font/roboto.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<font
app:fontStyle="normal"
app:fontWeight="400"
app:font="@font/roboto_regular"
/>
<font
app:fontStyle="italic"
app:fontWeight="400"
app:font="@font/roboto_italic"
/>
<font
app:fontStyle="normal"
app:fontWeight="500"
app:font="@font/roboto_medium"
/>
<font
app:fontStyle="normal"
app:fontWeight="600"
app:font="@font/roboto_semibold"
/>
<font
app:fontStyle="normal"
app:fontWeight="700"
app:font="@font/roboto_bold"
/>
</font-family>
Binary file added res/font/roboto_bold.ttf
Binary file not shown.
Binary file added res/font/roboto_italic.ttf
Binary file not shown.
Binary file added res/font/roboto_medium.ttf
Binary file not shown.
Binary file added res/font/roboto_regular.ttf
Binary file not shown.
Binary file added res/font/roboto_semibold.ttf
Binary file not shown.
6 changes: 6 additions & 0 deletions res/layout/cast_button.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="wrap_content"
android:layout_height="wrap_content">

</LinearLayout>
16 changes: 16 additions & 0 deletions res/layout/header_layout.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
android:id="@+id/headerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="19dp"
android:layout_marginBottom="8dp"
android:fontFamily="@font/roboto_semibold"
android:text="Cast to"
android:textColor="@color/cast_header"
android:textSize="20sp" />
</LinearLayout>
27 changes: 27 additions & 0 deletions res/layout/item_layout.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:orientation="vertical"
android:paddingVertical="10dp">

<ImageView
android:id="@+id/deviceIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="24dp"
android:src="@drawable/tv_icon"></ImageView>

<TextView
android:id="@+id/deviceName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_toRightOf="@id/deviceIcon"
android:fontFamily="@font/roboto_regular"
android:textColor="@color/cast_header"
android:textSize="16sp"></TextView>
</RelativeLayout>
6 changes: 6 additions & 0 deletions res/layout/tv_icon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

</LinearLayout>
5 changes: 5 additions & 0 deletions res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="cast_header">#000000</color>
<color name="button_color">#ff5000</color>
</resources>
13 changes: 13 additions & 0 deletions res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="buttonText" parent="@android:style/TextAppearance.Medium">
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/button_color</item>
<item name="android:fontFamily">@font/roboto_semibold</item>
</style>

<style name="notification" parent="">

</style>
</resources>
25 changes: 25 additions & 0 deletions src/com/connectsdk/CastButton.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.connectsdk;

import android.content.Context;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.widget.ImageView;
import android.widget.LinearLayout;

import androidx.annotation.Nullable;

public class CastButton extends LinearLayout {
private ImageView mImage;

public CastButton(Context context) {
super(context);
}

public CastButton(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(R.layout.cast_button, this);
mImage = (ImageView) getChildAt(0);
}

}
41 changes: 41 additions & 0 deletions src/com/connectsdk/CastDevice.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.connectsdk;

import com.connectsdk.device.ConnectableDevice;

public class CastDevice {
private String id = "";
private String name = "";
private String type = "";

private CastDevice() {}

public static CastDevice fromConnectableDevice(ConnectableDevice connectableDevice) {
CastDevice device = new CastDevice();
if (connectableDevice != null) {
device.id = connectableDevice.getId();
if (connectableDevice.getFriendlyName() != null) {
device.name = connectableDevice.getFriendlyName();
} else {
device.name = connectableDevice.getModelName();
}
device.type = connectableDevice.getServiceId();
}
return device;
}

public static CastDevice forDeviceNotAvailble() {
return new CastDevice();
}

public String getId() {
return id;
}

public String getName() {
return name;
}

public String getType() {
return type;
}
}
11 changes: 11 additions & 0 deletions src/com/connectsdk/CastMediaInfo.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.connectsdk;

public class CastMediaInfo {
public String mediaURL;
public String iconURL;
public String title;
public String description;
public String mimeType;
public String licenceUrl;
public String receiverPlayerId;
}
Loading