u

Author: electrolyteJ

android/app/build.gradle

@@ -18,7 +18,7 @@ android {
         applicationId project.rootProject.applicationId
         minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
         targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-        resValue "string", "app_name", "b.app"
+//        resValue "string", "app_name", "b.app"
         buildConfigField('String', 'BUGLY_APP_ID', '"3d62251014"')
         buildConfigField('String', 'BUGLY_APP_KEY', '"a15ecf84-1786-40c6-abf5-fe975fce22e6"')
         buildConfigField('String', 'XIAOMI_APP_ID', '"2882303761517994447"')
@@ -126,13 +126,7 @@ android {
 //        maxProcessCount 8
 //        dexInProcess = true
 //    }
-//    flavorDimensions "default"
-//    productFlavors{
-//        dev{
-//            resConfigs ("en", "xxhdpi"/*1080p*/)//优化编译速度：只编译指定资源
-//        }
-//
-//    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17

android/app/src/main/AndroidManifest.xml

@@ -39,7 +39,6 @@
             android:name="com.jamesfchen.b.BApp"
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
             android:networkSecurityConfig="@xml/network_security_config"
             android:supportsRtl="true"
             android:usesCleartextTraffic="true"

android/base/build.gradle

@@ -22,55 +22,38 @@ android{
 
 }
 dependencies {
-    api 'androidx.core:core-ktx:1.5.0'
-    api 'androidx.appcompat:appcompat:1.3.0'
-    api 'com.google.android.material:material:1.3.0'
-    api(libs.kotlin.stdlib)
     api 'androidx.constraintlayout:constraintlayout:2.0.4'
+    api(libs.androidx.core.ktx)
+    api(libs.androidx.appcompat)
+    api "androidx.activity:activity-ktx:1.3.1"
+    api "androidx.activity:activity:1.3.1"
+    api "androidx.fragment:fragment:1.3.5"
+    api "androidx.fragment:fragment-ktx:1.3.5"
+    api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    api(libs.google.android.material)
+    api(libs.kotlin.stdlib)
+    api(libs.glide)
+    api(libs.retrofit.core)
+    api(libs.retrofit.kotlin.serialization)
+    //    api "com.squareup.retrofit2:retrofit-converters:2.8.1"
+    api "com.squareup.retrofit2:adapter-rxjava3:2.9.0"
+    api "com.squareup.retrofit2:converter-wire:2.9.0"
+    api "com.squareup.retrofit2:converter-gson:2.9.0"
+//    api "com.squareup.retrofit2:converter-moshi:2.9.0"
+//    api "com.squareup.retrofit2:converter-protobuf:2.9.0"
 
-//    api 'com.google.firebase:firebase-analytics:19.0.0'
-//    api 'com.google.firebase:firebase-crashlytics:18.0.1'
-//    api 'com.google.firebase:firebase-crashlytics-ndk:18.0.1'
-    //crash and anr
-//    api 'com.tencent.bugly:nativecrashreport:3.7.1'
-    api 'com.tencent.bugly:crashreport:3.0.0'
-//    implementation 'com.google.android.gms:play-services-location:16.0.0'
-//    implementation 'com.google.android.gms:play-services-fitness:16.0.1'
-//    api 'androidx.multidex:multidex:2.0.1'
     testImplementation files('libs/jsoup-1.12.1.jar')
 //    api 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
     //    api 'com.android.volley:volley:1.1.1'
     api 'com.squareup.okhttp3:okhttp-tls:4.0.1'
     api 'com.facebook.stetho:stetho-okhttp3:1.5.1'
     api "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2"
     testImplementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.0.1'
-    /*
-    >>>> http style  start
-    */
-
-    //restful
-    api "com.squareup.retrofit2:retrofit:2.9.0"
-//    api "com.squareup.retrofit2:retrofit-converters:2.8.1"
-    api "com.squareup.retrofit2:adapter-rxjava3:2.9.0"
-    api "com.squareup.retrofit2:converter-wire:2.9.0"
-    api "com.squareup.retrofit2:converter-gson:2.9.0"
-//    api "com.squareup.retrofit2:converter-moshi:2.9.0"
-//    api "com.squareup.retrofit2:converter-protobuf:2.9.0"
-    //rpc
-//    api("io.grpc:grpc-protobuf-lite:${rootProject.ext.grpcVersion}") {//存在依赖冲突
-//        exclude group:  'com.google.guava'
-//        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-//    }
-//    api "io.grpc:grpc-okhttp:${rootProject.ext.grpcVersion}"
-//    api "io.grpc:grpc-stub:${rootProject.ext.grpcVersion}"
-
-    /*
-      http style  end
-    */
 
     kapt "com.google.dagger:dagger-compiler:2.16"
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
     implementation "com.github.jnr:jnr-unixsocket:0.23"
     implementation 'com.google.android.gms:play-services-cronet:17.0.0'
+
 }
 

android/gradle.properties

@@ -51,7 +51,7 @@ useElectrolytejSnapshots=true
 compileSdkVersion=34
 buildToolsVersion=34.0.0
 #19:kk,21:L,23:M,24:N,26:O,28:P,29:Q,30:R
-minSdkVersion=23
+minSdkVersion=26
 targetSdkVersion=34
 versionCode=2
 versionName=2.0.0

android/gradle/libs.versions.toml

@@ -69,6 +69,21 @@ material = "1.11.0"
 versionCode="2"
 versionName="2.0.0"
 junit = "1.2.1"
+leanback = "1.0.0"
+glide = "4.11.0"
+tvFoundation = "1.0.0-alpha07"
+tvMaterial = "1.0.0-alpha07"
+playServicesWearable = "19.0.0"
+composeMaterial = "1.2.1"
+composeFoundation = "1.2.1"
+wearToolingPreview = "1.0.0"
+tiles = "1.4.0"
+tilesMaterial = "1.4.0"
+tilesTooling = "1.4.0"
+tilesToolingPreview = "1.4.0"
+horologistComposeTools = "0.6.17"
+horologistTiles = "0.6.17"
+watchfaceComplicationsDataSourceKtx = "1.2.1"
 [libraries]
 accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }
 android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
@@ -171,6 +186,21 @@ room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", vers
 androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
 androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" }
 androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
+androidx-leanback = { group = "androidx.leanback", name = "leanback", version.ref = "leanback" }
+glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
+androidx-tv-foundation = { group = "androidx.tv", name = "tv-foundation", version.ref = "tvFoundation" }
+androidx-tv-material = { group = "androidx.tv", name = "tv-material", version.ref = "tvMaterial" }
+play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "playServicesWearable" }
+androidx-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "composeMaterial" }
+compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "composeFoundation" }
+androidx-wear-tooling-preview = { group = "androidx.wear", name = "wear-tooling-preview", version.ref = "wearToolingPreview" }
+androidx-tiles = { group = "androidx.wear.tiles", name = "tiles", version.ref = "tiles" }
+androidx-tiles-material = { group = "androidx.wear.tiles", name = "tiles-material", version.ref = "tilesMaterial" }
+androidx-tiles-tooling = { group = "androidx.wear.tiles", name = "tiles-tooling", version.ref = "tilesTooling" }
+androidx-tiles-tooling-preview = { group = "androidx.wear.tiles", name = "tiles-tooling-preview", version.ref = "tilesToolingPreview" }
+horologist-compose-tools = { group = "com.google.android.horologist", name = "horologist-compose-tools", version.ref = "horologistComposeTools" }
+horologist-tiles = { group = "com.google.android.horologist", name = "horologist-tiles", version.ref = "horologistTiles" }
+androidx-watchface-complications-data-source-ktx = { group = "androidx.wear.watchface", name = "watchface-complications-data-source-ktx", version.ref = "watchfaceComplicationsDataSourceKtx" }
 
 
 [plugins]

