Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6d86417 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3794-main-prebuilt' into 'main' 

Move to a single branch for all android versions

See merge request !40
parents b8f9a7c0 bce59ad3

.gitlab-ci.yml

+29 −7
Original line number Diff line number Diff line 
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"



stages:

  - auto-merge-main

  - build

  - update-from-upstream



include:

  - project: 'e/templates'

    ref: master

    file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml'

  - project: 'e/templates'

    ref: master

    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
 
  - project: "e/templates"

    ref: main

    file: "/.gitlab/gitlab-ci/gitlab-ci-import-updates-from-upstream.yml"



main:

  extends: .update-from-upstream

  variables:

    UPSTREAM_BRANCH: lineage-23.0

    LOCAL_BRANCH: main



before_script:

  - export GRADLE_USER_HOME=$(pwd)/.gradle

  - chmod +x ./gradlew



cache:

  key: ${CI_PROJECT_ID}

  paths:

    - .gradle/



build:

  stage: build

  script:

    - ./gradlew assemble

  artifacts:

    paths:

      - app/build/outputs/apk

app/build.gradle.kts

+14 −2
Original line number Diff line number Diff line
@@ -25,11 +25,22 @@ android { 
        versionName = "1.1"

    }



    signingConfigs {

        create("testkey") {

            storeFile = File("${rootDir}/keystore/testkey.jks")

            storePassword = "testkey"

            keyAlias = "testkey"

            keyPassword = "testkey"

        }

    }



    buildTypes {

        getByName("release") {

            // Enables code shrinking, obfuscation, and optimization.

            isMinifyEnabled = true



            signingConfig = signingConfigs.getByName("testkey")



            // Includes the default ProGuard rules files.

            setProguardFiles(

                listOf(
@@ -39,8 +50,7 @@ android { 
            )

        }

        getByName("debug") {

            // Append .dev to package name so we won't conflict with AOSP build.

            applicationIdSuffix = ".dev"

            signingConfig = signingConfigs.getByName("testkey")

        }

    }
@@ -74,6 +84,8 @@ dependencies { 
    // Recyclerview

    implementation("androidx.recyclerview:recyclerview:1.3.2")

    implementation("androidx.recyclerview:recyclerview-selection:1.1.0")



    implementation("foundation.e:elib:0.0.1-alpha11")

}



configure<GenerateBpPluginExtension> {

app/src/main/java/org/lineageos/recorder/ui/WaveFormView.kt

+2 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import com.google.android.material.color.MaterialColors 
import org.lineageos.recorder.R

import kotlin.math.pow

import kotlin.math.sin

import foundation.e.elib.R as eR



class WaveFormView @JvmOverloads constructor(

    context: Context,
@@ -76,9 +77,7 @@ class WaveFormView @JvmOverloads constructor( 
            DEFAULT_PHASE_SHIFT

        )



        wavesColor = MaterialColors.getColor(

            this, com.google.android.material.R.attr.colorSecondary

        )

        wavesColor = context.getColor(eR.color.e_secondary_text_color)



        paint = Paint()

        paint.color = wavesColor

app/src/main/res/layout/dialog_content_rename.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
        android:layout_height="wrap_content"

        android:importantForAutofill="no"

        android:maxLines="1"

        android:singleLine="true" />

        android:singleLine="true"

        android:textColorHighlight="@color/e_alpha_accent"/>



</FrameLayout>

app/src/main/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
        <item name="android:windowBackground">@color/e_background</item>

        <item name="actionModeStyle">@style/action_mode_style</item>

        <item name="statusBarForeground">@color/e_action_bar</item>

        <item name="colorControlActivated">@color/e_accent</item>

    </style>



    <style name="action_mode_style" parent="@style/Widget.Material3.ActionMode">