Skip to content

Commit

Permalink
Merge pull request #114 from thomaskioko/feature/ios-season-details
Browse files Browse the repository at this point in the history
[iOS] Season Details UI
  • Loading branch information
thomaskioko authored Dec 22, 2023
2 parents d2453db + cfa04a9 commit a82c9be
Show file tree
Hide file tree
Showing 102 changed files with 923 additions and 612 deletions.
123 changes: 0 additions & 123 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This is my playground for learning Kotlin Multiplatform. With that said, I'm sur

| Android | iOS |
| -- | -- |
| <video src="https://github.com/c0de-wizard/tv-maniac/assets/841885/7ad4abd7-bba1-4afa-9e0a-61023269e868" width=350/> | <video src="https://github.com/thomaskioko/tv-maniac/assets/841885/da109f4b-bf2e-4bee-aec3-ddc62b46ed5f" width=350/> |
| <video src="https://github.com/thomaskioko/tv-maniac/assets/841885/a9991256-27a8-4a99-87f3-0f071c7cbc68" width=350/> | <video src="https://github.com/thomaskioko/tv-maniac/assets/841885/45fa6cd7-6bca-4baa-ad71-93339986ef12" width=350/> |

## 🖥 Project Setup & Environment

Expand Down Expand Up @@ -146,8 +146,8 @@ Android
- [x] Add Seasons UI
- [x] Implement trakt auth & sign in
- [x] Migrate to Material3
- [ ] Add Watchlist
- [ ] Add Episode detail screen
- [ ] Add Watchlist
- [ ] Implement Search

iOS
Expand All @@ -157,9 +157,10 @@ iOS
- [x] Add Settings panel.
- [x] Implement trakt auth & sign in
- [x] Update show detail UI
- [ ] Add Seasons Detail UI
- [ ] Implement Watchlist UI
- [ ] Implement Search UI
- [x] Add Seasons Detail UI
- [ ] Add Episode detail screen
- [ ] Add Watchlist
- [ ] Implement Search

Shared
- [x] Use SQLDelight extensions to consume queries as Flow
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

77 changes: 0 additions & 77 deletions android-core/resources/src/main/res/drawable/ic_tv_logo.xml

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion app/build.gradle.kts → android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {

dependencies {

implementation(projects.androidCore.designsystem)
implementation(projects.android.designsystem)
implementation(projects.shared)
implementation(projects.core.traktAuth.api)
implementation(projects.core.traktAuth.implementation)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,21 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<application
android:name=".TvManicApplication"
android:allowBackup="true"
android:hardwareAccelerated="true"
android:icon="@drawable/ic_app_launcher"
android:label="Tv Maniac"
android:supportsRtl="true"
android:theme="@style/Theme.TvManiac.Splash">
android:name=".TvManicApplication"
android:allowBackup="true"
android:hardwareAccelerated="true"
android:icon="@drawable/ic_app_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.TvManiac.Splash">

<profileable
android:shell="true"
tools:targetApi="29" />

<activity
android:name=".MainActivity"
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|uiMode"
android:exported="true"
android:launchMode="singleTask"
android:theme="@style/Theme.TvManiac">
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
5 changes: 5 additions & 0 deletions android/app/src/main/res/values-night/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="ic_launcher_background_tint">#FCFCFC</color>
<color name="ic_launcher_foreground_tint">#1F2123</color>
</resources>
File renamed without changes.
5 changes: 5 additions & 0 deletions android/app/src/main/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="ic_launcher_background_tint">#000000</color>
<color name="ic_launcher_foreground_tint">#FCFCFC</color>
</resources>
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
<resources xmlns:tools="http://schemas.android.com/tools">

<style name="NightAdjusted.Theme.TvManiac" parent="android:Theme.Material.Light.NoActionBar">
<style name="NightAdjusted.Theme.TvManiac" parent="android:Theme.Material.Light.NoActionBar" />

<!-- The final theme we use -->
<style name="Theme.TvManiac" parent="NightAdjusted.Theme.TvManiac" />

<style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
<item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
<item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
</style>

<style name="PlatformAdjusted.Theme.TvManiac" parent="NightAdjusted.Theme.TvManiac">
<item name="android:statusBarColor">@color/black</item>
</style>

<style name="Theme.TvManiac" parent="PlatformAdjusted.Theme.TvManiac" />

<style name="Theme.TvManiac.Splash" parent="NightAdjusted.Theme.Splash">
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_app_launcher</item>
<item name="postSplashScreenTheme">@style/Theme.TvManiac</item>
</style>

<style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
<item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
<item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
</style>

</resources>
File renamed without changes.
Loading

0 comments on commit a82c9be

Please sign in to comment.