Skip to content

Commit 29ca9e2

Browse files
committed
Move to MPP
Signed-off-by: singleNeuron <Cryolitia@gmail.com>
1 parent c348b72 commit 29ca9e2

File tree

127 files changed

+1171
-1176
lines changed

Some content is hidden

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

127 files changed

+1171
-1176
lines changed

.run/MaiTungTMUI_MaiTungTMUI.run.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

FerredoxinUILib/build.gradle

Lines changed: 0 additions & 41 deletions
This file was deleted.

FerredoxinUILib/src/main/AndroidManifest.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

FerredoxinUILib/src/main/java/org/ferredoxin/ferredoxin_ui/base/TitleAble.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

LICENSE.md

Lines changed: 0 additions & 758 deletions
This file was deleted.

android/build.gradle.kts

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
plugins {
2+
id("com.android.application")
3+
kotlin("android")
4+
id("org.jetbrains.compose")
5+
}
6+
7+
group = "org.ferredoxin.ferredoxinui"
8+
version = "1.0"
9+
10+
dependencies {
11+
implementation(project(":common"))
12+
implementation(project(":qnotified_style"))
13+
}
14+
15+
android {
16+
compileSdk = 31
17+
defaultConfig {
18+
applicationId = "org.ferredoxin.ferredoxinui.android"
19+
minSdk = 21
20+
targetSdk = 31
21+
versionCode = 1
22+
versionName = "0.1"
23+
}
24+
buildTypes {
25+
getByName("release") {
26+
isMinifyEnabled = false
27+
}
28+
}
29+
buildFeatures {
30+
viewBinding = true
31+
}
32+
lint {
33+
isCheckDependencies = true
34+
}
35+
compileOptions {
36+
sourceCompatibility(java_version)
37+
targetCompatibility(java_version)
38+
}
39+
kotlinOptions {
40+
jvmTarget = java_version.majorVersion
41+
}
42+
namespace = "org.ferredoxin.ferredoxinui.android"
43+
}
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.ferredoxin.ferredoxin_ui.demo">
3+
xmlns:tools="http://schemas.android.com/tools">
44

55
<application
6-
android:allowBackup="true"
7-
android:label="@string/app_name"
86
android:supportsRtl="true"
9-
android:theme="@style/Theme.MaiTungTMUI">
10-
11-
<activity android:name=".activity.MainActivity">
7+
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
8+
tools:targetApi="s">
9+
<activity
10+
android:name=".activity.MainActivity"
11+
android:exported="true">
1212
<intent-filter>
1313
<action android:name="android.intent.action.MAIN" />
1414
<category android:name="android.intent.category.LAUNCHER" />
1515
</intent-filter>
1616
</activity>
17-
1817
</application>
19-
20-
</manifest>
18+
</manifest>

demo/src/main/java/org/ferredoxin/ferredoxin_ui/demo/UiTable.kt renamed to android/src/main/java/org/ferredoxin/ferredoxinui/android/UiTable.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package org.ferredoxin.ferredoxin_ui.demo
1+
package org.ferredoxin.ferredoxinui.android
22

3-
import org.ferredoxin.ferredoxin_ui.base.*
4-
import org.ferredoxin.ferredoxin_ui.demo.fragment.DemoFragment
5-
import org.ferredoxin.ferredoxin_ui.demo.fragment.DemoViewPagerFragment
3+
import org.ferredoxin.ferredoxinui.android.fragment.DemoAbout
4+
import org.ferredoxin.ferredoxinui.android.fragment.DemoFragment
5+
import org.ferredoxin.ferredoxinui.android.fragment.DemoViewPagerFragment
6+
import org.ferredoxin.ferredoxinui.common.base.*
67

78
object UiTable : UiScreen {
89
override var name: String = "QNotified"
@@ -50,6 +51,7 @@ object UiTable : UiScreen {
5051
},
5152
uiClickableItem {
5253
title = "关于"
54+
onClickListener = ClickToNewSetting(DemoAbout)
5355
}
5456
)
5557
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.ferredoxin.ferredoxinui.android.activity
2+
3+
import androidx.fragment.app.Fragment
4+
import org.ferredoxin.ferredoxinui.android.UiTable
5+
import org.ferredoxin.ferredoxinui.common.base.TitleAble
6+
import org.ferredoxin.ferredoxinui.qnotified_style.activity.MaiTungTMStyleActivity
7+
import org.ferredoxin.ferredoxinui.qnotified_style.fragment.MaiTungTMSettingFragment
8+
9+
class MainActivity<T> : MaiTungTMStyleActivity<T>() where T : Fragment, T : TitleAble {
10+
11+
override val fragment: T = MaiTungTMSettingFragment().setUiScreen(UiTable) as T
12+
13+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.ferredoxin.ferredoxinui.android.fragment
2+
3+
import org.ferredoxin.ferredoxinui.common.base.*
4+
import org.ferredoxin.ferredoxinui.qnotified_style.R
5+
6+
val DemoAbout: UiScreen = uiScreen {
7+
name = "关于"
8+
contains = linkedMapOf(uiAboutItem {
9+
title = "Ferredoxin UI——QNotified Style demo"
10+
icon = {
11+
it.getDrawable(R.mipmap.ic_launcher_demo)!!
12+
}
13+
}, uiCategory {
14+
noTitle = true
15+
contains = linkedMapOf(uiClickableItem {
16+
title = "用户协议"
17+
}, uiClickableItem {
18+
title = "隐私条款"
19+
}, uiClickableItem {
20+
title = "模块版本"
21+
clickAble = false
22+
subSummary = "0.8.10.260.badce21"
23+
}, uiClickableItem {
24+
title = "QQ版本"
25+
clickAble = false
26+
subSummary = "8.5.5(1630)"
27+
}, uiClickableItem {
28+
title = "检查更新"
29+
})
30+
})
31+
}.second

0 commit comments

Comments
 (0)