updated lng

niklasfessler · niklasfessler · commit ec0a96335331 · 2021-02-19T16:42:26.000+01:00
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity2"></activity>
+        <activity android:name=".MainActivity2"/>
         <activity
             android:name=".MainActivity"
             android:theme="@style/Theme.AppCompat.NoActionBar">
diff --git a/app/src/main/java/bugbattle/io/bugbattle_android_sdk/MainActivity.java b/app/src/main/java/bugbattle/io/bugbattle_android_sdk/MainActivity.java
@@ -1,6 +1,5 @@
 package bugbattle.io.bugbattle_android_sdk;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
@@ -16,6 +15,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         Button button = findViewById(R.id.button);
+
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/bugbattle/io/bugbattle_android_sdk/MainApplication.java b/app/src/main/java/bugbattle/io/bugbattle_android_sdk/MainApplication.java
@@ -11,7 +11,11 @@ public class MainApplication extends Application {
     public void onCreate() {
         super.onCreate();
         BugBattleActivationMethod[] detectorList = {BugBattleActivationMethod.SHAKE, BugBattleActivationMethod.SCREENSHOT, BugBattleActivationMethod.THREE_FINGER_DOUBLE_TAB};
-        BugBattle.initialise("U1FeTUrxnzbtB8ebJj2unNweR6pzgIWg", detectorList, this);
-        BugBattle.enableReplay();
+
+        BugBattle.initialise("YOUR_APK_KEY", detectorList, this);
+        BugBattle.setLanguage("deee");
+        BugBattle.setPrivacyPolicyUrl("TESTURL.com");
+        BugBattle.enablePrivacyPolicy(true);
+         BugBattle.enableReplay();
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -22,7 +22,7 @@
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Button"
+        android:text="@string/btn_text"
         tools:layout_editor_absoluteX="174dp"
         tools:layout_editor_absoluteY="246dp" />
 
diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
@@ -11,6 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Button"
-        tools:layout_editor_absoluteX="75dp"
-        tools:layout_editor_absoluteY="100dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="btn_text">Report FRENCH</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">BugBattle-Android-SDK</string>
+    <string name="btn_text">Report DEFAULT</string>
     <string name="logo">logo</string>
     <string name="title_activity_main2">MainActivity</string>
     <!-- Strings used for fragments for navigation -->
diff --git a/bugbattle/build.gradle b/bugbattle/build.gradle
@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/BugBattle/Android-SDK'
     gitUrl = 'https://github.com/BugBattle/Android-SDK.git'
 
-    libraryVersion = '3.1.1'
+    libraryVersion = '3.1.5'
 
     developerId = 'BugBattle GmbH'
     developerName = 'BugBattle'
@@ -36,6 +36,9 @@ buildscript {
 
 android {
 
+    lintOptions {
+        abortOnError false
+    }
     compileSdkVersion 28
 
     defaultConfig {
diff --git a/bugbattle/src/androidTest/java/bugbattle/io/bugbattle/ExampleInstrumentedTest.java b/bugbattle/src/androidTest/java/bugbattle/io/bugbattle/ExampleInstrumentedTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/bugbattle/src/main/AndroidManifest.xml b/bugbattle/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application>
-        <activity android:name=".view.OnBoarding"  android:theme="@style/AppTheme.TranslucentBG"></activity>
         <activity
             android:name=".view.ImageEditor"
             android:theme="@style/AppTheme.TranslucentBG" />
diff --git a/bugbattle/src/main/java/bugbattle/io/bugbattle/BugBattle.java b/bugbattle/src/main/java/bugbattle/io/bugbattle/BugBattle.java
@@ -14,7 +14,6 @@
 import bugbattle.io.bugbattle.controller.BugBattleNotInitialisedException;
 import bugbattle.io.bugbattle.model.APPLICATIONTYPE;
 import bugbattle.io.bugbattle.model.FeedbackModel;
-import bugbattle.io.bugbattle.model.LANGUAGE;
 import bugbattle.io.bugbattle.model.PhoneMeta;
 import bugbattle.io.bugbattle.service.BBDetector;
 import bugbattle.io.bugbattle.service.ReplaysDetector;
@@ -235,7 +234,12 @@ public static void enableReplay() {
         FeedbackModel.getInstance().getGestureDetectors().add(replaysDetector);
     }
 
-    public static void setLanguage(LANGUAGE language) {
+    /**
+     * Set the language for the BugBattle Report Flow. Otherwise the default language is used.
+     * Supported Languages "en", "es", "fr", "it", "de"
+     * @param language ISO Country Code eg. "en", "de", "es"
+     */
+    public static void setLanguage(String language) {
         FeedbackModel.getInstance().setLanguage(language);
     }
 
diff --git a/bugbattle/src/main/java/bugbattle/io/bugbattle/model/FeedbackModel.java b/bugbattle/src/main/java/bugbattle/io/bugbattle/model/FeedbackModel.java
@@ -24,7 +24,7 @@ public class FeedbackModel {
     private Date startUpDate = new Date();
     private boolean isDisabled = false;
     private static FeedbackModel instance;
-    private LANGUAGE language = LANGUAGE.EN;
+    private String language = "";
 
     private String sdkKey;
     private String userEmail;
@@ -213,11 +213,11 @@ public Date getStartUpDate() {
         return startUpDate;
     }
 
-    public LANGUAGE getLanguage() {
+    public String getLanguage() {
         return language;
     }
 
-    public void setLanguage(LANGUAGE language) {
+    public void setLanguage(String language) {
         this.language = language;
     }
 }
diff --git a/bugbattle/src/main/java/bugbattle/io/bugbattle/model/LANGUAGE.java b/bugbattle/src/main/java/bugbattle/io/bugbattle/model/LANGUAGE.java
diff --git a/bugbattle/src/main/java/bugbattle/io/bugbattle/view/Feedback.java b/bugbattle/src/main/java/bugbattle/io/bugbattle/view/Feedback.java
@@ -62,7 +62,9 @@ public class Feedback extends AppCompatActivity implements OnHttpResponseListene
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        LanguageController.setLocale(this, FeedbackModel.getInstance().getLanguage().toString());
+        if(!FeedbackModel.getInstance().getLanguage().equals("")) {
+            LanguageController.setLocale(this, FeedbackModel.getInstance().getLanguage().toString());
+        }
         super.onCreate(savedInstanceState);
         this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_feedback);
@@ -275,9 +277,14 @@ public void onClick(View view) {
         policyText.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent browserIntent = new Intent(Intent.ACTION_VIEW);
-                browserIntent.setData(Uri.parse(feedbackModel.getPrivacyUrl()));
-                startActivity(browserIntent);
+                try {
+                    Intent browserIntent = new Intent(Intent.ACTION_VIEW);
+                    browserIntent.setData(Uri.parse(feedbackModel.getPrivacyUrl()));
+                    startActivity(browserIntent);
+                }catch (Exception e) {
+                    System.out.println(e);
+                    System.err.println("BB -> Malformed URL.");
+                }
             }
         });
 
diff --git a/bugbattle/src/main/java/bugbattle/io/bugbattle/view/ImageEditor.java b/bugbattle/src/main/java/bugbattle/io/bugbattle/view/ImageEditor.java
@@ -47,7 +47,9 @@ public class ImageEditor extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        LanguageController.setLocale(this, FeedbackModel.getInstance().getLanguage().toString());
+        if(!FeedbackModel.getInstance().getLanguage().equals("")) {
+            LanguageController.setLocale(this, FeedbackModel.getInstance().getLanguage());
+        }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_image_editor);
         try {
diff --git a/bugbattle/src/main/res/anim/slide_out_down.xml b/bugbattle/src/main/res/anim/slide_out_down.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
+<set>
 
 </set>
diff --git a/bugbattle/src/main/res/values-de/strings.xml b/bugbattle/src/main/res/values-de/strings.xml
@@ -13,7 +13,7 @@
     <string name="report_priority_low">Leicht</string>
     <string name="report_priority_medium">Mittel</string>
     <string name="report_priority_high">Schwer</string>
-    <string name="report_loading">Bug report wird gesendet &#8230;</string>
+    <string name="report_loading">Bug Report wird gesendet &#8230;</string>
     <string name="report_done">Danke für deinen Bug report.</string>
     <string name="report_error">Ups, da ist etwas schief gelaufen.</string>
     <string name="policy">Ich akzeptiere die  &lt;font color="#019AE8"&gt;Datenschutzerklärung&lt;/font&gt;.</string>
diff --git a/bugbattle/src/main/res/values-v21/styles.xml b/bugbattle/src/main/res/values-v21/styles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.TranslucentBG" parent="Theme.AppCompat.Light">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="metaButtonBarStyle">?android:attr/buttonBarStyle</item>
+        <item name="metaButtonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
+        <item name="android:windowContentTransitions">true</item>
+    </style>
+</resources>
diff --git a/bugbattle/src/test/java/bugbattle/io/bugbattle/ExampleUnitTest.java b/bugbattle/src/test/java/bugbattle/io/bugbattle/ExampleUnitTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
+
 buildscript {
-    
+
     repositories {
         google()
         jcenter()
@@ -28,6 +29,7 @@ allprojects {
     }
 }
 
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,11 @@ public class MainApplication extends Application {`
`11`	`11`	`public void onCreate() {`
`12`	`12`	`super.onCreate();`
`13`	`13`	`BugBattleActivationMethod[] detectorList = {BugBattleActivationMethod.SHAKE, BugBattleActivationMethod.SCREENSHOT, BugBattleActivationMethod.THREE_FINGER_DOUBLE_TAB};`
`14`		`- BugBattle.initialise("U1FeTUrxnzbtB8ebJj2unNweR6pzgIWg", detectorList, this);`
`15`		`- BugBattle.enableReplay();`
	`14`	`+`
	`15`	`+ BugBattle.initialise("YOUR_APK_KEY", detectorList, this);`
	`16`	`+ BugBattle.setLanguage("deee");`
	`17`	`+ BugBattle.setPrivacyPolicyUrl("TESTURL.com");`
	`18`	`+ BugBattle.enablePrivacyPolicy(true);`
	`19`	`+ BugBattle.enableReplay();`
`16`	`20`	`}`
`17`	`21`	`}`