commit 8b7efbae4e4c05660ca1d6d311e1a44ac22dfef1 Author: Mitchel Date: Wed Nov 2 14:45:30 2022 +0100 Initial commit with feyenoord support, card support being worked on diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..4aba80d --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Thuis \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a2d7c21 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..bd2a505 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,29 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..bdd9278 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..a87bde9 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,69 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.mitchelbv.thuis_c' + compileSdk 32 + + defaultConfig { + applicationId "com.mitchelbv.thuis_c" + minSdk 30 + targetSdk 32 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary true + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + compose true + } + composeOptions { + kotlinCompilerExtensionVersion '1.1.1' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } +} + +dependencies { + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' + implementation("io.coil-kt:coil-compose:2.2.2") + + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07" + + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' + implementation 'androidx.activity:activity-compose:1.5.1' + implementation "androidx.compose.ui:ui:$compose_ui_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version" + implementation "androidx.compose.material:material:$compose_ui_version" + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version" +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/mitchelbv/thuis_c/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/mitchelbv/thuis_c/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..19f35c5 --- /dev/null +++ b/app/src/androidTest/java/com/mitchelbv/thuis_c/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.mitchelbv.thuis_c + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.mitchelbv.thuis_c", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..63b2bf5 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/MainActivity.kt b/app/src/main/java/com/mitchelbv/thuis_c/MainActivity.kt new file mode 100644 index 0000000..a895b0b --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/MainActivity.kt @@ -0,0 +1,54 @@ +package com.mitchelbv.thuis_c + +import android.annotation.SuppressLint +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import com.mitchelbv.thuis_c.ui.theme.ThuisTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + ThuisTheme { + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colors.background + ) { + ThuisApp() + } + } + } + } +} + +@SuppressLint("UnusedMaterialScaffoldPaddingParameter") +@Composable +fun ThuisApp() { + var currentScreen: ThuisDestination by remember { mutableStateOf(Home) } + return Scaffold(bottomBar = { + BottomNavigation() { + destinations.forEachIndexed { index, item -> + BottomNavigationItem( + selected = currentScreen.route == destinations[index].route, + onClick = { currentScreen = destinations[index] }, + icon = { + Icon( + destinations[index].icon, + contentDescription = null + ) + }) + } + } + }) { + currentScreen.screen() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ThuisDestinations.kt b/app/src/main/java/com/mitchelbv/thuis_c/ThuisDestinations.kt new file mode 100644 index 0000000..60a8153 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ThuisDestinations.kt @@ -0,0 +1,37 @@ +package com.mitchelbv.thuis_c + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.DateRange +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.filled.ShoppingCart +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.vector.ImageVector +import com.mitchelbv.thuis_c.ui.card.CardsScreen +import com.mitchelbv.thuis_c.ui.feyenoord.FeyenoordScreen +import com.mitchelbv.thuis_c.ui.home.HomeScreen + +interface ThuisDestination { + val route: String + val screen: @Composable () -> Unit + val icon: ImageVector +} + +object Home : ThuisDestination { + override val icon = Icons.Filled.Home + override val route = "home" + override val screen: @Composable () -> Unit = { HomeScreen() } +} + +object FeyenoordMatches : ThuisDestination { + override val icon = Icons.Filled.DateRange + override val route: String = "matches" + override val screen: @Composable () -> Unit = { FeyenoordScreen() } +} + +object Card : ThuisDestination { + override val icon = Icons.Filled.ShoppingCart + override val route = "card" + override val screen: @Composable () -> Unit = { CardsScreen() } +} + +val destinations = listOf(Home, FeyenoordMatches) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/card/CardRetrofitHelper.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/card/CardRetrofitHelper.kt new file mode 100644 index 0000000..e5fb729 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/card/CardRetrofitHelper.kt @@ -0,0 +1,16 @@ +package com.mitchelbv.thuis_c.network.card + +import com.mitchelbv.thuis_c.network.feyenoord.FeyenoordRetrofitHelper +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +object CardRetrofitHelper { + val baseUrl = "https://10.0.2.2:7239/" + + fun getInstance(): Retrofit { + return Retrofit.Builder() + .baseUrl(baseUrl) + .addConverterFactory(GsonConverterFactory.create()) + .build() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/card/CardService.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/card/CardService.kt new file mode 100644 index 0000000..d0041f5 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/card/CardService.kt @@ -0,0 +1,13 @@ +package com.mitchelbv.thuis_c.network.card + +import com.mitchelbv.thuis_c.network.card.responses.Card +import com.mitchelbv.thuis_c.network.card.responses.Cards +import retrofit2.http.GET + +interface CardService { + @GET("Card") + suspend fun getCards(): Cards + + @GET("Card/{id}") + suspend fun getCard(id: Int): Card +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/card/responses/Card.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/card/responses/Card.kt new file mode 100644 index 0000000..72fc65e --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/card/responses/Card.kt @@ -0,0 +1,9 @@ +package com.mitchelbv.thuis_c.network.card.responses + +import com.google.gson.annotations.SerializedName + +data class Card( + @SerializedName("cardId") var id: Int? = null, + @SerializedName("issuer") var issuer: String? = null, + @SerializedName("code") var code: String? = null +) diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/card/responses/Cards.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/card/responses/Cards.kt new file mode 100644 index 0000000..72bdb25 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/card/responses/Cards.kt @@ -0,0 +1,7 @@ +package com.mitchelbv.thuis_c.network.card.responses + +import com.google.gson.annotations.SerializedName + +data class Cards ( + @SerializedName("cards") var cards: ArrayList = arrayListOf() +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/FeyenoordRetrofitHelper.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/FeyenoordRetrofitHelper.kt new file mode 100644 index 0000000..2cac154 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/FeyenoordRetrofitHelper.kt @@ -0,0 +1,15 @@ +package com.mitchelbv.thuis_c.network.feyenoord + +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +object FeyenoordRetrofitHelper { + val baseUrl = "https://tickets-api.feyenoord.nl/api/" + + fun getInstance(): Retrofit { + return Retrofit.Builder() + .baseUrl(baseUrl) + .addConverterFactory(GsonConverterFactory.create()) + .build() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/FeyenoordService.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/FeyenoordService.kt new file mode 100644 index 0000000..c3c92cf --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/FeyenoordService.kt @@ -0,0 +1,10 @@ +package com.mitchelbv.thuis_c.network.feyenoord + +import com.mitchelbv.thuis_c.network.feyenoord.responses.FeyenoordEventResponse +import retrofit2.Call +import retrofit2.http.GET + +interface FeyenoordService { + @GET("event") + suspend fun getEvents(): FeyenoordEventResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/ButtonData.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/ButtonData.kt new file mode 100644 index 0000000..bd3536c --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/ButtonData.kt @@ -0,0 +1,23 @@ +package com.mitchelbv.thuis_c.network.feyenoord.responses + +import com.google.gson.annotations.SerializedName + + +data class ButtonData( + + @SerializedName("EventId") var EventId: Int? = null, + @SerializedName("SaleCategoryId") var SaleCategoryId: Int? = null, + @SerializedName("TranslationCode") var TranslationCode: String? = null, + @SerializedName("ButtonStyle") var ButtonStyle: Int? = null, + @SerializedName("ActionType") var ActionType: Int? = null, + @SerializedName("Action") var Action: String? = null, + @SerializedName("ActiveFrom") var ActiveFrom: String? = null, + @SerializedName("ActiveTill") var ActiveTill: String? = null, + @SerializedName("OpenInNewTab") var OpenInNewTab: Boolean? = null, + @SerializedName("InitiativeId") var InitiativeId: String? = null, + @SerializedName("Id") var Id: Int? = null, + @SerializedName("Created") var Created: String? = null, + @SerializedName("Modified") var Modified: String? = null, + @SerializedName("Deleted") var Deleted: String? = null + +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/EventEndDateTimeFormatted.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/EventEndDateTimeFormatted.kt new file mode 100644 index 0000000..e63861d --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/EventEndDateTimeFormatted.kt @@ -0,0 +1,19 @@ +package com.mitchelbv.thuis_c.network.feyenoord.responses + +import com.google.gson.annotations.SerializedName + + +data class EventEndDateTimeFormatted ( + + @SerializedName("DateTime" ) var DateTime : String? = null, + @SerializedName("Full" ) var Full : String? = null, + @SerializedName("DateLong" ) var DateLong : String? = null, + @SerializedName("DateShort" ) var DateShort : String? = null, + @SerializedName("Time" ) var Time : String? = null, + @SerializedName("DayMonth" ) var DayMonth : String? = null, + @SerializedName("DayOfWeek" ) var DayOfWeek : Int? = null, + @SerializedName("Year" ) var Year : Int? = null, + @SerializedName("Month" ) var Month : Int? = null, + @SerializedName("Day" ) var Day : Int? = null + +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/EventStartDateTimeFormatted.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/EventStartDateTimeFormatted.kt new file mode 100644 index 0000000..8f7d07d --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/EventStartDateTimeFormatted.kt @@ -0,0 +1,19 @@ +package com.mitchelbv.thuis_c.network.feyenoord.responses + +import com.google.gson.annotations.SerializedName + + +data class EventStartDateTimeFormatted ( + + @SerializedName("DateTime" ) var DateTime : String? = null, + @SerializedName("Full" ) var Full : String? = null, + @SerializedName("DateLong" ) var DateLong : String? = null, + @SerializedName("DateShort" ) var DateShort : String? = null, + @SerializedName("Time" ) var Time : String? = null, + @SerializedName("DayMonth" ) var DayMonth : String? = null, + @SerializedName("DayOfWeek" ) var DayOfWeek : Int? = null, + @SerializedName("Year" ) var Year : Int? = null, + @SerializedName("Month" ) var Month : Int? = null, + @SerializedName("Day" ) var Day : Int? = null + +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/FeyenoordEventResponse.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/FeyenoordEventResponse.kt new file mode 100644 index 0000000..2f47f26 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/FeyenoordEventResponse.kt @@ -0,0 +1,12 @@ +package com.mitchelbv.thuis_c.network.feyenoord.responses + +import com.google.gson.annotations.SerializedName + + +data class FeyenoordEventResponse( + + @SerializedName("HeaderItem") var HeaderItem: HeaderItem? = HeaderItem(), + @SerializedName("TabItems") var TabItems: ArrayList = arrayListOf(), + @SerializedName("CrossSellInfo") var CrossSellInfo: String? = null + +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/HeaderItem.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/HeaderItem.kt new file mode 100644 index 0000000..ab4630d --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/HeaderItem.kt @@ -0,0 +1,63 @@ +package com.mitchelbv.thuis_c.network.feyenoord.responses + +import com.google.gson.annotations.SerializedName + + +data class HeaderItem ( + + @SerializedName("DisplayCountdown" ) var DisplayCountdown : Boolean? = null, + @SerializedName("ShowResellInHeader" ) var ShowResellInHeader : Boolean? = null, + @SerializedName("ResellTicketsAllowed" ) var ResellTicketsAllowed : Boolean? = null, + @SerializedName("ResellTicketsFrom" ) var ResellTicketsFrom : String? = null, + @SerializedName("ResellTicketsTill" ) var ResellTicketsTill : String? = null, + @SerializedName("EventId" ) var EventId : Int? = null, + @SerializedName("SaleCategoryId" ) var SaleCategoryId : Int? = null, + @SerializedName("HasGeneralSale" ) var HasGeneralSale : Boolean? = null, + @SerializedName("VisibleInShop" ) var VisibleInShop : Boolean? = null, + @SerializedName("HighlightInShop" ) var HighlightInShop : Boolean? = null, + @SerializedName("HasSoldOut" ) var HasSoldOut : Boolean? = null, + @SerializedName("OnGeneralSaleFrom" ) var OnGeneralSaleFrom : String? = null, + @SerializedName("OnGeneralSaleTill" ) var OnGeneralSaleTill : String? = null, + @SerializedName("VisibleInShopFrom" ) var VisibleInShopFrom : String? = null, + @SerializedName("VisibleInShopTill" ) var VisibleInShopTill : String? = null, + @SerializedName("Name" ) var Name : String? = null, + @SerializedName("NameHomeTeam" ) var NameHomeTeam : String? = null, + @SerializedName("NameAwayTeam" ) var NameAwayTeam : String? = null, + @SerializedName("EventStartDateTime" ) var EventStartDateTime : String? = null, + @SerializedName("EventStartDateTimeOffset" ) var EventStartDateTimeOffset : String? = null, + @SerializedName("EventEndDateTime" ) var EventEndDateTime : String? = null, + @SerializedName("CategoryTranslationCode" ) var CategoryTranslationCode : String? = null, + @SerializedName("SaleCategoryOrder" ) var SaleCategoryOrder : Int? = null, + @SerializedName("ImageId" ) var ImageId : String? = null, + @SerializedName("ImageFileName" ) var ImageFileName : String? = null, + @SerializedName("ImageUniqueName" ) var ImageUniqueName : String? = null, + @SerializedName("HomeImageId" ) var HomeImageId : Int? = null, + @SerializedName("HomeImageFileName" ) var HomeImageFileName : String? = null, + @SerializedName("HomeImageUniqueName" ) var HomeImageUniqueName : String? = null, + @SerializedName("AwayImageId" ) var AwayImageId : Int? = null, + @SerializedName("AwayImageFileName" ) var AwayImageFileName : String? = null, + @SerializedName("AwayImageUniqueName" ) var AwayImageUniqueName : String? = null, + @SerializedName("HasTicketsAvailable" ) var HasTicketsAvailable : Boolean? = null, + @SerializedName("HasMarketplaceTicketsAvailable" ) var HasMarketplaceTicketsAvailable : Boolean? = null, + @SerializedName("HasPossibleTicketsInFuture" ) var HasPossibleTicketsInFuture : Boolean? = null, + @SerializedName("CurrentlyOnSaleForUser" ) var CurrentlyOnSaleForUser : Boolean? = null, + @SerializedName("PurchaseRightAvailableAfterLogin" ) var PurchaseRightAvailableAfterLogin : Boolean? = null, + @SerializedName("ImageUrl" ) var ImageUrl : String? = null, + @SerializedName("HomeImageUrl" ) var HomeImageUrl : String? = null, + @SerializedName("AwayImageUrl" ) var AwayImageUrl : String? = null, + @SerializedName("EventTypeName" ) var EventTypeName : String? = null, + @SerializedName("EventTypeLogoId" ) var EventTypeLogoId : Int? = null, + @SerializedName("EventTypeLogoUrl" ) var EventTypeLogoUrl : String? = null, + @SerializedName("EventTypeLogoFileName" ) var EventTypeLogoFileName : String? = null, + @SerializedName("EventTypeLogoUniqueName" ) var EventTypeLogoUniqueName : String? = null, + @SerializedName("InfoUrl" ) var InfoUrl : String? = null, + @SerializedName("EventStartDateTimeFormatted" ) var EventStartDateTimeFormatted : EventStartDateTimeFormatted? = EventStartDateTimeFormatted(), + @SerializedName("EventEndDateTimeFormatted" ) var EventEndDateTimeFormatted : EventEndDateTimeFormatted? = EventEndDateTimeFormatted(), + @SerializedName("ButtonData" ) var ButtonData : ButtonData? = ButtonData(), + @SerializedName("ShowMarketplaceForEvent" ) var ShowMarketplaceForEvent : Boolean? = null, + @SerializedName("RedirectToMarketplace" ) var RedirectToMarketplace : Boolean? = null, + @SerializedName("MarketplaceButtonTextColor" ) var MarketplaceButtonTextColor : String? = null, + @SerializedName("MarketplaceButtonBackgroundColor" ) var MarketplaceButtonBackgroundColor : String? = null, + @SerializedName("DeepLinkRoute" ) var DeepLinkRoute : String? = null + +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/Items.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/Items.kt new file mode 100644 index 0000000..b51be2e --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/Items.kt @@ -0,0 +1,63 @@ +package com.mitchelbv.thuis_c.network.feyenoord.responses + +import com.google.gson.annotations.SerializedName + + +data class Items( + + @SerializedName("DisplayCountdown") var DisplayCountdown: Boolean? = null, + @SerializedName("ShowResellInHeader") var ShowResellInHeader: Boolean? = null, + @SerializedName("ResellTicketsAllowed") var ResellTicketsAllowed: Boolean? = null, + @SerializedName("ResellTicketsFrom") var ResellTicketsFrom: String? = null, + @SerializedName("ResellTicketsTill") var ResellTicketsTill: String? = null, + @SerializedName("EventId") var EventId: Int? = null, + @SerializedName("SaleCategoryId") var SaleCategoryId: Int? = null, + @SerializedName("HasGeneralSale") var HasGeneralSale: Boolean? = null, + @SerializedName("VisibleInShop") var VisibleInShop: Boolean? = null, + @SerializedName("HighlightInShop") var HighlightInShop: Boolean? = null, + @SerializedName("HasSoldOut") var HasSoldOut: Boolean? = null, + @SerializedName("OnGeneralSaleFrom") var OnGeneralSaleFrom: String? = null, + @SerializedName("OnGeneralSaleTill") var OnGeneralSaleTill: String? = null, + @SerializedName("VisibleInShopFrom") var VisibleInShopFrom: String? = null, + @SerializedName("VisibleInShopTill") var VisibleInShopTill: String? = null, + @SerializedName("Name") var Name: String? = null, + @SerializedName("NameHomeTeam") var NameHomeTeam: String? = null, + @SerializedName("NameAwayTeam") var NameAwayTeam: String? = null, + @SerializedName("EventStartDateTime") var EventStartDateTime: String? = null, + @SerializedName("EventStartDateTimeOffset") var EventStartDateTimeOffset: String? = null, + @SerializedName("EventEndDateTime") var EventEndDateTime: String? = null, + @SerializedName("CategoryTranslationCode") var CategoryTranslationCode: String? = null, + @SerializedName("SaleCategoryOrder") var SaleCategoryOrder: Int? = null, + @SerializedName("ImageId") var ImageId: String? = null, + @SerializedName("ImageFileName") var ImageFileName: String? = null, + @SerializedName("ImageUniqueName") var ImageUniqueName: String? = null, + @SerializedName("HomeImageId") var HomeImageId: Int? = null, + @SerializedName("HomeImageFileName") var HomeImageFileName: String? = null, + @SerializedName("HomeImageUniqueName") var HomeImageUniqueName: String? = null, + @SerializedName("AwayImageId") var AwayImageId: Int? = null, + @SerializedName("AwayImageFileName") var AwayImageFileName: String? = null, + @SerializedName("AwayImageUniqueName") var AwayImageUniqueName: String? = null, + @SerializedName("HasTicketsAvailable") var HasTicketsAvailable: Boolean? = null, + @SerializedName("HasMarketplaceTicketsAvailable") var HasMarketplaceTicketsAvailable: Boolean? = null, + @SerializedName("HasPossibleTicketsInFuture") var HasPossibleTicketsInFuture: Boolean? = null, + @SerializedName("CurrentlyOnSaleForUser") var CurrentlyOnSaleForUser: Boolean? = null, + @SerializedName("PurchaseRightAvailableAfterLogin") var PurchaseRightAvailableAfterLogin: Boolean? = null, + @SerializedName("ImageUrl") var ImageUrl: String? = null, + @SerializedName("HomeImageUrl") var HomeImageUrl: String? = null, + @SerializedName("AwayImageUrl") var AwayImageUrl: String? = null, + @SerializedName("EventTypeName") var EventTypeName: String? = null, + @SerializedName("EventTypeLogoId") var EventTypeLogoId: Int? = null, + @SerializedName("EventTypeLogoUrl") var EventTypeLogoUrl: String? = null, + @SerializedName("EventTypeLogoFileName") var EventTypeLogoFileName: String? = null, + @SerializedName("EventTypeLogoUniqueName") var EventTypeLogoUniqueName: String? = null, + @SerializedName("InfoUrl") var InfoUrl: String? = null, + @SerializedName("EventStartDateTimeFormatted") var EventStartDateTimeFormatted: EventStartDateTimeFormatted? = EventStartDateTimeFormatted(), + @SerializedName("EventEndDateTimeFormatted") var EventEndDateTimeFormatted: EventEndDateTimeFormatted? = EventEndDateTimeFormatted(), + @SerializedName("ButtonData") var ButtonData: ButtonData? = ButtonData(), + @SerializedName("ShowMarketplaceForEvent") var ShowMarketplaceForEvent: Boolean? = null, + @SerializedName("RedirectToMarketplace") var RedirectToMarketplace: Boolean? = null, + @SerializedName("MarketplaceButtonTextColor") var MarketplaceButtonTextColor: String? = null, + @SerializedName("MarketplaceButtonBackgroundColor") var MarketplaceButtonBackgroundColor: String? = null, + @SerializedName("DeepLinkRoute") var DeepLinkRoute: String? = null + +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/TabItems.kt b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/TabItems.kt new file mode 100644 index 0000000..f72f707 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/network/feyenoord/responses/TabItems.kt @@ -0,0 +1,13 @@ +package com.mitchelbv.thuis_c.network.feyenoord.responses + +import com.google.gson.annotations.SerializedName + + +data class TabItems( + + @SerializedName("CategoryId") var CategoryId: Int? = null, + @SerializedName("TranslationCode") var TranslationCode: String? = null, + @SerializedName("Items") var Items: ArrayList = arrayListOf(), + @SerializedName("TabOrder") var TabOrder: Int? = null + +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/card/Card.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/card/Card.kt new file mode 100644 index 0000000..676e790 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/card/Card.kt @@ -0,0 +1,7 @@ +package com.mitchelbv.thuis_c.ui.card + +data class Card( + val id: Int, + val issuer: String, + val code: String +) diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/card/CardViewModel.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/card/CardViewModel.kt new file mode 100644 index 0000000..81b4349 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/card/CardViewModel.kt @@ -0,0 +1,39 @@ +package com.mitchelbv.thuis_c.ui.card + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.mitchelbv.thuis_c.network.card.CardRetrofitHelper +import com.mitchelbv.thuis_c.network.card.CardService +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch + +data class CardUiState( + val cards: List = listOf() +) + +class CardViewModel : ViewModel() { + private val _uiState = MutableStateFlow(CardUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + fillCards() + } + + private fun fillCards() { + val tempCards = mutableListOf() + viewModelScope.launch { + val cApiClient = CardRetrofitHelper.getInstance().create(CardService::class.java) + val apiResponse = cApiClient.getCards() + for (card in apiResponse.cards) { + tempCards.add(Card( + id = card.id!!, + code = card.code!!, + issuer = card.issuer!! + )) + } + } + _uiState.value = CardUiState(tempCards) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/card/CardsView.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/card/CardsView.kt new file mode 100644 index 0000000..a23f05d --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/card/CardsView.kt @@ -0,0 +1,18 @@ +package com.mitchelbv.thuis_c.ui.card + +import androidx.compose.foundation.layout.Column +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.lifecycle.viewmodel.compose.viewModel + +@Composable +fun CardsScreen(cardViewModel: CardViewModel = viewModel()) { + val cardUiState by cardViewModel.uiState.collectAsState() + Column() { + cardUiState.cards.forEach { + Text(it.issuer) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/FeyenoordView.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/FeyenoordView.kt new file mode 100644 index 0000000..36288a7 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/FeyenoordView.kt @@ -0,0 +1,105 @@ +package com.mitchelbv.thuis_c.ui.feyenoord + +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import coil.compose.AsyncImage +import com.mitchelbv.thuis_c.R + +@Composable +fun FeyenoordScreen(feyenoordViewModel: FeyenoordViewModel = viewModel()) { + val feyenoordUiState by feyenoordViewModel.uiState.collectAsState() + Column( + modifier = Modifier + .verticalScroll(rememberScrollState()) +// .padding(16.dp) + ) { + MatchList(matches = feyenoordUiState.matches, Modifier) + } +} + +@Composable +fun MatchList(matches: List, modifier: Modifier) { + return Column { + matches.forEach { + MatchCard(match = it, modifier) + } + } +} + +@Composable +fun TeamNameWithLogo(team_name: String, team_logo_url: String, modifier: Modifier) { + Column(modifier = modifier.size(128.dp).fillMaxWidth(), Arrangement.Center, Alignment.CenterHorizontally) { + AsyncImage( + model = team_logo_url, + contentDescription = team_name, + placeholder = painterResource(id = R.drawable.ic_launcher_foreground), + contentScale = ContentScale.Fit, + modifier = modifier.size(64.dp) + ) + Text(text = team_name, modifier = modifier.fillMaxWidth().wrapContentWidth(Alignment.CenterHorizontally)) + } + +} + +@Composable +fun MatchCard(match: Match, modifier: Modifier) { + Row( + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + modifier = modifier + .fillMaxWidth() + .padding(8.dp) + .height(128.dp) + ) { + TeamNameWithLogo( + team_name = match.home_team, + team_logo_url = match.home_image, + modifier = modifier + ) + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + ) { + Text(text = match.date, overflow = TextOverflow.Ellipsis) + Row { + Text(match.begin_time) + Text(" - ") + Text(match.end_time) + } + } + TeamNameWithLogo( + team_name = match.away_team, + team_logo_url = match.away_image, + modifier = modifier + ) + + } +} + +@Preview(showBackground = true) +@Composable +fun PreviewMatchCard() { + val test = Match( + home_image = "https://tymes4-cdn.azureedge.net/feyenoord/21-feyenoord-logo-original.png", + away_image = "https://tymes4-cdn.azureedge.net/feyenoord/291-S.S._Lazio_badge.svg-min-original.png", + home_team = "Feyenoord Vrouwen 1", + away_team = "FC Twente Vrouwen 1", + date = "do 03 November 2023", + begin_time = "18:03", + end_time = "20:03" + ) + MatchCard(match = test, Modifier) +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/FeyenoordViewModel.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/FeyenoordViewModel.kt new file mode 100644 index 0000000..3940fbb --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/FeyenoordViewModel.kt @@ -0,0 +1,57 @@ +package com.mitchelbv.thuis_c.ui.feyenoord + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.mitchelbv.thuis_c.network.feyenoord.FeyenoordRetrofitHelper +import com.mitchelbv.thuis_c.network.feyenoord.FeyenoordService +import com.mitchelbv.thuis_c.network.feyenoord.responses.FeyenoordEventResponse +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import okhttp3.ResponseBody +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +data class FeyenoordUiState( + val matches: List = listOf() +) + +class FeyenoordViewModel : ViewModel() { + private val _uiState = MutableStateFlow(FeyenoordUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + fillMatches() + } + + private fun fillMatches() { + // TODO Get data from the internet + val tempMatches = mutableListOf() + viewModelScope.launch(Dispatchers.IO) { + val fApiClient = + FeyenoordRetrofitHelper.getInstance().create(FeyenoordService::class.java) + val apiResponse = fApiClient.getEvents() + for (tabItem in apiResponse.TabItems) { + val test = arrayOf(tabItem).filter { it.CategoryId == 2 } + test.forEach { + for (item in it.Items) { + tempMatches.add(Match( + home_team = item.NameHomeTeam!!, + away_team = item.NameAwayTeam!!, + date = item.EventStartDateTimeFormatted?.Full!!, + begin_time = item.EventStartDateTimeFormatted?.Time!!, + end_time = item.EventEndDateTimeFormatted?.Time!!, + away_image = item.AwayImageUrl!!, + home_image = item.HomeImageUrl!! + )) + } + } + } + _uiState.value = FeyenoordUiState(matches = tempMatches) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/Match.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/Match.kt new file mode 100644 index 0000000..5326a4c --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/feyenoord/Match.kt @@ -0,0 +1,11 @@ +package com.mitchelbv.thuis_c.ui.feyenoord + +data class Match( + val home_image: String, + val away_image: String, + val home_team: String, + val away_team: String, + val date: String, + val begin_time: String, + val end_time: String +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/home/Home.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/home/Home.kt new file mode 100644 index 0000000..4bb0c72 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/home/Home.kt @@ -0,0 +1,9 @@ +package com.mitchelbv.thuis_c.ui.home + +import androidx.compose.material.Text +import androidx.compose.runtime.Composable + +@Composable +fun HomeScreen() { + return Text(text = "Hello!") +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Color.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Color.kt new file mode 100644 index 0000000..f7eb5ab --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Color.kt @@ -0,0 +1,8 @@ +package com.mitchelbv.thuis_c.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple200 = Color(0xFFBB86FC) +val Purple500 = Color(0xFF6200EE) +val Purple700 = Color(0xFF3700B3) +val Teal200 = Color(0xFF03DAC5) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Shape.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Shape.kt new file mode 100644 index 0000000..19fbbd4 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Shape.kt @@ -0,0 +1,11 @@ +package com.mitchelbv.thuis_c.ui.theme + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Shapes +import androidx.compose.ui.unit.dp + +val Shapes = Shapes( + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(4.dp), + large = RoundedCornerShape(0.dp) +) \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Theme.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Theme.kt new file mode 100644 index 0000000..6173cf2 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Theme.kt @@ -0,0 +1,44 @@ +package com.mitchelbv.thuis_c.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material.MaterialTheme +import androidx.compose.material.darkColors +import androidx.compose.material.lightColors +import androidx.compose.runtime.Composable + +private val DarkColorPalette = darkColors( + primary = Purple200, + primaryVariant = Purple700, + secondary = Teal200 +) + +private val LightColorPalette = lightColors( + primary = Purple500, + primaryVariant = Purple700, + secondary = Teal200 + + /* Other default colors to override + background = Color.White, + surface = Color.White, + onPrimary = Color.White, + onSecondary = Color.Black, + onBackground = Color.Black, + onSurface = Color.Black, + */ +) + +@Composable +fun ThuisTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) { + val colors = if (darkTheme) { + DarkColorPalette + } else { + LightColorPalette + } + + MaterialTheme( + colors = colors, + typography = Typography, + shapes = Shapes, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Type.kt b/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Type.kt new file mode 100644 index 0000000..d921df5 --- /dev/null +++ b/app/src/main/java/com/mitchelbv/thuis_c/ui/theme/Type.kt @@ -0,0 +1,28 @@ +package com.mitchelbv.thuis_c.ui.theme + +import androidx.compose.material.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + body1 = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp + ) + /* Other default text styles to override + button = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.W500, + fontSize = 14.sp + ), + caption = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 12.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/feyenoord.png b/app/src/main/res/drawable-v24/feyenoord.png new file mode 100644 index 0000000..781f21f Binary files /dev/null and b/app/src/main/res/drawable-v24/feyenoord.png differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..0b23659 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Thuis + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..28473d1 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/mitchelbv/thuis_c/ExampleUnitTest.kt b/app/src/test/java/com/mitchelbv/thuis_c/ExampleUnitTest.kt new file mode 100644 index 0000000..032f05f --- /dev/null +++ b/app/src/test/java/com/mitchelbv/thuis_c/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.mitchelbv.thuis_c + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..526338f --- /dev/null +++ b/build.gradle @@ -0,0 +1,10 @@ +buildscript { + ext { + compose_ui_version = '1.2.1' + } +}// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.6.10' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..6a46c26 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Oct 31 14:59:45 CET 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b4e74e5 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "Thuis" +include ':app'