fixed android 8 windowIsTranslucent error

erxes · Nov 24, 2020 · b55bf5d · b55bf5d
1 parent dc76656
commit b55bf5d
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 10 deletions.
diff --git a/erxeslibrary/src/main/AndroidManifest.xml b/erxeslibrary/src/main/AndroidManifest.xml
@@ -19,30 +19,30 @@
         <activity
             android:name=".ui.faq.FaqDetailActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
+
             android:theme="@style/Theme_erxes_dialog" />
         <activity
             android:name=".ui.faq.FaqActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
+
             android:theme="@style/Theme_erxes_dialog" />
         <activity
             android:name=".ui.ErxesActivity"
             android:launchMode="singleTask"
             android:theme="@style/Theme_erxes_dialog"
-            android:screenOrientation="portrait"
+
             android:windowSoftInputMode="adjustResize|stateHidden"/>
         <activity
             android:name=".ui.conversations.ConversationListActivity"
             android:launchMode="singleTask"
             android:theme="@style/Theme_erxes_dialog"
-            android:screenOrientation="portrait"
+
             android:windowSoftInputMode="adjustResize|stateHidden"/>
         <activity
             android:name=".ui.message.MessageActivity"
             android:launchMode="singleTask"
             android:theme="@style/Theme_erxes_dialog"
-            android:screenOrientation="portrait"
+
             android:windowSoftInputMode="adjustResize|stateHidden" />
 
         <service android:name=".connection.service.ListenerService" />

diff --git a/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/helper/ErxesHelper.java b/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/helper/ErxesHelper.java
@@ -78,7 +78,8 @@ public static Point display_configure(AppCompatActivity context, View container,
         context.getWindow().setLayout(width, WindowManager.LayoutParams.MATCH_PARENT);
         Window window = context.getWindow();
         WindowManager.LayoutParams wlp = window.getAttributes();
-        window.setBackgroundDrawable(new ColorDrawable(Color.parseColor(color)));
+//        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        window.setBackgroundDrawableResource(R.color.black_10);
         wlp.gravity = Gravity.BOTTOM;
         wlp.flags &= ~WindowManager.LayoutParams.FLAG_DIM_BEHIND;
         window.setAttributes(wlp);

diff --git a/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/ui/ErxesActivity.java b/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/ui/ErxesActivity.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.os.Build;
 import android.os.Bundle;
 import com.google.android.material.snackbar.Snackbar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -45,6 +47,9 @@ public class ErxesActivity extends AppCompatActivity implements ErxesObserver {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         dataManager = DataManager.getInstance(this);
         config = Config.getInstance(this);
         erxesRequest = ErxesRequest.getInstance(config);

diff --git a/...ry/src/main/java/com/newmedia/erxeslibrary/ui/conversations/ConversationListActivity.java b/...ry/src/main/java/com/newmedia/erxeslibrary/ui/conversations/ConversationListActivity.java
@@ -3,9 +3,11 @@
 import android.app.Activity;
 import android.app.Service;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -155,6 +157,9 @@ public void notify(int returnType, String conversationId, String message, Object
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
         erxesRequest = ErxesRequest.getInstance(config);
         config = Config.getInstance(this);

diff --git a/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/ui/faq/FaqActivity.java b/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/ui/faq/FaqActivity.java
@@ -1,7 +1,9 @@
 package com.newmedia.erxeslibrary.ui.faq;
 
 import android.app.Service;
+import android.content.pm.ActivityInfo;
 import android.graphics.Point;
+import android.os.Build;
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -32,6 +34,9 @@ public class FaqActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         config = Config.getInstance(this);
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_faq);

diff --git a/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/ui/faq/FaqDetailActivity.java b/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/ui/faq/FaqDetailActivity.java
@@ -1,7 +1,9 @@
 package com.newmedia.erxeslibrary.ui.faq;
 
 import android.app.Service;
+import android.content.pm.ActivityInfo;
 import android.graphics.Point;
+import android.os.Build;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import android.text.Html;
@@ -42,6 +44,9 @@ public class FaqDetailActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         config = Config.getInstance(this);
         ErxesHelper.changeLanguage(this, config.language);
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);

diff --git a/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/ui/message/MessageActivity.java b/erxeslibrary/src/main/java/com/newmedia/erxeslibrary/ui/message/MessageActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.Service;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
@@ -71,6 +72,9 @@ public class MessageActivity extends AppCompatActivity implements ErxesObserver
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         config = Config.getInstance(this);
         erxesRequest = ErxesRequest.getInstance(config);
         ErxesHelper.changeLanguage(this, config.language);

diff --git a/erxeslibrary/src/main/res/values/colors.xml b/erxeslibrary/src/main/res/values/colors.xml
@@ -10,7 +10,7 @@
     <color name="messageBackground">#faf9fb</color>
     <color name="messageItemBG">#eaebed</color>
     <color name="gray_greetings">#f7f4f4</color>
-    <color name="black_10">#19000000</color>
+    <color name="black_10">#4D000000</color>
     <color name="vCallBlue">#3b85f4</color>
     <color name="roundedBlue">#6569DF</color>
     <color name="transparent">#00000000</color>
@@ -24,6 +24,6 @@
     <color name="md_grey_500">#9E9E9E</color>
     <color name="md_grey_600">#757575</color>
     <color name="md_grey_700">#616161</color>
-    <color name="gray_dark_transparent">#ae858585</color>
+    <color name="gray_dark_transparent">#AEFFFFFF</color>
 
 </resources>
diff --git a/erxeslibrary/src/main/res/values/styles.xml b/erxeslibrary/src/main/res/values/styles.xml
@@ -14,8 +14,11 @@
     <style name="Theme_erxes_dialog" parent="Theme.AppCompat.Light.Dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
-        <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowIsTranslucent">true</item>
+<!--        <item name="android:windowBackground">@android:color/transparent</item>-->
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:backgroundDimEnabled">false</item>
 
         <item name="colorPrimary">#5629B6</item>
         <item name="colorPrimaryDark">#5629B6</item>