eddy/Project_SylDa
Watch
1
1
Fork
You've already forked Project_SylDa
 0
Code Issues 2 Pull requests Projects Releases 3 Packages Wiki Activity Actions

Compare commits

base: eddy:3b9028b096fbc6649c099e417af912713c69f1c3
Branches Tags
eddy:main
eddy:feature/client-ble-ota
eddy:v1.2
eddy:v1.1
eddy:v1.0
eddy:v2.0
..
compare: eddy:b2662247bb51a6b88bdec9fb314802f0caee45c6
Branches Tags
eddy:main
eddy:feature/client-ble-ota
eddy:v1.2
eddy:v1.1
eddy:v1.0
eddy:v2.0
3 changed files with 157 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

4
android/app/build.gradle
View file

@ -11,7 +11,7 @@ android {
// compileSdk/targetSdk stays on 34 (Android 14) by deliberate choice. The target audience // compileSdk/targetSdk stays on 34 (Android 14) by deliberate choice. The target audience
// consists of physically disabled users who are very reluctant to update their phones. Staying // consists of physically disabled users who are very reluctant to update their phones. Staying
// on API 34 maximises device compatibility. Re-evaluate when the user base has migrated. // on API 34 maximises device compatibility. Re-evaluate when the user base has migrated.
compileSdk 36 compileSdk 34
if (hasSigningConfig) { if (hasSigningConfig) {
def props = new Properties() def props = new Properties()
@ -30,7 +30,7 @@ android {
defaultConfig { defaultConfig {
applicationId "nl.eddydevink.sylda" applicationId "nl.eddydevink.sylda"
minSdk 26 minSdk 26
targetSdk 36 targetSdk 34
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
buildConfigField "String", "BUILD_NUMBER", "\"${new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(new Date())}\"" buildConfigField "String", "BUILD_NUMBER", "\"${new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(new Date())}\""

8
android/app/src/main/res/layout/activity_main.xml
View file

@ -1,10 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="16dp"> android:padding="16dp">
@ -14,7 +9,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|top" android:layout_gravity="end|top"
android:layout_marginTop="8dp"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center_vertical" android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
@ -74,5 +68,3 @@
android:textSize="14sp" /> android:textSize="14sp" />
</FrameLayout> </FrameLayout>
</FrameLayout>

11
android/app/src/main/res/layout/activity_settings.xml
View file

@ -3,14 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:fitsSystemWindows="true"> android:padding="24dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="24dp"
android:layout_marginTop="8dp">
<RadioGroup <RadioGroup
android:id="@+id/flashMethodGroup" android:id="@+id/flashMethodGroup"
@ -145,5 +138,3 @@
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
</LinearLayout>