Skip to content

Commit

Permalink
refactor: rename JetCatalogCompose to TvMaterialCatalog
Browse files Browse the repository at this point in the history
  • Loading branch information
vighnesh153 committed Mar 14, 2024
1 parent 5e26614 commit 83c4445
Show file tree
Hide file tree
Showing 230 changed files with 94 additions and 101 deletions.
4 changes: 0 additions & 4 deletions JetCatalogCompose/app/src/main/res/values/strings.xml

This file was deleted.

3 changes: 0 additions & 3 deletions JetCatalogCompose/app/src/main/res/values/themes.xml

This file was deleted.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ This repository contains a set of individual Android TV projects to help you get

- AccessibilityDemo: A Java sample showing how to support accessibility on TVs
- ClassicsKotlin: A modern Android TV app using Kotlin to show classic videos
- TvMaterialCatalog: A jetpack-compose app built using Kotlin that demonstrates the usages of components from [Compose for TV libraries](https://developer.android.com/jetpack/androidx/releases/tv) in isolation.
- JetStreamCompose: A jetpack-compose app using Kotlin that demonstrates the usage of components from the [Compose for TV libraries](https://developer.android.com/jetpack/androidx/releases/tv)
- Leanback: A Java app that demonstrates a basic Android TV app
- Leanback Showcase: A Java app that demonstrates many different parts of the Leanback SDK and how to customize them
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ kotlin {
}

android {
namespace = "com.google.jetcatalog"
namespace = "com.google.tv.material.catalog"
compileSdk = 34

defaultConfig {
applicationId = "com.google.jetcatalog"
applicationId = "com.google.tv.material.catalog"
minSdk = 21
targetSdk = 34
versionCode = 1
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
package="com.google.tv.material.catalog">

<uses-feature
android:name="android.hardware.touchscreen"
Expand All @@ -15,7 +15,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.JetCatalog">
android:theme="@style/Theme.TvMaterialCatalog">
<activity
android:name=".MainActivity"
android:exported="true">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -11,17 +11,13 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.LayoutDirection
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.tv.material3.ExperimentalTvMaterial3Api
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.darkColorScheme
import androidx.tv.material3.lightColorScheme
import com.google.jetcatalog.colorutils.Scheme.Companion.dark
import com.google.jetcatalog.colorutils.Scheme.Companion.light
import com.google.jetcatalog.colorutils.toColorScheme
import com.google.tv.material.catalog.colorutils.Scheme.Companion.dark
import com.google.tv.material.catalog.colorutils.Scheme.Companion.light
import com.google.tv.material.catalog.colorutils.toColorScheme

@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

val components = listOf(
Component.Button,
Expand Down Expand Up @@ -34,9 +34,9 @@ enum class Component(val title: String, val imageArg: String, val routeValue: St
Chip(title = "Chips", imageArg = "chips", routeValue = NavGraph.Chips.routeName),
ListItem(title = "Lists", imageArg = "lists", routeValue = NavGraph.Lists.routeName),
ImmersiveList(
title = "Immersive Cluster",
title = "Immersive List",
imageArg = "immersive",
routeValue = NavGraph.ImmersiveCluster.routeName
routeValue = NavGraph.ImmersiveList.routeName
),
FeaturedCarousel(
title = "Featured Carousel",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.foundation.Canvas
import androidx.compose.foundation.background
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.focusRestorer
import androidx.compose.ui.unit.dp
import androidx.tv.foundation.lazy.grid.TvGridCells
import androidx.tv.foundation.lazy.grid.TvGridItemSpan
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.padding
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import android.os.Bundle
import androidx.activity.ComponentActivity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand All @@ -7,18 +7,18 @@ import androidx.compose.runtime.compositionLocalOf
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import com.google.jetcatalog.screens.ButtonsScreen
import com.google.jetcatalog.screens.CardsScreen
import com.google.jetcatalog.screens.ChipsScreen
import com.google.jetcatalog.screens.ColorsScreen
import com.google.jetcatalog.screens.FeaturedCarouselScreen
import com.google.jetcatalog.screens.ImmersiveListScreen
import com.google.jetcatalog.screens.InteractionsScreen
import com.google.jetcatalog.screens.ListsScreen
import com.google.jetcatalog.screens.MotionScreen
import com.google.jetcatalog.screens.TabRowScreen
import com.google.jetcatalog.screens.TypographyScreen
import com.google.jetcatalog.screens.WorkInProgressScreen
import com.google.tv.material.catalog.screens.ButtonsScreen
import com.google.tv.material.catalog.screens.CardsScreen
import com.google.tv.material.catalog.screens.ChipsScreen
import com.google.tv.material.catalog.screens.ColorsScreen
import com.google.tv.material.catalog.screens.FeaturedCarouselScreen
import com.google.tv.material.catalog.screens.ImmersiveListScreen
import com.google.tv.material.catalog.screens.InteractionsScreen
import com.google.tv.material.catalog.screens.ListsScreen
import com.google.tv.material.catalog.screens.MotionScreen
import com.google.tv.material.catalog.screens.TabRowScreen
import com.google.tv.material.catalog.screens.TypographyScreen
import com.google.tv.material.catalog.screens.WorkInProgressScreen

@Composable
fun NavigationGraph(
Expand Down Expand Up @@ -129,8 +129,8 @@ enum class NavGraph(
}
}
),
ImmersiveCluster(
routeName = "immersive-cluster",
ImmersiveList(
routeName = "immersive-list",
composable = { appBar ->
Box {
ImmersiveListScreen()
Expand Down Expand Up @@ -196,7 +196,7 @@ val destinations = listOf(
NavGraph.Cards,
NavGraph.Chips,
NavGraph.Lists,
NavGraph.ImmersiveCluster,
NavGraph.ImmersiveList,
NavGraph.FeaturedCarousel,
NavGraph.NavigationDrawer,
NavGraph.TabRow,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.runtime.Composable
import androidx.compose.runtime.compositionLocalOf
Expand Down Expand Up @@ -55,7 +55,7 @@ fun getHomeGridCardImage(
context.resources.getIdentifier(
"${imageArg}_${colorIdentifier}_${mode.value}",
"drawable",
"com.google.jetcatalog"
"com.google.tv.material.catalog"
)
}
return image
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils

import kotlin.math.abs
import kotlin.math.atan2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils

import androidx.compose.ui.graphics.Color
import androidx.tv.material3.ColorScheme
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils

import kotlin.math.max
import kotlin.math.min
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils

import kotlin.math.abs
import kotlin.math.atan2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils

import kotlin.math.abs

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils

/** Represents a Material color scheme, a mapping of color roles to colors. */
class Scheme {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils

/**
* A convenience class for retrieving colors that are constant in hue and chroma, but vary in tone.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.colorutils
package com.google.tv.material.catalog.colorutils

import kotlin.math.cbrt
import kotlin.math.exp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog
package com.google.tv.material.catalog

import androidx.compose.ui.Modifier

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.screens
package com.google.tv.material.catalog.screens

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
Expand All @@ -24,8 +24,8 @@ import androidx.tv.material3.OutlinedIconButton
import androidx.tv.material3.OutlinedIconButtonDefaults
import androidx.tv.material3.Text
import androidx.tv.material3.WideButton
import com.google.jetcatalog.ExampleAction
import com.google.jetcatalog.ExamplesScreenWithDottedBackground
import com.google.tv.material.catalog.ExampleAction
import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground

@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.screens
package com.google.tv.material.catalog.screens

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.aspectRatio
Expand All @@ -19,9 +19,9 @@ import androidx.tv.material3.StandardCardLayout
import androidx.tv.material3.Text
import androidx.tv.material3.WideCardLayout
import androidx.tv.material3.WideClassicCard
import com.google.jetcatalog.ExampleAction
import com.google.jetcatalog.ExamplesScreenWithDottedBackground
import com.google.jetcatalog.R
import com.google.tv.material.catalog.ExampleAction
import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground
import com.google.tv.material.catalog.R

@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.screens
package com.google.tv.material.catalog.screens

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
Expand All @@ -20,8 +20,8 @@ import androidx.tv.material3.Icon
import androidx.tv.material3.InputChip
import androidx.tv.material3.SuggestionChip
import androidx.tv.material3.Text
import com.google.jetcatalog.ExampleAction
import com.google.jetcatalog.ExamplesScreenWithDottedBackground
import com.google.tv.material.catalog.ExampleAction
import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground

@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.screens
package com.google.tv.material.catalog.screens

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Arrangement
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.screens
package com.google.tv.material.catalog.screens

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image
Expand Down Expand Up @@ -50,7 +50,7 @@ import androidx.tv.material3.Icon
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.google.jetcatalog.R
import com.google.tv.material.catalog.R

@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.screens
package com.google.tv.material.catalog.screens

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
Expand Down Expand Up @@ -40,8 +40,8 @@ import androidx.tv.material3.CompactCard
import androidx.tv.material3.ExperimentalTvMaterial3Api
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.google.jetcatalog.R
import com.google.jetcatalog.ifElse
import com.google.tv.material.catalog.R
import com.google.tv.material.catalog.ifElse

@OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class)
@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetcatalog.screens
package com.google.tv.material.catalog.screens

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Arrangement
Expand All @@ -20,8 +20,8 @@ import androidx.tv.material3.Glow
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.google.jetcatalog.ExampleAction
import com.google.jetcatalog.ExamplesScreenWithDottedBackground
import com.google.tv.material.catalog.ExampleAction
import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground

@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
Expand Down
Loading

0 comments on commit 83c4445

Please sign in to comment.