Merge branch 'main' of https://github.com/Kaiserdragon2/CallForwarding

Kaiserdragon2 · Jan 30, 2023 · 5eae8a4 · 5eae8a4
2 parents 1ed0df3 + 7f484c0
commit 5eae8a4
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 3 deletions.
diff --git a/app/src/main/java/de/kaiserdragon/callforwardingstatus/CallForwardingReceiver.java b/app/src/main/java/de/kaiserdragon/callforwardingstatus/CallForwardingReceiver.java
@@ -26,6 +26,7 @@ public void onReceive(Context context, Intent intent) {
             String[] array = databaseHelper.getSelected();
             if (DEBUG) Log.v(TAG,"Number = "+array[1]);
             if (!array[1].equals("")) {
+                Toast.makeText(context,context.getString(R.string.setupCallForwarding) , Toast.LENGTH_LONG).show();
                 setCallForwarding(context, PhoneStateService.currentState, array[1]);
             }else  Toast.makeText(context,context.getString(R.string.NoNumber) , Toast.LENGTH_SHORT).show();
         }

diff --git a/app/src/main/java/de/kaiserdragon/callforwardingstatus/PhoneStateService.java b/app/src/main/java/de/kaiserdragon/callforwardingstatus/PhoneStateService.java
@@ -26,7 +26,7 @@
 
 
 public class PhoneStateService extends Service {
-    private static final String CHANNEL_ID = "my_phone_state_service_channel";
+    private static final String CHANNEL_ID = "CallForwardingServiceID";
     public static boolean currentState;
     Context context;
     final String TAG = "Service";

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">CallForwardingStatus</string>
+    <string name="app_widget_description">Zeige den Status der Rufumleitung</string>
+    <string name="ToggleCallForwarding">Rufumleitung umschalten</string>
+    <string name="DescriptionMain">Füge eine Telefonnummer hinzu, zu welcher die Anrufe weitergeleitet werden sollen.
+        Es ist möglich bis zu drei Nummern zu speichern und schnell zwischen diesen zu wechseln.</string>
+    <string name="Phone_number1">Telefonnummer 1</string>
+    <string name="Phone_number2">Telefonnummer 2</string>
+    <string name="Phone_number3">Telefonnummer 3</string>
+    <string name="save_row_1">Speichern Reihe 1</string>
+    <string name="save_row_2">Speichern Reihe 2</string>
+    <string name="save_row_3">Speichern Reihe 3</string>
+    <string name="delete_row_1">Löschen Reihe 1</string>
+    <string name="delete_row_2">Löschen Reihe 2</string>
+    <string name="delete_row_3">Löschen Reihe 3</string>
+    <string name="Radio_row_1">1</string>
+    <string name="Radio_row_2">2</string>
+    <string name="Radio_row_3">3</string>
+    <string name="CallForwardingActive">Rufumleitung Aktiv</string>
+    <string name="CallForwardingInactive">Rufumleitung Inaktiv</string>
+    <string name="PhoneNumberSaved">Telefonnummer gespeichert</string>
+    <string name="NoNumber">Keine Telefonnummer ausgewählt</string>
+    <string name="NotificationTitle">Rufumleitungservice</string>
+    <string name="setupCallForwarding">Bitte warten umschalten der Rufumleitung in Arbeit</string>
+    <string name="NotificationText">Service läuft</string>
+    <string name="settings">Einstellungen</string>
+    <string name="ChoseColor">Wähle einen Hintergrund für das Widget</string>
+    <string name="ChoseColorSpinner">Wähle einen Hintergrund für das Widget Spinner</string>
+    <string name="hue">Farbton</string>
+    <string name="saturation">Sättigung</string>
+    <string name="value">Farbwert</string>
+    <string name="alpha">Transparenz</string>
+    <string name="callForwarding">Rufumleitung</string>
+    <string name="applyColor">Farbe anwenden</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="PhoneNumberSaved">Phone number saved</string>
     <string name="NoNumber">No phone number has been set</string>
     <string name="NotificationTitle">Call Forwarding service</string>
+    <string name="setupCallForwarding">Please wait toggle call forwarding in progress</string>
     <string name="NotificationText">Service Running</string>
     <string name="settings">Settings</string>
     <string name="ChoseColor">Chose a Background Color for your Widget</string>

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jan 16 11:54:38 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME