Merge pull request #3 from bmarty/bma/fix_crash

Fix crash with Emoji

app/build.gradle

@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "org.billcarsonfr.jsonviewerexample"
         minSdkVersion 19
-        targetSdkVersion 30
+        targetSdkVersion 31
         multiDexEnabled true
         versionCode 1
         versionName "1.0"
@@ -25,34 +25,35 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    buildFeatures {
+        viewBinding true
     }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation 'androidx.multidex:multidex:2.0.1'
 
 
-
 //=== ADD IN YOUR PROJECT
     // Epoxy dependency
-    implementation("com.airbnb.android:epoxy:$epoxy_version")
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "com.airbnb.android:epoxy:$epoxy_version"
     kapt "com.airbnb.android:epoxy-processor:$epoxy_version"
-    implementation 'com.airbnb.android:mavericks:2.4.0'
+    implementation 'com.airbnb.android:mavericks:2.5.0'
 // ============
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation project(path: ':jsonviewer')
 }

app/src/main/AndroidManifest.xml

@@ -13,7 +13,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/org/billcarsonfr/jsonviewerexample/ChooseSampleFragment.kt

@@ -5,8 +5,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import androidx.fragment.app.Fragment
+import org.billcarsonfr.jsonviewerexample.databinding.FragmentChooseSampleBinding
 
 /**
  * Activities that contain this fragment must implement the
@@ -16,42 +16,30 @@ import androidx.fragment.app.Fragment
  * create an instance of this fragment.
  */
 class ChooseSampleFragment : Fragment() {
-
-
     private var mListener: OnFragmentMainNavigationListener? = null
 
-    lateinit var showWrappedButton: Button
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
+    private lateinit var viewBinding: FragmentChooseSampleBinding
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_choose_sample, container, false).also { view ->
-            view.findViewById<Button>(R.id.showWrappedViewer)?.let {
-                it.setOnClickListener {
-                    mListener?.navigateToWrapSample(true)
-                }
-
-                view.findViewById<Button>(R.id.showWrappedViewerScroll)?.let {
-                    it.setOnClickListener {
-                        mListener?.navigateToWrapSample(false)
-                    }
-                }
-
+    ): View {
+        viewBinding = FragmentChooseSampleBinding.inflate(inflater, container, false)
+        return viewBinding.root
+    }
 
-                view.findViewById<Button>(R.id.showAsBottomSheet)?.let {
-                    it.setOnClickListener {
-                        mListener?.navigateToDialog()
-                    }
-                }
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewBinding.showWrappedViewer.setOnClickListener {
+            mListener?.navigateToSample(wrap = true)
+        }
 
+        viewBinding.showWrappedViewerScroll.setOnClickListener {
+            mListener?.navigateToSample(wrap = false)
+        }
 
-            }
+        viewBinding.showAsBottomSheet.setOnClickListener {
+            mListener?.navigateToDialog()
         }
     }
 
@@ -79,7 +67,7 @@ class ChooseSampleFragment : Fragment() {
      * See the Android Training lesson [Communicating with Other Fragments](http://developer.android.com/training/basics/fragments/communicating.html) for more information.
      */
     interface OnFragmentMainNavigationListener {
-        fun navigateToWrapSample(wrap: Boolean)
+        fun navigateToSample(wrap: Boolean)
         fun navigateToDialog()
     }
 
@@ -88,5 +76,4 @@ class ChooseSampleFragment : Fragment() {
             return ChooseSampleFragment()
         }
     }
-
 }

app/src/main/java/org/billcarsonfr/jsonviewerexample/MainActivity.kt

