Merge pull request #28 from Fortyseven/french_tones

French tones
Fortyseven · Jun 7, 2021 · 9577838 · 9577838
2 parents a64f645 + 5fd5bf9
commit 9577838
Show file tree

Hide file tree

Showing 19 changed files with 649 additions and 425 deletions.
diff --git a/MainApp/build.gradle b/MainApp/build.gradle
@@ -20,8 +20,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 20
-        versionName "20"
+        versionCode 21
+        versionName "21"
     }
     buildTypes {
         release {

diff --git a/MainApp/src/main/AndroidManifest.xml b/MainApp/src/main/AndroidManifest.xml
@@ -1,56 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    package="com.bytestemplar.tonedef"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.bytestemplar.tonedef">
 
     <uses-feature
         android:name="android.hardware.touchscreen"
-        android:required="false"/>
+        android:required="false" />
 
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <application
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.DeviceDefault"
         android:label="@string/app_name"
+        android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
         android:windowSoftInputMode="stateHidden">
 
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".DTMFActivity">
+        <activity
+            android:name=".DTMFActivity"
+            android:theme="@android:style/Theme.DeviceDefault">
             <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="text/x-vcard"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/x-vcard" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <action android:name="android.intent.action.DIAL"/>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.DIAL" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="tel"/>
+                <data android:scheme="tel" />
             </intent-filter>
         </activity>
-        <activity android:name=".ConfigActivity"/>
-        <activity android:name=".RedBoxActivity"/>
-        <activity android:name=".BlueBoxActivity"/>
-        <activity android:name=".AboutActivity"/>
+        <activity android:name=".ConfigActivity" />
+        <activity android:name=".RedBoxActivity" />
+        <activity
+            android:name=".BlueBoxActivity"
+            android:theme="@android:style/Theme.DeviceDefault" />
+        <activity android:name=".AboutActivity" />
         <activity
             android:name=".ContactSelectActivity"
-            android:theme="@style/Theme.AppCompat.Dialog"/>
-        <activity android:name=".international.InternationalActivity"/>
-        <activity android:name=".international.ButtonActivity"/>
+            android:theme="@style/Theme.AppCompat.Dialog" />
+        <activity android:name=".international.InternationalActivity" />
+        <activity android:name=".international.ButtonActivity" />
 
     </application>
 

diff --git a/MainApp/src/main/java/com/bytestemplar/tonedef/AboutActivity.java b/MainApp/src/main/java/com/bytestemplar/tonedef/AboutActivity.java
@@ -35,6 +35,11 @@ protected void onCreate(Bundle savedInstanceState)
                 UICustom.getInstance().updateActivity(this);
         }
 
+        public void clickNetwork47(View view)
+        {
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://Network47.xyz/")));
+        }
+
         public void clickGitHub(View view)
         {
                 startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/Fortyseven/ToneDef")));

diff --git a/MainApp/src/main/java/com/bytestemplar/tonedef/international/CountryTones.java b/MainApp/src/main/java/com/bytestemplar/tonedef/international/CountryTones.java
@@ -19,7 +19,7 @@
 
 import java.util.HashMap;
 
-class CountryTones
+public class CountryTones
 {
     private String                        _name;
     private HashMap<String, ToneSequence> _sequences;