diff --git a/app/build.gradle b/app/build.gradle index 071383154..2195d43bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,9 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + buildFeatures { + dataBinding true + } } buildTypes { @@ -24,14 +26,46 @@ android { } } +configurations { + ktlint +} + dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - // Android Support + // Support implementation 'androidx.core:core-ktx:1.3.1' implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1' + + // Navigation + def navigationVersion = "2.3.0" + implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion" + implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion" + + // Lifecycle + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + // Lint + ktlint "com.pinterest:ktlint:0.37.2" +} + +task ktlint(type: JavaExec, group: "verification") { + description = "Check Kotlin code style." + main = "com.pinterest.ktlint.Main" + classpath = configurations.ktlint + + args "src/**/*.kt" +} +check.dependsOn ktlint + +task ktlintFormat(type: JavaExec, group: "formatting") { + description = "Fix Kotlin code style deviations." + main = "com.pinterest.ktlint.Main" + classpath = configurations.ktlint + + args "-F", "src/**/*.kt" } \ No newline at end of file diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt index b75ada303..2810d5800 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt @@ -1,12 +1,15 @@ package org.oxycblt.auxio -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.util.Log +import androidx.appcompat.app.AppCompatActivity class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + + Log.d(this::class.simpleName, "Activity Created.") } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/oxycblt/auxio/player/PlayerFragment.kt b/app/src/main/java/org/oxycblt/auxio/player/PlayerFragment.kt new file mode 100644 index 000000000..60a33f92e --- /dev/null +++ b/app/src/main/java/org/oxycblt/auxio/player/PlayerFragment.kt @@ -0,0 +1,29 @@ +package org.oxycblt.auxio.player + +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.databinding.DataBindingUtil +import androidx.fragment.app.Fragment +import org.oxycblt.auxio.R +import org.oxycblt.auxio.databinding.FragmentPlayerBinding + +class PlayerFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + val binding = DataBindingUtil.inflate( + inflater, R.layout.fragment_player, container, false + ) + + Log.d(this::class.simpleName, "Fragment created.") + + return binding.root + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7e112c3ee..43c1da2d3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,10 +1,24 @@ - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml new file mode 100644 index 000000000..78e83e1c4 --- /dev/null +++ b/app/src/main/res/layout/fragment_player.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml new file mode 100644 index 000000000..d2dede716 --- /dev/null +++ b/app/src/main/res/navigation/nav_main.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a7dced5c8..12077a998 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,11 @@ + - #0d5af5 - #6b86ff - #0032c1 - #212121 - #484848 - #000000 - #ffffff - #ffffff + #0d5af5 + #6b86ff + #0032c1 + #212121 + #484848 + #000000 + #ffffff + #ffffff \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 503624f96..90d38aa3d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ + Auxio \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b52dd930b..42e367e8c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,3 +1,4 @@ +