@@ -3,6 +3,7 @@ package org.billcarsonfr.jsonviewerexample
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.annotation.RawRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.forEach
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
@@ -25,43 +26,29 @@ class MainActivity : AppCompatActivity(), ChooseSampleFragment.OnFragmentMainNav
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.sample1 -> loadSample(R.raw.sample1)
+            R.id.sample2 -> loadSample(R.raw.sample2)
+            R.id.sample3 -> loadSample(R.raw.sample3)
+            R.id.sample4 -> loadSample(R.raw.sample4)
+            R.id.sample5 -> loadSample(R.raw.sample5)
+            R.id.sample6 -> loadSample(R.raw.sample6)
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun loadSample(@RawRes sampleId: Int): Boolean {
         val jsonViewerFragment =
             supportFragmentManager.findFragmentByTag("JSONVIEWER") as? JSonViewerFragment
-        when (item.itemId) {
-            R.id.sample1 -> {
-                val sample = resources.openRawResource(R.raw.sample1)
-                    .bufferedReader().use { it.readText() }
-                jsonViewerFragment?.showJson(sample, -1)
-            }
-            R.id.sample2 -> {
-                val sample = resources.openRawResource(R.raw.sample2)
-                    .bufferedReader().use { it.readText() }
-                jsonViewerFragment?.showJson(sample, -1)
-
-            }
-            R.id.sample3 -> {
-                val sample = resources.openRawResource(R.raw.sample3)
-                    .bufferedReader().use { it.readText() }
-                jsonViewerFragment?.showJson(sample, -1)
-
-            }
-            R.id.sample4 -> {
-                val sample = resources.openRawResource(R.raw.sample4)
-                    .bufferedReader().use { it.readText() }
-                jsonViewerFragment?.showJson(sample, -1)
 
-            }
-            R.id.sample5 -> {
-                val sample = resources.openRawResource(R.raw.sample5)
-                    .bufferedReader().use { it.readText() }
-                jsonViewerFragment?.showJson(sample, -1)
-
-            }
-        }
-        return super.onOptionsItemSelected(item)
+        val sample = resources.openRawResource(sampleId)
+            .bufferedReader()
+            .use { it.readText() }
+        jsonViewerFragment?.showJson(sample, -1)
+        return true
     }
 
-    override fun navigateToWrapSample(wrap: Boolean) {
+    override fun navigateToSample(wrap: Boolean) {
         val sample = resources.openRawResource(R.raw.sample1)
             .bufferedReader().use { it.readText() }
         supportFragmentManager.beginTransaction()
@@ -100,5 +87,4 @@ class MainActivity : AppCompatActivity(), ChooseSampleFragment.OnFragmentMainNav
                 .commit()
         }
     }
-
 }

app/src/main/res/menu/samples.xml

@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="HardcodedText">
     <item
         android:id="@+id/sample1"
-        android:title="sample 1"/>
-
+        android:title="sample 1" />
     <item
         android:id="@+id/sample2"
-        android:title="sample 2"/>
+        android:title="sample 2" />
     <item
         android:id="@+id/sample3"
-        android:title="sample 3"/>
+        android:title="sample 3" />
     <item
         android:id="@+id/sample4"
-        android:title="sample 4"/>
+        android:title="sample 4" />
     <item
         android:id="@+id/sample5"
-        android:title="sample 5"/>
+        android:title="sample 5" />
+    <item
+        android:id="@+id/sample6"
+        android:title="Emoji" />
 </menu>

app/src/main/res/raw/sample6.json

@@ -0,0 +1,4 @@
+{
+  "emoji1": "\uD83D\uDE2E\u200D\uD83D\uDCA8",
+  "emoji2": "😮‍💨"
+}

build.gradle

@@ -1,15 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.31'
-    ext.epoxy_version = '4.4.2'
+    ext.kotlin_version = '1.5.31'
+    ext.epoxy_version = '4.6.2'
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -21,8 +20,8 @@ buildscript {
 allprojects {
     repositories {
         google()
+        mavenCentral()
         jcenter()
-
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

jsonviewer/build.gradle

@@ -5,13 +5,11 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'com.jakewharton.butterknife'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 31
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -25,33 +23,32 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "11"
     }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
 
     // Epoxy dependency
     implementation "com.airbnb.android:epoxy:$epoxy_version"
     kapt "com.airbnb.android:epoxy-processor:$epoxy_version"
-    implementation 'com.airbnb.android:mavericks:2.4.0'
+    implementation 'com.airbnb.android:mavericks:2.5.0'
     // Span utils
     implementation 'me.gujun.android:span:1.7'
-    implementation 'com.google.android.material:material:1.4.0-alpha01'
+    implementation 'com.google.android.material:material:1.6.0-alpha01'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
 
     testImplementation 'org.json:json:20190722'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }