Skip to content

Commit 26298bb

Browse files
saulhdevsaulhdev
committed
Merge remote-tracking branch 'origin/A16' into A16
2 parents 4b60737 + e82c9c2 commit 26298bb

29 files changed

Lines changed: 200 additions & 153 deletions

File tree

‎.forgejo/ISSUE_TEMPLATE/roadmap_idea.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Roadmap proposal
2+
description: Suggest a new roadmap item
3+
title: "[Roadmap] <short title>"
4+
labels:
5+
- roadmap
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: "## Summary\nBriefly describe the initiative and who benefits."
10+
- type: textarea
11+
id: problem
12+
attributes:
13+
label: "Problem/Related Issue"
14+
description: "What problem or opportunity does this address? Link of the related issue."
15+
- type: textarea
16+
id: approach
17+
attributes:
18+
label: "Approach"
19+
description: "High-level idea of how to solve it."
20+
- type: textarea
21+
id: milestones
22+
attributes:
23+
label: "Milestones"
24+
description: "e.g. expected release version"
25+
- type: textarea
26+
id: risks
27+
attributes:
28+
label: "Risks / Dependencies"
29+
description: "Key risks, unknowns, and dependencies."

‎Omega/src/com/neoapps/neolauncher/NeoApp.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import com.neoapps.neolauncher.preferences.NeoPrefs
3434
import com.neoapps.neolauncher.preferences.NeoPrefs.Companion.prefsModule
3535
import com.neoapps.neolauncher.theme.ThemeManager
3636
import com.neoapps.neolauncher.util.minSDK
37-
import org.chickenhook.restrictionbypass.Unseal
37+
//import org.chickenhook.restrictionbypass.Unseal
3838
import org.koin.android.ext.koin.androidContext
3939
import org.koin.android.ext.koin.androidLogger
4040
import org.koin.core.context.GlobalContext.startKoin
@@ -61,7 +61,7 @@ class NeoApp : Application() {
6161
}
6262
if (minSDK(Build.VERSION_CODES.P)) {
6363
try {
64-
Unseal.unseal()
64+
//Unseal.unseal()
6565
Log.i(TAG, "Unseal success!")
6666
} catch (e: Exception) {
6767
Log.e(TAG, "Unseal fail!")

‎Omega/src/com/neoapps/neolauncher/compose/components/ListItemWithIcon.kt‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import androidx.compose.material3.Text
3434
import androidx.compose.runtime.Composable
3535
import androidx.compose.ui.Modifier
3636
import androidx.compose.ui.draw.clip
37+
import androidx.compose.ui.graphics.Color
3738
import androidx.compose.ui.tooling.preview.Preview
3839
import androidx.compose.ui.unit.dp
3940
import com.neoapps.neolauncher.compose.icons.Phosphor
@@ -45,6 +46,7 @@ fun ListItemWithIcon(
4546
modifier: Modifier = Modifier,
4647
title: String,
4748
summary: String = "",
49+
containerColor: Color = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.12f),
4850
index: Int = 0,
4951
groupSize: Int = 1,
5052
startIcon: (@Composable () -> Unit)? = null,
@@ -70,7 +72,7 @@ fun ListItemWithIcon(
7072
},
7173
trailingContent = endCheckbox?.apply {} ?: {},
7274
colors = ListItemDefaults.colors(
73-
MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.12f)
75+
containerColor = containerColor
7476
)
7577
)
7678
}
@@ -79,32 +81,32 @@ fun ListItemWithIcon(
7981
@Composable
8082
fun PreviewListItemWithIcon() {
8183
Column {
82-
ListItemWithIcon(
83-
title = "System Iconpack",
84-
modifier = Modifier.clickable { },
85-
summary = "com.neoapps.neolauncher",
86-
startIcon = {
87-
Image(
88-
Phosphor.BracketsCurly,
89-
contentDescription = null,
90-
modifier = Modifier
91-
.clip(CircleShape)
92-
.size(40.dp)
93-
.background(
94-
MaterialTheme.colorScheme.onBackground.copy(alpha = 0.45F)
95-
)
96-
)
84+
ListItemWithIcon(
85+
title = "System Iconpack",
86+
modifier = Modifier.clickable { },
87+
summary = "com.neoapps.neolauncher",
88+
startIcon = {
89+
Image(
90+
Phosphor.BracketsCurly,
91+
contentDescription = null,
92+
modifier = Modifier
93+
.clip(CircleShape)
94+
.size(40.dp)
95+
.background(
96+
MaterialTheme.colorScheme.onBackground.copy(alpha = 0.45F)
97+
)
98+
)
9799

98-
},
99-
endCheckbox = {
100-
RadioButton(
101-
selected = false,
102-
onClick = null
103-
)
104-
},
105-
index = 0,
106-
groupSize = 2
107-
)
100+
},
101+
endCheckbox = {
102+
RadioButton(
103+
selected = false,
104+
onClick = null
105+
)
106+
},
107+
index = 0,
108+
groupSize = 2
109+
)
108110
Spacer(modifier = Modifier.height(2.dp))
109111
ListItemWithIcon(
110112
title = "System Iconpack",

‎Omega/src/com/neoapps/neolauncher/compose/pages/preferences/SearchPrefsPage.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fun SearchPrefsPage() {
5959
val searchPrefs = listOf(
6060
prefs.searchDrawerEnabled,
6161
prefs.searchFuzzy,
62-
//prefs.searchProvidersEdit,
62+
prefs.searchProvidersEdit,
6363
prefs.searchHiddenApps
6464
)
6565
val feedPrefs = listOf(

‎Omega/src/com/neoapps/neolauncher/compose/pages/preferences/SearchProvidersPage.kt‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,24 @@
1717
*/
1818
package com.neoapps.neolauncher.compose.pages.preferences
1919

20+
import androidx.compose.animation.animateColorAsState
21+
import androidx.compose.animation.core.animateDpAsState
2022
import androidx.compose.foundation.ExperimentalFoundationApi
23+
import androidx.compose.foundation.Image
24+
import androidx.compose.foundation.combinedClickable
25+
import androidx.compose.foundation.layout.Arrangement
26+
import androidx.compose.foundation.layout.PaddingValues
27+
import androidx.compose.foundation.layout.Spacer
28+
import androidx.compose.foundation.layout.fillMaxSize
29+
import androidx.compose.foundation.layout.height
30+
import androidx.compose.foundation.layout.padding
31+
import androidx.compose.foundation.layout.size
32+
import androidx.compose.foundation.lazy.LazyColumn
33+
import androidx.compose.foundation.lazy.itemsIndexed
2134
import androidx.compose.foundation.lazy.rememberLazyListState
2235
import androidx.compose.material3.ExtendedFloatingActionButton
2336
import androidx.compose.material3.Icon
37+
import androidx.compose.material3.IconButton
2438
import androidx.compose.material3.MaterialTheme
2539
import androidx.compose.material3.Text
2640
import androidx.compose.runtime.Composable
@@ -32,18 +46,26 @@ import androidx.compose.runtime.mutableStateOf
3246
import androidx.compose.runtime.remember
3347
import androidx.compose.runtime.rememberCoroutineScope
3448
import androidx.compose.runtime.setValue
49+
import androidx.compose.ui.Modifier
50+
import androidx.compose.ui.draw.clip
51+
import androidx.compose.ui.draw.shadow
3552
import androidx.compose.ui.platform.LocalContext
53+
import androidx.compose.ui.res.painterResource
3654
import androidx.compose.ui.res.stringResource
55+
import androidx.compose.ui.unit.dp
3756
import com.android.launcher3.R
3857
import com.neoapps.neolauncher.compose.components.BaseDialog
58+
import com.neoapps.neolauncher.compose.components.ListItemWithIcon
3959
import com.neoapps.neolauncher.compose.components.ViewWithActionBar
4060
import com.neoapps.neolauncher.compose.components.move
4161
import com.neoapps.neolauncher.compose.icons.Phosphor
4262
import com.neoapps.neolauncher.compose.icons.phosphor.Plus
4363
import com.neoapps.neolauncher.data.SearchProviderRepository
4464
import com.neoapps.neolauncher.preferences.NeoPrefs
65+
import com.neoapps.neolauncher.theme.GroupItemShape
4566
import kotlinx.coroutines.launch
4667
import org.koin.java.KoinJavaComponent.getKoin
68+
import sh.calvin.reorderable.ReorderableItem
4769
import sh.calvin.reorderable.rememberReorderableLazyListState
4870

4971
@OptIn(ExperimentalFoundationApi::class)
@@ -102,7 +124,7 @@ fun SearchProvidersPage() {
102124
)
103125
}
104126
) { paddingValues ->
105-
/*LazyColumn(
127+
LazyColumn(
106128
verticalArrangement = Arrangement.spacedBy(4.dp),
107129
modifier = Modifier
108130
.fillMaxSize()
@@ -164,12 +186,14 @@ fun SearchProvidersPage() {
164186
}
165187
) {
166188
Image(
167-
painter = painterResource(id = R.drawable.ic_plus),
189+
painter = painterResource(id = R.drawable.ic_rows),
168190
contentDescription = null,
169191
modifier = Modifier.size(24.dp)
170192
)
171193
}
172194
},
195+
index = subIndex,
196+
groupSize = enabledItems.size
173197
)
174198
}
175199
}
@@ -208,13 +232,15 @@ fun SearchProvidersPage() {
208232
endCheckbox = {
209233
Spacer(modifier = Modifier.height(32.dp))
210234
},
235+
index = subIndex,
236+
groupSize = disabledItems.size
211237
)
212238
}
213239

214240
item {
215241
Spacer(modifier = Modifier.height(8.dp))
216242
}
217-
}*/
243+
}
218244
}
219245

220246
if (openDialog.value) {

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
[<img src="get_codeberg.svg" alt="Get it on Codeberg" width="24%" align="center">](https://codeberg.org/NeoApplications/Neo-Launcher/releases)
2929
[<img src="get_github.svg" alt="Get it on GitHub" width="24%" align="center">](https://github.com/NeoApplications/Neo-Launcher/releases)
3030

31+
> [!IMPORTANT]
32+
> **This project is not abandoned.** It's just that we (Saul and Antonios) both faced couple of barriers on private life level and technically (on AOSP's side). But the A16-based version is in progress.
33+
3134
[![Neo Applications Banner](neo_banner.png)](https://github.com/NeoApplications)
3235

3336
## Community :speech_balloon:

‎build.gradle.kts‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,15 @@ configurations.all {
7171
}
7272
}
7373

74+
ksp {
75+
arg("room.schemaLocation", "$projectDir/schemas")
76+
arg("room.incremental", "true")
77+
}
78+
79+
kotlin {
80+
jvmToolchain(21)
81+
}
82+
7483
android {
7584
namespace = "com.android.launcher3"
7685
compileSdk = 36
@@ -81,14 +90,6 @@ android {
8190
applicationId = "com.saggitt.omega"
8291
javaCompileOptions.annotationProcessorOptions.arguments["dagger.hilt.disableModulesHaveInstallInCheck"] =
8392
"true"
84-
javaCompileOptions {
85-
annotationProcessorOptions {
86-
ksp {
87-
arg("room.schemaLocation", "$projectDir/schemas")
88-
arg("room.incremental", "true")
89-
}
90-
}
91-
}
9293
versionName = "1.0.1"
9394
versionCode = 1006
9495
buildConfigField("String", "BUILD_DATE", "\"${getBuildDate()}\"")
@@ -171,11 +172,6 @@ android {
171172
aidl = true
172173
}
173174

174-
compileOptions {
175-
sourceCompatibility = JavaVersion.VERSION_21
176-
targetCompatibility = JavaVersion.VERSION_21
177-
}
178-
179175
packaging {
180176
jniLibs {
181177
pickFirsts += listOf("**/libeasyBypass.so")
@@ -289,7 +285,6 @@ dependencies {
289285
implementation(libs.guava)
290286
implementation(libs.hilt.compiler)
291287
ksp(libs.hilt.android)
292-
implementation(libs.hoko.blur)
293288
implementation(libs.koin.android)
294289
implementation(libs.koin.annotations)
295290
implementation(libs.kotlin.stdlib) {
@@ -310,7 +305,7 @@ dependencies {
310305
implementation(libs.palette.ktx)
311306
implementation(libs.preference.ktx)
312307
implementation(libs.protobuf.javalite)
313-
implementation(libs.restriction.bypass)
308+
//implementation(libs.restriction.bypass)
314309
implementation(libs.recyclerview)
315310
implementation(libs.room.runtime)
316311
implementation(libs.room.ktx)

‎compatLib/build.gradle.kts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ plugins {
44
alias(libs.plugins.android.library)
55
}
66

7+
kotlin {
8+
jvmToolchain(21)
9+
}
10+
711
android {
812
compileSdk = 36
913
namespace = "app.lawnchair.compatlib"
@@ -31,11 +35,6 @@ android {
3135
}
3236
}
3337

34-
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_21
36-
targetCompatibility = JavaVersion.VERSION_21
37-
}
38-
3938
buildFeatures {
4039
aidl = true
4140
}

‎compatLib/compatLibVQ/build.gradle.kts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ plugins {
44
alias(libs.plugins.android.library)
55
}
66

7+
kotlin {
8+
jvmToolchain(21)
9+
}
10+
711
android {
812
compileSdk = 36
913
namespace = "app.lawnchair.compatlib.ten"
@@ -29,11 +33,6 @@ android {
2933
release {
3034
}
3135
}
32-
compileOptions {
33-
sourceCompatibility = JavaVersion.VERSION_21
34-
targetCompatibility = JavaVersion.VERSION_21
35-
}
36-
3736
}
3837

3938
val FRAMEWORK_PREBUILTS_DIR = "$rootDir/prebuilt/libs"

‎compatLib/compatLibVR/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ plugins {
44
alias(libs.plugins.android.library)
55
}
66

7+
kotlin {
8+
jvmToolchain(21)
9+
}
10+
711
android {
812
compileSdk = 36
913
namespace = "app.lawnchair.compatlib.eleven"
@@ -29,10 +33,6 @@ android {
2933
release {
3034
}
3135
}
32-
compileOptions {
33-
sourceCompatibility = JavaVersion.VERSION_21
34-
targetCompatibility = JavaVersion.VERSION_21
35-
}
3636
}
3737

3838
val FRAMEWORK_PREBUILTS_DIR = "$rootDir/prebuilt/libs"

0 commit comments

Comments
 (0)