Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for organization name changes and adding PR template #9

Merged
merged 4 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Summary

Wylwi marked this conversation as resolved.
Show resolved Hide resolved
- What is the objective? What is fixed/what feature is added/what was documented?
- How is the objective implemented? What classes/doc files/CI were changed?
# Details

Wylwi marked this conversation as resolved.
Show resolved Hide resolved
Depends on the nature of the PR :
- **Code changes :** describe the conceptual approach taken in the code and tell the reviewer what part of the changes does what, so that it's easier to read the code
- **Other changes :** Add details if relevant, or remove this section if not useful
10 changes: 5 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ plugins {
}

android {
namespace = "com.android.sample"
namespace = "ch.hikemate.app"
compileSdk = 34

defaultConfig {
applicationId = "com.android.sample"
applicationId = "ch.hikemate.app"
minSdk = 28
targetSdk = 34
versionCode = 1
Expand Down Expand Up @@ -93,9 +93,9 @@ android {

sonar {
properties {
property("sonar.projectName", "flepRename")
property("sonar.projectKey", "FLEPMate_flepRename")
property("sonar.organization", "flepmate")
property("sonar.projectName", "HikeMate")
property("sonar.projectKey", "HikeMate_hikeMateApp")
property("sonar.organization", "hikemate")
property("sonar.host.url", "https://sonarcloud.io")
// Comma-separated paths to the various directories containing the *.xml JUnit report files. Each path may be absolute or relative to the project base directory.
property("sonar.junit.reportPaths", "${project.layout.buildDirectory.get()}/test-results/testDebugunitTest/")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.android.sample
package ch.hikemate.app

import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.sample.screen.MainScreen
import ch.hikemate.app.screen.MainScreen
import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
import io.github.kakaocup.compose.node.element.ComposeScreen
import org.junit.Assert.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.android.sample.screen
package ch.hikemate.app.screen

import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
import com.android.sample.resources.C
import ch.hikemate.app.resources.C
import io.github.kakaocup.compose.node.element.ComposeScreen
import io.github.kakaocup.compose.node.element.KNode

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample
package ch.hikemate.app

import android.os.Bundle
import androidx.activity.ComponentActivity
Expand All @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTag
import androidx.compose.ui.tooling.preview.Preview
import com.android.sample.resources.C
import com.android.sample.ui.theme.SampleAppTheme
import ch.hikemate.app.resources.C
import ch.hikemate.app.ui.theme.SampleAppTheme

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample
package ch.hikemate.app

import android.os.Bundle
import androidx.activity.ComponentActivity
Expand All @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTag
import androidx.compose.ui.tooling.preview.Preview
import com.android.sample.resources.C
import com.android.sample.ui.theme.SampleAppTheme
import ch.hikemate.app.resources.C
import ch.hikemate.app.ui.theme.SampleAppTheme

class SecondActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample
package ch.hikemate.app

import kotlin.math.sqrt

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample.resources
package ch.hikemate.app.resources

// Like R, but C
object C {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample.ui.theme
package ch.hikemate.app.ui.theme

import androidx.compose.ui.graphics.Color

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample.ui.theme
package ch.hikemate.app.ui.theme

import android.app.Activity
import android.os.Build
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample.ui.theme
package ch.hikemate.app.ui.theme

import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.android.sample
package ch.hikemate.app

import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.sample.screen.SecondScreen
import ch.hikemate.app.screen.SecondScreen
import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
import io.github.kakaocup.compose.node.element.ComposeScreen
import org.junit.Rule
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample
package ch.hikemate.app

import org.junit.Assert.*
import org.junit.Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.sample
package ch.hikemate.app

import org.junit.Assert.assertEquals
import org.junit.Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.android.sample.screen
package ch.hikemate.app.screen

import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
import com.android.sample.resources.C
import ch.hikemate.app.resources.C
import io.github.kakaocup.compose.node.element.ComposeScreen
import io.github.kakaocup.compose.node.element.KNode

Expand Down