Skip to content

Commit

Permalink
added package to manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
lalwani committed May 31, 2024
1 parent 3a9dd33 commit 6e5404e
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 38 deletions.
18 changes: 1 addition & 17 deletions authentication/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

/*
* Copyright (C) 2024. Uber Technologies
*
* 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
*
* http://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.
*/

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -78,4 +62,4 @@ dependencies {
testImplementation(libs.kotlin.coroutines.test)
androidTestImplementation(libs.androidx.test.ext.junit)
androidTestImplementation(libs.androidx.test.espresso.espresso.core)
}
}
2 changes: 0 additions & 2 deletions authentication/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ POM_NAME=Uber Authentication SDK (Android)
POM_ARTIFACT_ID=authentication
POM_PACKAGING=aar
POM_DESCRIPTION=The official Uber Core Android SDK.
version=2.0.3-SNAPSHOT
VERSION_NAME=2.0.3-SNAPSHOT
7 changes: 6 additions & 1 deletion authentication/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,24 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.uber.sdk2.auth">

<uses-permission android:name="android.permission.INTERNET" />

<queries>
<package android:name="com.ubercab" />

<package android:name="com.ubercab.presidio.exo" />
<package android:name="com.ubercab.presidio.development" />
<package android:name="com.ubercab.rider.internal" />
<package android:name="com.ubercab.driver" />
<package android:name="com.ubercab.driver.internal" />
<package android:name="com.ubercab.driver.debug" />
<package android:name="com.ubercab.driver.exo" />
<package android:name="com.ubercab.eats" />
<package android:name="com.ubercab.eats.exo" />
<package android:name="com.ubercab.eats.debug" />
<package android:name="com.ubercab.eats.internal" />
<intent>
<action android:name="android.support.customtabs.action.CustomTabsService" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ sealed class CrossApp(val packages: List<String>) : Parcelable {
companion object {
/** The list of all driver apps. */
private val DRIVER_APPS =
listOf("com.ubercab.driver", "com.ubercab.driver.exo", "com.ubercab.driver.internal")
listOf("com.ubercab.driver", "com.ubercab.driver.exo", "com.ubercab.driver.internal", "com.ubercab.driver.debug")

/** The list of all rider apps. */
private val RIDER_APPS =
listOf("com.ubercab", "com.ubercab.presidio.exo", "com.ubercab.rider.internal")
listOf("com.ubercab", "com.ubercab.presidio.exo", "com.ubercab.rider.internal", "com.ubercab.presidio.development")

/** The list of all Eats apps. */
private val EATS_APPS =
listOf("com.ubercab.eats", "com.ubercab.eats.exo", "com.ubercab.eats.internal")
listOf("com.ubercab.eats", "com.ubercab.eats.exo", "com.ubercab.eats.internal", "com.ubercab.eats.debug")
}
}
5 changes: 4 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import com.diffplug.gradle.spotless.SpotlessExtension
import com.diffplug.gradle.spotless.SpotlessExtensionPredeclare
import com.diffplug.spotless.LineEnding
import com.vanniktech.maven.publish.MavenPublishBaseExtension
import java.net.URI
import org.jetbrains.dokka.gradle.DokkaTaskPartial
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import java.net.URI

plugins {
alias(libs.plugins.kotlin.android) apply false
Expand All @@ -52,6 +52,9 @@ tasks.dokkaHtmlMultiModule {

val ktfmtVersion = libs.versions.ktfmt.get()

group = "com.github.lalwani"
version = "2.0.5"

allprojects {
apply(plugin = "com.diffplug.spotless")
val spotlessFormatters: SpotlessExtension.() -> Unit = {
Expand Down
2 changes: 0 additions & 2 deletions core/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ POM_NAME=Uber Authentication SDK (Android)
POM_ARTIFACT_ID=core
POM_PACKAGING=aar
POM_DESCRIPTION=The official Uber Core Android SDK.
version=2.0.3-SNAPSHOT
VERSION_NAME=2.0.3-SNAPSHOT
3 changes: 2 additions & 1 deletion core/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.uber.sdk2.core">

</manifest>
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Wed, 16 Aug 2023 23:45:52 -0700
GROUP=com.uber.sdk
GROUP=com.uber.sdk2

#Version is managed by Gradle Release Plugin
version=0.10.11-SNAPSHOT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
Expand Down Expand Up @@ -162,14 +164,24 @@ fun AuthScreen(

Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
ExposedDropdownMenuBox(expanded = expanded, onExpandedChange = { expanded = !expanded }) {
TextField(
value = selectedOptionText,
onValueChange = {},
label = { Text("Selected Option") },
modifier = Modifier.fillMaxWidth().menuAnchor(),
readOnly = true,
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
)
Box(
modifier = Modifier
.fillMaxWidth()
.clickable { expanded = true }
.menuAnchor()
.padding(16.dp) // Optional: padding for better touch target
) {
TextField(
value = selectedOptionText,
onValueChange = {},
label = { Text("Selected Option") },
modifier = Modifier.fillMaxWidth(),
readOnly = true,
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
singleLine = true,
enabled = false // Disable the TextField to prevent keyboard
)
}

ExposedDropdownMenu(
expanded = expanded,
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {
google()
mavenCentral()
gradlePluginPortal()
maven { url = uri("https://plugins.gradle.org/m2/") }
maven { url = uri("https://jitpack.io") }
}
resolutionStrategy {
eachPlugin {
Expand All @@ -34,7 +34,7 @@ dependencyResolutionManagement {
google()
mavenCentral()
gradlePluginPortal()
maven { url = uri("https://plugins.gradle.org/m2/") }
maven { url = uri("https://jitpack.io") }
}
}

Expand Down

0 comments on commit 6e5404e

Please sign in to comment.