android/hotel-module/bundle1/build.gradle

@@ -1,7 +1,7 @@
 plugins{
     id "io.github.electrolytej.static-bundle-plugin"
-    id("kotlin-android")
-    id("kotlin-kapt")
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose)
 }
 android {
     compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
@@ -13,6 +13,7 @@ android {
     namespace "com.jamesfchen.bundle1"
     buildFeatures {
         viewBinding true
+        compose = true
     }
     //    defaultConfig {
 //        javaCompileOptions {
@@ -34,4 +35,18 @@ dependencies {
     implementation project.moduleify("hotel-export")
 //    kapt 'io.github.jamesfchen:ibc-processor:1.3.0'
     compileOnly project.moduleify('fwk-base')
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.tv.foundation)
+    implementation(libs.androidx.tv.material)
+    implementation(libs.androidx.lifecycle.runtime)
+    implementation(libs.androidx.activity.compose)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.compose.ui.test)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
 }

android/hotel-module/bundle1/src/tv/AndroidManifest.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+
+    <application
+        android:label="@string/app_name"
+        android:theme="@style/Theme.Android">
+        <activity
+            android:name="com.electrolytej.bundle1.MainActivity"
+            android:banner="@drawable/app_icon_your_company"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

android/hotel-module/bundle1/src/tv/java/com/electrolytej/bundle1/MainActivity.kt

@@ -0,0 +1,47 @@
+package com.electrolytej.bundle1
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.tv.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.Surface
+import com.electrolytej.bundle1.ui.theme.AndroidTheme
+
+class MainActivity : ComponentActivity() {
+    @OptIn(ExperimentalTvMaterial3Api::class)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            AndroidTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    shape = RectangleShape
+                ) {
+                    Greeting("Android")
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Greeting(name: String, modifier: Modifier = Modifier) {
+    Text(
+        text = "Hello $name!",
+        modifier = modifier
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun GreetingPreview() {
+    AndroidTheme {
+        Greeting("Android")
+    }
+}

android/hotel-module/bundle1/src/tv/java/com/electrolytej/bundle1/ui/theme/Color.kt

@@ -0,0 +1,11 @@
+package com.electrolytej.bundle1.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)

android/hotel-module/bundle1/src/tv/java/com/electrolytej/bundle1/ui/theme/Theme.kt

@@ -0,0 +1,34 @@
+package com.electrolytej.bundle1.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.Composable
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.darkColorScheme
+import androidx.tv.material3.lightColorScheme
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+@Composable
+fun AndroidTheme(
+    isInDarkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit,
+) {
+    val colorScheme = if (isInDarkTheme) {
+        darkColorScheme(
+            primary = Purple80,
+            secondary = PurpleGrey80,
+            tertiary = Pink80
+        )
+    } else {
+        lightColorScheme(
+            primary = Purple40,
+            secondary = PurpleGrey40,
+            tertiary = Pink40
+        )
+    }
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}