Skip to content

Commit

Permalink
Merge pull request #2 from anexia/SIANXSVC-1225
Browse files Browse the repository at this point in the history
SIANXSVC-1225: add CI script for building the app
  • Loading branch information
anx-bkelhar authored Mar 18, 2024
2 parents 05b501f + 00995d0 commit 8f83929
Show file tree
Hide file tree
Showing 54 changed files with 21 additions and 8,366 deletions.
1 change: 0 additions & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
2 changes: 1 addition & 1 deletion app/src/debug/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="android__app_name" translatable="false">2FAS.DEBUG</string>
<string name="android__app_name" translatable="false">Anexia Authenticator</string>
</resources>
Binary file added app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
<monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
5 changes: 2 additions & 3 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
<monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 0 additions & 10 deletions app/src/main/res/xml/locales_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,4 @@
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
<locale android:name="en" />
<locale android:name="de" />
<locale android:name="fr" />
<locale android:name="pt-PT" />
<locale android:name="pt-BR" />
<locale android:name="es" />
<locale android:name="uk" />
<locale android:name="it" />
<locale android:name="pl" />
<locale android:name="id" />
<locale android:name="nl" />
<locale android:name="tr" />
</locale-config>
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@ internal fun Project.applyBuildTypes(
signingConfig = signingConfigs.getByName("debug")
applicationIdSuffix = ".debug"
}
/*
create("releaseLocal") {
isMinifyEnabled = true
isDebuggable = false
signingConfig = signingConfigs.getByName("releaseLocal")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
matchingFallbacks += "release"
}
}*/
/*
getByName("release") {
isMinifyEnabled = true
isDebuggable = false
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}*/
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ internal fun Project.applySigningConfigs(
applicationExtension.apply {

val localConfig = Properties().apply {
load(FileInputStream(File(rootProject.rootDir, "config/config.properties")))
//load(FileInputStream(File(rootProject.rootDir, "config/config.properties")))
}

/*
signingConfigs {
getByName("debug") {
storeFile = file("../config/debug_signing.jks")
Expand All @@ -34,6 +35,6 @@ internal fun Project.applySigningConfigs(
keyAlias = localConfig.getProperty("release.keyAlias")
keyPassword = localConfig.getProperty("release.keyPassword")
}
}
}*/
}
}
4 changes: 2 additions & 2 deletions core/designsystem/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest>

<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import android.os.PersistableBundle
import android.provider.Settings
import android.view.WindowManager
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
import androidx.annotation.StringRes
import androidx.compose.runtime.Composable
Expand All @@ -24,7 +25,6 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.platform.UriHandler
import androidx.compose.ui.unit.Dp
import androidx.core.app.ComponentActivity
import com.twofasapp.locale.R
import com.twofasapp.locale.Strings
import com.twofasapp.locale.TwLocale
Expand Down
4 changes: 2 additions & 2 deletions core/locale/src/main/res/values-de-rDE/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<string name="NSCameraUsageDescription">Wird zum Scannen von QR-Codes verwendet</string>
<string name="NSFaceIDUsageDescription">Du kannst die Anwendung unter Verwendung von Face ID entsperren</string>
<!-- MARK: - App -->
<string name="app__name">2FAS Authenticator</string>
<string name="app__name">Anexia Authenticator</string>
<string name="commons__2fas">2FA Authenticator (2FAS App)</string>
<string name="commons__OK">OK</string>
<string name="commons__add">Hinzufügen</string>
Expand Down Expand Up @@ -530,7 +530,7 @@
<string name="externalimport_google_authenticator">Google Authenticator</string>
<string name="externalimport_aegis">Aegis</string>
<string name="externalimport_raivo">Raivo OTP</string>
<string name="android__app_name">2FAS Auth</string>
<string name="android__app_name">Anexia Authenticator</string>
<string name="commons__yes">Ja</string>
<string name="commons__no">Nein</string>
<string name="commons__search">Suchen</string>
Expand Down
Loading

0 comments on commit 8f83929

Please sign in to comment.