From e27b2fb714c92f743125eb833b797d7024ecac92 Mon Sep 17 00:00:00 2001 From: isra el Date: Mon, 19 Jun 2023 08:50:22 +0300 Subject: [PATCH 1/3] major changes in mobile app --- android/.idea/.name | 2 +- android/app/build.gradle | 4 ++-- .../java/com/vernu/sms/activities/MainActivity.java | 10 ++++++++-- android/app/src/main/res/layout/activity_main.xml | 2 +- android/app/src/main/res/values-night/themes.xml | 8 ++++---- android/app/src/main/res/values/strings.xml | 2 +- android/app/src/main/res/values/themes.xml | 8 ++++---- android/settings.gradle | 2 +- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/android/.idea/.name b/android/.idea/.name index 6c55949..a454675 100644 --- a/android/.idea/.name +++ b/android/.idea/.name @@ -1 +1 @@ -SMS Gateway \ No newline at end of file +TextBee \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 168b628..a9fa6c1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.vernu.sms" minSdk 24 targetSdk 32 - versionCode 5 - versionName "1.3.0" + versionCode 7 + versionName "2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/android/app/src/main/java/com/vernu/sms/activities/MainActivity.java b/android/app/src/main/java/com/vernu/sms/activities/MainActivity.java index 689382f..4bcdf42 100644 --- a/android/app/src/main/java/com/vernu/sms/activities/MainActivity.java +++ b/android/app/src/main/java/com/vernu/sms/activities/MainActivity.java @@ -54,7 +54,7 @@ public class MainActivity extends AppCompatActivity { private static final int SEND_SMS_PERMISSION_REQUEST_CODE = 0; private static final int SCAN_QR_REQUEST_CODE = 49374; - private static final String API_BASE_URL = "https://api.sms.vernu.dev/api/v1/"; + private static final String API_BASE_URL = "https://api.textbee.vernu.dev/api/v1/"; private String deviceId = null; @@ -89,6 +89,12 @@ public class MainActivity extends AppCompatActivity { deviceIdTxt.setText(deviceId); deviceBrandAndModelTxt.setText(Build.BRAND + " " + Build.MODEL); + if(deviceId == null || deviceId.isEmpty()) { + registerDeviceBtn.setText("Register"); + } else { + registerDeviceBtn.setText("Update"); + } + if (isSMSPermissionGranted(mContext)) { grantSMSPermissionBtn.setEnabled(false); grantSMSPermissionBtn.setText("SMS Permission Granted"); @@ -146,7 +152,7 @@ public class MainActivity extends AppCompatActivity { scanQRBtn.setOnClickListener(view -> { IntentIntegrator intentIntegrator = new IntentIntegrator(MainActivity.this); - intentIntegrator.setPrompt("Go to sms.vernu.dev/dashboard and click Register Device to generate QR Code"); + intentIntegrator.setPrompt("Go to textbee.vernu.dev/dashboard and click Register Device to generate QR Code"); intentIntegrator.setRequestCode(SCAN_QR_REQUEST_CODE); intentIntegrator.initiateScan(); }); diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml index 0de57c3..11c26d1 100644 --- a/android/app/src/main/res/layout/activity_main.xml +++ b/android/app/src/main/res/layout/activity_main.xml @@ -27,7 +27,7 @@ + android:text="Go to textbee.vernu.dev/dashboard and click register device, then copy and paste the api key generated or scan the QR code" />