add SDK Ver 8.9.4

voyagegroup · Jul 15, 2021 · 1f68d98 · 1f68d98
1 parent afbe31f
commit 1f68d98
Show file tree

Hide file tree

Showing 19 changed files with 114 additions and 124 deletions.
diff --git a/SampleApp/java/app/build.gradle b/SampleApp/java/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 ext {
-    fluctSdkVersion = '8.9.3'
+    fluctSdkVersion = '8.9.4'
 }
 
 android {

diff --git a/SampleApp/kotlin/app/build.gradle b/SampleApp/kotlin/app/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 ext {
-    fluctSdkVersion = '8.9.3'
+    fluctSdkVersion = '8.9.4'
 }
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "jp.fluct.sample.kotlin.sampleapp"

diff --git a/SampleApp/kotlin/app/src/main/AndroidManifest.xml b/SampleApp/kotlin/app/src/main/AndroidManifest.xml
@@ -19,8 +19,9 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:ignore="UnusedAttribute">
+        android:theme="@style/Theme.App"
+        tools:ignore="UnusedAttribute"
+        android:networkSecurityConfig="@xml/network_security_config">
         <activity android:name=".VideoInterstitialActivity"></activity>
         <!-- Required Google play services definition for using FluctSDK -->
         <meta-data

diff --git a/SampleApp/kotlin/app/src/main/res/color/button_background_tint.xml b/SampleApp/kotlin/app/src/main/res/color/button_background_tint.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="#F2F5F6" android:state_enabled="true"/>
+    <item android:color="#E2E8EA" android:state_enabled="false"/>
+
+</selector>
diff --git a/SampleApp/kotlin/app/src/main/res/drawable/button_background.xml b/SampleApp/kotlin/app/src/main/res/drawable/button_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@android:color/white"/>
+    <corners android:radius="4dp"/>
+
+</shape>
diff --git a/SampleApp/kotlin/app/src/main/res/layout/activity_main.xml b/SampleApp/kotlin/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background"
+    android:fillViewport="true"
     tools:context=".MainActivity">
 
     <LinearLayout
@@ -14,63 +14,47 @@
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingTop="@dimen/activity_vertical_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingBottom="@dimen/activity_vertical_margin">
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:clipToPadding="false">
 
         <!-- バナー広告 -->
 
         <Button
             android:id="@+id/btn_banner"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@color/menuBackground"
-            android:gravity="center_vertical"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
             android:text="@string/main_menu_banner"
-            android:textColor="@color/menuText"/>
+            style="@style/Widget.App.LargeButton"/>
 
         <!-- 動画リワード広告 -->
 
         <Button
             android:id="@+id/btn_rewardedvideo"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@color/menuBackground"
-            android:gravity="center_vertical"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
             android:text="@string/main_menu_rewardedvideo"
-            android:textColor="@color/menuText"/>
+            style="@style/Widget.App.LargeButton"/>
 
         <!-- 動画インタースティシャル広告 -->
 
         <Button
             android:id="@+id/btn_videointerstitial"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@color/menuBackground"
-            android:gravity="center_vertical"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
             android:text="@string/main_menu_videointerstitial"
-            android:textColor="@color/menuText"/>
+            style="@style/Widget.App.LargeButton"/>
 
         <!-- ネイティブ広告 -->
 
         <Button
             android:id="@+id/btn_native"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@color/menuBackground"
-            android:gravity="center_vertical"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:layout_height="wrap_content"
             android:text="@string/main_menu_ncr"
-            android:textColor="@color/menuText"/>
+            style="@style/Widget.App.LargeButton"/>
 
     </LinearLayout>
-</ScrollView>
+</ScrollView>
diff --git a/SampleApp/kotlin/app/src/main/res/layout/activity_native_ad_sample.xml b/SampleApp/kotlin/app/src/main/res/layout/activity_native_ad_sample.xml
@@ -9,46 +9,34 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        android:fillViewport="true">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-
-            android:layout_margin="@dimen/activity_horizontal_margin"
-            android:orientation="vertical">
+            android:padding="@dimen/activity_horizontal_margin"
+            android:orientation="vertical"
+            android:clipToPadding="false">
 
             <Button
                 android:id="@+id/btn_simple"
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
+                android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@color/menuBackground"
-                android:gravity="center_vertical"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/native_menu_simple"
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Button"
-                android:textColor="@color/menuText"/>
+                style="@style/Widget.App.LargeButton"/>
 
             <Button
                 android:id="@+id/btn_recycler"
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
+                android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@color/menuBackground"
-                android:gravity="center_vertical"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/native_menu_recycler"
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Button"
-                android:textColor="@color/menuText"/>
+                style="@style/Widget.App.LargeButton"/>
 
         </LinearLayout>
 

diff --git a/SampleApp/kotlin/app/src/main/res/layout/activity_rewardedvideo.xml b/SampleApp/kotlin/app/src/main/res/layout/activity_rewardedvideo.xml
@@ -24,15 +24,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="load"
-            tools:ignore="HardcodedText"/>
+            tools:ignore="HardcodedText"
+            android:layout_margin="8dp"/>
 
         <Button
             android:id="@+id/show_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Show"
-            tools:ignore="HardcodedText"/>
+            tools:ignore="HardcodedText"
+            android:layout_margin="8dp"/>
 
     </LinearLayout>
 

diff --git a/SampleApp/kotlin/app/src/main/res/layout/activity_video_interstitial.xml b/SampleApp/kotlin/app/src/main/res/layout/activity_video_interstitial.xml
@@ -24,15 +24,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="load"
-            tools:ignore="HardcodedText"/>
+            tools:ignore="HardcodedText"
+            android:layout_margin="8dp"/>
 
         <Button
             android:id="@+id/show_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Show"
-            tools:ignore="HardcodedText"/>
+            tools:ignore="HardcodedText"
+            android:layout_margin="8dp"/>
 
     </LinearLayout>
 

diff --git a/SampleApp/kotlin/app/src/main/res/layout/banner_activity.xml b/SampleApp/kotlin/app/src/main/res/layout/banner_activity.xml
@@ -7,31 +7,29 @@
     <Button
         android:id="@+id/impl_on_xml"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:gravity="center_vertical"
-        android:padding="@dimen/activity_horizontal_margin"
+        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:text="@string/impl_on_xml"/>
+        android:text="@string/impl_on_xml"
+        style="@style/Widget.App.LargeButton"/>
 
     <Button
         android:id="@+id/impl_on_recycler"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:gravity="center_vertical"
+        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
-        android:padding="@dimen/activity_horizontal_margin"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/impl_on_xml"
-        android:text="@string/impl_on_recycler"/>
+        android:text="@string/impl_on_recycler"
+        style="@style/Widget.App.LargeButton"/>
 
 </android.support.constraint.ConstraintLayout>
diff --git a/SampleApp/kotlin/app/src/main/res/values-w820dp/dimens.xml b/SampleApp/kotlin/app/src/main/res/values-w820dp/dimens.xml
diff --git a/SampleApp/kotlin/app/src/main/res/values/colors.xml b/SampleApp/kotlin/app/src/main/res/values/colors.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-
-    <color name="background">#FFFFFF</color>
-    <color name="menuBackground">#EEEEEE</color>
-    <color name="menuText">#222222</color>
+    <color name="appBackground">#FFFFFF</color>
 </resources>
diff --git a/SampleApp/kotlin/app/src/main/res/values/styles.xml b/SampleApp/kotlin/app/src/main/res/values/styles.xml
@@ -1,11 +1,25 @@
 <resources>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+    <style name="Theme.App" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">#1269F1</item>
+        <item name="colorPrimaryDark">#0D4CC6</item>
+        <item name="android:textColorPrimary">#041C33</item>
+        <item name="buttonStyle">@style/Widget.App.Button</item>
+        <item name="android:colorBackground">@color/appBackground</item>
     </style>
 
-</resources>
+    <style name="Widget.App.Button" parent="Widget.AppCompat.Button">
+        <item name="android:background">@drawable/button_background</item>
+        <item name="backgroundTint">@color/button_background_tint</item>
+    </style>
+
+    <style name="Widget.App.LargeButton" parent="Widget.App.Button">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:gravity">start|center_vertical</item>
+        <item name="android:paddingTop">32dp</item>
+        <item name="android:paddingBottom">32dp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+    </style>
+
+</resources>
diff --git a/SampleApp/kotlin/app/src/main/res/xml/network_security_config.xml b/SampleApp/kotlin/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    for debug:
+    - Allows user installed CA(s) always
+    - Allows cleartext (non-secure) traffic always
+-->
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="user"/>
+            <certificates src="system"/>
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/SampleApp/kotlin/build.gradle b/SampleApp/kotlin/build.gradle
@@ -14,7 +14,7 @@ buildscript {
     }
     dependencies {
         //noinspection GradleDependency
-        classpath 'com.android.tools.build:gradle:3.3.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
     }

diff --git a/SampleApp/kotlin/gradle/wrapper/gradle-wrapper.jar b/SampleApp/kotlin/gradle/wrapper/gradle-wrapper.jar
diff --git a/SampleApp/kotlin/gradle/wrapper/gradle-wrapper.properties b/SampleApp/kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists