Skip to content

Commit b3f7ba9

Browse files
committed
Compose desktop support
1 parent b7962d0 commit b3f7ba9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+967
-732
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/.idea/workspace.xml
88
/.idea/navEditor.xml
99
/.idea/assetWizardSettings.xml
10+
.idea/artifacts/
1011
.idea/deploymentTargetDropDown.xml
1112
.DS_Store
1213
/build

.idea/.name

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

android/build.gradle.kts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import org.jetbrains.compose.compose
2+
3+
plugins {
4+
id("org.jetbrains.compose")
5+
id("com.android.application")
6+
kotlin("android")
7+
}
8+
9+
dependencies {
10+
implementation(project(":reorderable"))
11+
implementation(compose.runtime)
12+
implementation(compose.material)
13+
implementation("androidx.activity:activity-compose:1.3.1")
14+
implementation("com.google.android.material:material:1.4.0")
15+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
16+
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07")
17+
}
18+
19+
android {
20+
compileSdk = rootProject.extra.get("compileSdk") as Int
21+
defaultConfig {
22+
minSdk = rootProject.extra.get("minVersion") as Int
23+
targetSdk = rootProject.extra.get("targetSdk") as Int
24+
versionCode = 1
25+
versionName = "1.0"
26+
}
27+
28+
compileOptions {
29+
sourceCompatibility = JavaVersion.VERSION_1_8
30+
targetCompatibility = JavaVersion.VERSION_1_8
31+
}
32+
33+
kotlinOptions {
34+
jvmTarget = "1.8"
35+
}
36+
}

android/src/main/AndroidManifest.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.burnoutcrew.android">
3+
<application
4+
android:icon="@mipmap/ic_launcher"
5+
android:label="@string/app_name"
6+
android:roundIcon="@mipmap/ic_launcher_round"
7+
android:supportsRtl="true"
8+
android:theme="@style/Theme.LazyReorderList">
9+
<activity android:name=".ui.MainActivity">
10+
<intent-filter>
11+
<action android:name="android.intent.action.MAIN"/>
12+
<category android:name="android.intent.category.LAUNCHER"/>
13+
</intent-filter>
14+
</activity>
15+
</application>
16+
</manifest>

app/src/main/kotlin/io/burnoutcrew/lazyreorderlist/ui/MainActivity.kt renamed to android/src/main/kotlin/org/burnoutcrew/android/ui/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.burnoutcrew.lazyreorderlist.ui
16+
package org.burnoutcrew.android.ui
1717

1818
import android.os.Bundle
1919
import androidx.activity.ComponentActivity

app/src/main/kotlin/io/burnoutcrew/lazyreorderlist/ui/Root.kt renamed to android/src/main/kotlin/org/burnoutcrew/android/ui/Root.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.burnoutcrew.lazyreorderlist.ui
16+
package org.burnoutcrew.android.ui
1717

1818
import androidx.compose.material.Scaffold
1919
import androidx.compose.material.Text
2020
import androidx.compose.material.TopAppBar
2121
import androidx.compose.runtime.Composable
2222
import androidx.compose.ui.res.stringResource
23-
import io.burnoutcrew.lazyreorderlist.R
24-
import io.burnoutcrew.lazyreorderlist.ui.reorderlist.ReorderList
25-
import io.burnoutcrew.lazyreorderlist.ui.theme.ReorderListTheme
23+
import org.burnoutcrew.android.R
24+
import org.burnoutcrew.android.ui.reorderlist.ReorderList
25+
import org.burnoutcrew.android.ui.theme.ReorderListTheme
2626

2727
@Composable
2828
fun Root() {

0 commit comments

Comments
 (0)