Przeglądaj źródła

refactor package name

kunickyd 3 lat temu
rodzic
commit
8b64db1209

+ 3 - 3
android/src/ch/opengis/qfield/QFieldActivity.java

@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -64,8 +64,8 @@ import android.view.WindowManager.LayoutParams;
 
 import org.qtproject.qt5.android.bindings.QtActivity;
 
-import ch.opengis.qfield.R;
-import ch.opengis.qfield.QFieldUtils;
+import ch.opengis.vrahelper.R;
+import ch.opengis.vrahelper.QFieldUtils;
 
 
 public class QFieldActivity extends QtActivity {

+ 2 - 2
android/src/ch/opengis/qfield/QFieldAppRaterActivity.java

@@ -1,4 +1,4 @@
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import android.os.Bundle;
 import android.net.Uri;
@@ -21,7 +21,7 @@ import android.util.Log;
 import android.graphics.drawable.ColorDrawable;
 
 public class QFieldAppRaterActivity extends Activity{
-    private final static String APP_PNAME = "ch.opengis.qfield"; // Package Name
+    private final static String APP_PNAME = "ch.opengis.vrahelper"; // Package Name
 
     private final static int DAYS_UNTIL_PROMPT = 30; // Min number of days
     private final static int LAUNCHES_UNTIL_PROMPT = 10; // Min number of launches

+ 1 - 1
android/src/ch/opengis/qfield/QFieldCameraPictureActivity.java

@@ -1,4 +1,4 @@
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import java.text.SimpleDateFormat;
 import java.io.File;

+ 1 - 1
android/src/ch/opengis/qfield/QFieldGalleryPictureActivity.java

@@ -1,4 +1,4 @@
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import java.text.SimpleDateFormat;
 import java.io.File;

+ 1 - 1
android/src/ch/opengis/qfield/QFieldOpenExternallyActivity.java

@@ -1,4 +1,4 @@
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import java.io.File;
 

+ 1 - 1
android/src/ch/opengis/qfield/QFieldProjectActivity.java

@@ -1,4 +1,4 @@
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import java.io.File;
 import java.util.List;

+ 1 - 1
android/src/ch/opengis/qfield/QFieldProjectListAdapter.java

@@ -1,4 +1,4 @@
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import java.util.ArrayList;
 import java.io.File;

+ 1 - 1
android/src/ch/opengis/qfield/QFieldProjectListItem.java

@@ -1,4 +1,4 @@
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import java.io.File;
 

+ 1 - 1
android/src/ch/opengis/qfield/QFieldUtils.java

@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-package ch.opengis.qfield;
+package ch.opengis.vrahelper;
 
 import android.content.Context;
 import android.content.ContentResolver;

+ 7 - 7
cmake/AndroidManifest.xml.in

@@ -8,7 +8,7 @@
     android:usesCleartextTraffic="true"
     android:requestLegacyExternalStorage="true" >
     <activity
-      android:name="ch.opengis.qfield.QFieldActivity"
+      android:name="ch.opengis.@APP_PACKAGE_NAME@.QFieldActivity"
       android:icon="@drawable/qfield_logo"
       android:label="@string/app_name"
       android:launchMode="singleTop"
@@ -170,23 +170,23 @@
     </activity>
 
     <!-- Activity to choose a .qgs file to open -->
-    <activity android:name="ch.opengis.qfield.QFieldProjectActivity" />
+    <activity android:name="ch.opengis.@APP_PACKAGE_NAME@.QFieldProjectActivity" />
 
     <!-- Activity "Rate this app" -->
-    <activity android:name="ch.opengis.qfield.QFieldAppRaterActivity" />
+    <activity android:name="ch.opengis.@APP_PACKAGE_NAME@.QFieldAppRaterActivity" />
 
     <!-- Activity to get picture with the native camera -->
-    <activity android:name="ch.opengis.qfield.QFieldCameraPictureActivity" android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" />
+    <activity android:name="ch.opengis.@APP_PACKAGE_NAME@.QFieldCameraPictureActivity" android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" />
 
     <!-- Activity to get picture from the gallery -->
-    <activity android:name="ch.opengis.qfield.QFieldGalleryPictureActivity" android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" />
+    <activity android:name="ch.opengis.@APP_PACKAGE_NAME@.QFieldGalleryPictureActivity" android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" />
 
     <!-- Activity to open file externally -->
-    <activity android:name="ch.opengis.qfield.QFieldOpenExternallyActivity" />
+    <activity android:name="ch.opengis.@APP_PACKAGE_NAME@.QFieldOpenExternallyActivity" />
 
     <provider
         android:name="android.support.v4.content.FileProvider"
-        android:authorities="ch.opengis.qfield.fileprovider"
+        android:authorities="ch.opengis.@APP_PACKAGE_NAME@.fileprovider"
         android:exported="false"
         android:grantUriPermissions="true">
         <meta-data

+ 12 - 12
src/core/platforms/android/androidplatformutilities.cpp

@@ -165,9 +165,9 @@ PictureSource *AndroidPlatformUtilities::getCameraPicture( QQuickItem *parent, c
   if ( !checkCameraPermissions() )
     return nullptr;
 
-  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield.QFieldCameraPictureActivity" ) );
+  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper.QFieldCameraPictureActivity" ) );
   QAndroidJniObject intent = QAndroidJniObject( "android/content/Intent", "(Ljava/lang/String;)V", activity.object<jstring>() );
-  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield" ) );
+  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper" ) );
 
   intent.callObjectMethod( "setClassName", "(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;", packageName.object<jstring>(), activity.object<jstring>() );
 
@@ -204,9 +204,9 @@ PictureSource *AndroidPlatformUtilities::getGalleryPicture( QQuickItem *parent,
 {
   Q_UNUSED( parent )
 
-  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield.QFieldGalleryPictureActivity" ) );
+  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper.QFieldGalleryPictureActivity" ) );
   QAndroidJniObject intent = QAndroidJniObject( "android/content/Intent", "(Ljava/lang/String;)V", activity.object<jstring>() );
-  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield" ) );
+  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper" ) );
 
   intent.callObjectMethod( "setClassName", "(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;", packageName.object<jstring>(), activity.object<jstring>() );
 
@@ -237,9 +237,9 @@ ViewStatus *AndroidPlatformUtilities::open( const QString &uri )
 {
   checkWriteExternalStoragePermissions();
 
-  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield.QFieldOpenExternallyActivity" ) );
+  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper.QFieldOpenExternallyActivity" ) );
   QAndroidJniObject intent = QAndroidJniObject( "android/content/Intent", "(Ljava/lang/String;)V", activity.object<jstring>() );
-  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield" ) );
+  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper" ) );
 
   intent.callObjectMethod( "setClassName", "(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;", packageName.object<jstring>(), activity.object<jstring>() );
 
@@ -262,11 +262,11 @@ ProjectSource *AndroidPlatformUtilities::openProject()
 {
   checkWriteExternalStoragePermissions();
 
-  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield.QFieldProjectActivity" ) );
+  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper.QFieldProjectActivity" ) );
   QAndroidJniObject intent = QAndroidJniObject( "android/content/Intent", "(Ljava/lang/String;)V", activity.object<jstring>() );
 
-  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield" ) );
-  QAndroidJniObject className = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield.QFieldProjectActivity" ) );
+  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper" ) );
+  QAndroidJniObject className = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper.QFieldProjectActivity" ) );
 
   intent.callObjectMethod( "setClassName", "(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;", packageName.object<jstring>(), className.object<jstring>() );
 
@@ -389,11 +389,11 @@ void AndroidPlatformUtilities::restoreBrightness()
 void AndroidPlatformUtilities::showRateThisApp() const
 {
 
-  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield.QFieldAppRaterActivity" ) );
+  QAndroidJniObject activity = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper.QFieldAppRaterActivity" ) );
   QAndroidJniObject intent = QAndroidJniObject( "android/content/Intent", "(Ljava/lang/String;)V", activity.object<jstring>() );
 
-  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield" ) );
-  QAndroidJniObject className = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.qfield.QFieldAppRaterActivity" ) );
+  QAndroidJniObject packageName = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper" ) );
+  QAndroidJniObject className = QAndroidJniObject::fromString( QStringLiteral( "ch.opengis.vrahelper.QFieldAppRaterActivity" ) );
 
   intent.callObjectMethod( "setClassName", "(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;", packageName.object<jstring>(), className.object<jstring>() );