Skip to content

Commit ec5abf6

Browse files
code3-devcode3-dev
committed
added base
1 parent d97389e commit ec5abf6

25 files changed

+194
-68
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,41 @@ jobs:
3131
run: |
3232
chmod +x gradlew
3333
34+
- name: Make scripts executable
35+
run: |
36+
chmod +x scripts/*.sh
37+
38+
- name: Validate Gradle Wrapper
39+
run: |
40+
./scripts/verify-gradle-wrapper.sh
41+
continue-on-error: true
42+
timeout-minutes: 5
43+
44+
- name: Retry Gradle Wrapper Validation (if needed)
45+
run: |
46+
echo "Checking if Gradle wrapper validation is needed..."
47+
# If the previous step failed, try a manual validation approach
48+
if [ ! -f "gradle/wrapper/gradle-wrapper.jar.sha256" ]; then
49+
echo "Gradle wrapper checksum missing, generating new one..."
50+
./scripts/fix-gradle-wrapper.sh
51+
else
52+
echo "Gradle wrapper checksum already exists, continuing..."
53+
fi
54+
continue-on-error: true
55+
56+
- name: Check Gradle Wrapper Validation Result
57+
run: |
58+
if [ ! -f "gradle/wrapper/gradle-wrapper.jar.sha256" ]; then
59+
echo "Gradle wrapper checksum missing, generating new one..."
60+
cd gradle/wrapper
61+
sha256sum gradle-wrapper.jar > gradle-wrapper.jar.sha256
62+
fi
63+
64+
- name: Setup Gradle
65+
uses: gradle/gradle-build-action@v2
66+
with:
67+
gradle-version: wrapper
68+
3469
- name: Decode Keystore
3570
run: |
3671
echo "${{ secrets.KEY_STORE }}" | base64 --decode > app/keystore.jks

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ plugins {
1010
}
1111

1212
android {
13-
namespace = "com.pira.gnet"
13+
namespace = "com.pira.gnetp"
1414
compileSdk = 36
1515

1616
defaultConfig {
17-
applicationId = "com.pira.gnet"
17+
applicationId = "com.pira.gnetp"
1818
minSdk = 23
1919
targetSdk = 36
2020
versionCode = 1

app/src/main/java/com/pira/gnet/GNetApplication.kt renamed to app/src/main/java/com/pira/gnetp/GNetApplication.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.pira.gnet
1+
package com.pira.gnetp
22

33
import android.app.Application
4-
import com.pira.gnet.utils.PreferenceManager
4+
import com.pira.gnetp.utils.PreferenceManager
55
import dagger.hilt.android.HiltAndroidApp
66

77
@HiltAndroidApp

app/src/main/java/com/pira/gnet/MainActivity.kt renamed to app/src/main/java/com/pira/gnetp/MainActivity.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pira.gnet
1+
package com.pira.gnetp
22

33
import android.content.Intent
44
import android.os.Bundle
@@ -35,16 +35,16 @@ import androidx.navigation.compose.NavHost
3535
import androidx.navigation.compose.composable
3636
import androidx.navigation.compose.currentBackStackEntryAsState
3737
import androidx.navigation.compose.rememberNavController
38-
import com.pira.gnet.data.LogRepository
39-
import com.pira.gnet.navigation.Screen
40-
import com.pira.gnet.ui.home.HomeScreen
41-
import com.pira.gnet.ui.home.HomeViewModel
42-
import com.pira.gnet.ui.hotspot.HotspotScreen
43-
import com.pira.gnet.ui.logs.LogsScreen
44-
import com.pira.gnet.ui.settings.SettingsScreen
45-
import com.pira.gnet.ui.theme.GNetTheme
46-
import com.pira.gnet.ui.theme.ThemeManager
47-
import com.pira.gnet.ui.theme.ThemeSettings
38+
import com.pira.gnetp.data.LogRepository
39+
import com.pira.gnetp.navigation.Screen
40+
import com.pira.gnetp.ui.home.HomeScreen
41+
import com.pira.gnetp.ui.home.HomeViewModel
42+
import com.pira.gnetp.ui.hotspot.HotspotScreen
43+
import com.pira.gnetp.ui.logs.LogsScreen
44+
import com.pira.gnetp.ui.settings.SettingsScreen
45+
import com.pira.gnetp.ui.theme.GNetTheme
46+
import com.pira.gnetp.ui.theme.ThemeManager
47+
import com.pira.gnetp.ui.theme.ThemeSettings
4848
import dagger.hilt.android.AndroidEntryPoint
4949
import javax.inject.Inject
5050

app/src/main/java/com/pira/gnet/data/LogRepository.kt renamed to app/src/main/java/com/pira/gnetp/data/LogRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pira.gnet.data
1+
package com.pira.gnetp.data
22

33
import kotlinx.coroutines.flow.MutableStateFlow
44
import kotlinx.coroutines.flow.StateFlow

app/src/main/java/com/pira/gnet/data/ProxyConfig.kt renamed to app/src/main/java/com/pira/gnetp/data/ProxyConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pira.gnet.data
1+
package com.pira.gnetp.data
22

33
data class ProxyConfig(
44
val proxyType: ProxyType = ProxyType.HTTP,

app/src/main/java/com/pira/gnet/di/AppModule.kt renamed to app/src/main/java/com/pira/gnetp/di/AppModule.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.pira.gnet.di
1+
package com.pira.gnetp.di
22

33
import android.content.Context
4-
import com.pira.gnet.GNetApplication
5-
import com.pira.gnet.data.ProxyConfig
6-
import com.pira.gnet.utils.PreferenceManager
4+
import com.pira.gnetp.GNetApplication
5+
import com.pira.gnetp.data.ProxyConfig
6+
import com.pira.gnetp.utils.PreferenceManager
77
import dagger.Module
88
import dagger.Provides
99
import dagger.hilt.InstallIn

app/src/main/java/com/pira/gnet/navigation/Screen.kt renamed to app/src/main/java/com/pira/gnetp/navigation/Screen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.pira.gnet.navigation
1+
package com.pira.gnetp.navigation
22

33
import androidx.annotation.StringRes
4-
import com.pira.gnet.R
4+
import com.pira.gnetp.R
55

66
sealed class Screen(val route: String, @StringRes val resourceId: Int) {
77
object Home : Screen("home", R.string.home)

app/src/main/java/com/pira/gnet/proxy/ProxyServerService.kt renamed to app/src/main/java/com/pira/gnetp/proxy/ProxyServerService.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pira.gnet.proxy
1+
package com.pira.gnetp.proxy
22

33
import android.app.Notification
44
import android.app.NotificationChannel
@@ -9,13 +9,13 @@ import android.content.Intent
99
import android.os.Build
1010
import android.os.IBinder
1111
import androidx.core.app.NotificationCompat
12-
import com.pira.gnet.MainActivity
13-
import com.pira.gnet.R
14-
import com.pira.gnet.data.LogLevel
15-
import com.pira.gnet.data.LogRepository
16-
import com.pira.gnet.data.ProxyConfig
17-
import com.pira.gnet.data.ProxyType
18-
import com.pira.gnet.utils.Logger
12+
import com.pira.gnetp.MainActivity
13+
import com.pira.gnetp.R
14+
import com.pira.gnetp.data.LogLevel
15+
import com.pira.gnetp.data.LogRepository
16+
import com.pira.gnetp.data.ProxyConfig
17+
import com.pira.gnetp.data.ProxyType
18+
import com.pira.gnetp.utils.Logger
1919
import dagger.hilt.android.AndroidEntryPoint
2020
import kotlinx.coroutines.CoroutineScope
2121
import kotlinx.coroutines.Dispatchers

app/src/main/java/com/pira/gnet/ui/home/HomeScreen.kt renamed to app/src/main/java/com/pira/gnetp/ui/home/HomeScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pira.gnet.ui.home
1+
package com.pira.gnetp.ui.home
22

33
import android.content.Intent
44
import androidx.compose.foundation.layout.Arrangement
@@ -33,7 +33,7 @@ import androidx.compose.ui.Modifier
3333
import androidx.compose.ui.graphics.Color
3434
import androidx.compose.ui.text.font.FontWeight
3535
import androidx.compose.ui.unit.dp
36-
import com.pira.gnet.data.ProxyType
36+
import com.pira.gnetp.data.ProxyType
3737

3838
@Composable
3939
fun HomeScreen(

0 commit comments

Comments
 (0)