Merge branch 'master' of https://github.com/bvlion/ShareBookmarks

app/build.gradle

@@ -123,7 +123,6 @@ dependencies {
     implementation "joda-time:joda-time:2.10.6"
     implementation "org.jsoup:jsoup:1.13.1"
     implementation "com.airbnb.android:lottie:3.7.0"
-    implementation "com.ibm.icu:icu4j:64.2"
 
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'androidx.test:core:1.3.0'

app/src/main/java/net/ambitious/android/sharebookmarks/data/local/item/ItemDao.kt

@@ -23,8 +23,12 @@ interface ItemDao {
   @Query("SELECT * FROM items WHERE parent_id = :parentId AND active = 1 ORDER BY `order`, upserted DESC")
   suspend fun getItems(parentId: Long): List<Item>
 
-  @Query("SELECT * FROM items WHERE url IS NOT NULL AND active = 1 AND (name LIKE :textH OR name LIKE :textK OR name LIKE :textKH OR name LIKE :textHKH) ORDER BY upserted DESC")
-  suspend fun getSearchItems(textH: String, textK: String, textKH: String, textHKH: String): List<Item>
+  @Query("SELECT * FROM items WHERE url IS NOT NULL AND active = 1 AND (name LIKE :textH OR name LIKE :textK OR name LIKE :textKH) ORDER BY upserted DESC")
+  suspend fun getSearchItems(
+    textH: String,
+    textK: String,
+    textKH: String
+  ): List<Item>
 
   @Query("SELECT * FROM items WHERE url IS NULL AND id != :selfId AND active = 1 AND owner_type IN (0, 1) ORDER BY `order`")
   suspend fun getFolderItems(selfId: Long): List<Item>

app/src/main/java/net/ambitious/android/sharebookmarks/ui/faq/FaqActivity.kt

@@ -54,7 +54,7 @@ class FaqActivity : BaseActivity(), FaqListAdapter.FaqClickListener {
   override fun onInquiryClick() {
     finish()
     startActivity(Intent(this, InquiryActivity::class.java))
-    overridePendingTransition(R.anim.fade_in_top, android.R.anim.fade_out)
+    overridePendingTransition(android.R.anim.fade_in, R.anim.fade_in_top)
   }
 
   override fun finish() {

app/src/main/java/net/ambitious/android/sharebookmarks/ui/home/HomeActivity.kt

@@ -20,6 +20,7 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.app.AppLaunchChecker
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.FragmentContainerView
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
@@ -287,7 +288,7 @@ class HomeActivity : BaseActivity(), OnNavigationItemSelectedListener,
               NotificationActivity::class.java
             )
           )
-          overridePendingTransition(R.anim.slide_in_left, R.anim.slide_in_right)
+          overridePendingTransition(android.R.anim.fade_in, R.anim.slide_in_left)
         }, 110)
       }
       R.id.menu_login -> {
@@ -330,7 +331,7 @@ class HomeActivity : BaseActivity(), OnNavigationItemSelectedListener,
         analyticsUtils.logMenuTap("other")
         Handler(Looper.getMainLooper()).postDelayed({
           forceUpdateActivityResult.launch(Intent(this@HomeActivity, OtherActivity::class.java))
-          overridePendingTransition(R.anim.slide_in_left, R.anim.slide_in_right)
+          overridePendingTransition(android.R.anim.fade_in, R.anim.slide_in_left)
         }, 110)
       }
       R.id.menu_app_rating -> {
@@ -360,14 +361,14 @@ class HomeActivity : BaseActivity(), OnNavigationItemSelectedListener,
               SettingActivity::class.java
             )
           )
-          overridePendingTransition(R.anim.slide_in_left, R.anim.slide_in_right)
+          overridePendingTransition(android.R.anim.fade_in, R.anim.slide_in_left)
         }, 110)
       }
       R.id.menu_how_to_use -> {
         analyticsUtils.logMenuTap("how to use")
         Handler(Looper.getMainLooper()).postDelayed({
           startActivity(UsageActivity.createIntent(this@HomeActivity))
-          overridePendingTransition(R.anim.slide_in_left, R.anim.slide_in_right)
+          overridePendingTransition(android.R.anim.fade_in, R.anim.slide_in_left)
         }, 110)
       }
     }
@@ -484,6 +485,18 @@ class HomeActivity : BaseActivity(), OnNavigationItemSelectedListener,
         View.GONE
       }
     }
+
+    binding.drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener {
+      override fun onDrawerSlide(drawerView: View, slideOffset: Float) {}
+
+      override fun onDrawerOpened(drawerView: View) {}
+
+      override fun onDrawerClosed(drawerView: View) {}
+
+      override fun onDrawerStateChanged(newState: Int) {
+        closeSearch()
+      }
+    })
   }
 
   private fun errorSnackbar() {

app/src/main/java/net/ambitious/android/sharebookmarks/ui/home/HomeViewModel.kt

@@ -6,7 +6,6 @@ import android.widget.ImageView
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.bumptech.glide.Glide
-import com.ibm.icu.text.Transliterator
 import net.ambitious.android.sharebookmarks.data.local.item.Item
 import net.ambitious.android.sharebookmarks.data.local.item.ItemDao
 import net.ambitious.android.sharebookmarks.data.remote.etc.EtcApi
@@ -69,9 +68,6 @@ class HomeViewModel(
 
   private val _breadcrumbsList = arrayListOf<Pair<Long, String>>()
 
-  private val transFH = Transliterator.getInstance("Fullwidth-Halfwidth")
-  private val transHK = Transliterator.getInstance("Hiragana-Katakana")
-
   fun setInitialParentId(parentId: Long?) {
     _parentId = parentId ?: 0L
   }
@@ -278,9 +274,8 @@ class HomeViewModel(
       } else {
         itemDao.getSearchItems(
           "%$text%",
-          "%${transHK.transliterate(text)}%",
-          "%${transFH.transliterate(text)}%",
-          "%${transFH.transliterate(transHK.transliterate(text))}%",
+          "%${OperationUtils.hiraganaToKatakana(text)}%",
+          "%${OperationUtils.kanaZenToHan(text)}%"
         )
       }
     )

app/src/main/java/net/ambitious/android/sharebookmarks/ui/notification/NotificationActivity.kt

@@ -49,7 +49,7 @@ class NotificationActivity : BaseActivity(), NotificationListAdapter.OnNotificat
 
   override fun finish() {
     super.finish()
-    overridePendingTransition(R.anim.slide_out_right, R.anim.slide_out_left)
+    overridePendingTransition(R.anim.slide_out_right, android.R.anim.fade_out)
   }
 
   override fun onRowClick(url: String) {

app/src/main/java/net/ambitious/android/sharebookmarks/ui/others/OtherActivity.kt

@@ -55,7 +55,7 @@ class OtherActivity : BaseActivity() {
 
   override fun finish() {
     super.finish()
-    overridePendingTransition(R.anim.slide_out_right, R.anim.slide_out_left)
+    overridePendingTransition(R.anim.slide_out_right, android.R.anim.fade_out)
   }
 
   fun termsOfUseShow() = true.apply {
@@ -65,7 +65,12 @@ class OtherActivity : BaseActivity() {
       setHomeAsUpIndicator(R.drawable.ic_clear_white)
     }
     supportFragmentManager.beginTransaction()
-      .setCustomAnimations(R.anim.fade_in_top, android.R.anim.fade_out, android.R.anim.fade_in, R.anim.fade_out_bottom_fragment)
+      .setCustomAnimations(
+        android.R.anim.fade_in,
+        R.anim.fade_in_top,
+        android.R.anim.fade_in,
+        R.anim.fade_out_bottom_fragment
+      )
       .replace(R.id.nav_host_fragment, DetailFragment.newInstance(true))
       .addToBackStack(null)
       .commit()
@@ -78,7 +83,12 @@ class OtherActivity : BaseActivity() {
       setHomeAsUpIndicator(R.drawable.ic_clear_white)
     }
     supportFragmentManager.beginTransaction()
-      .setCustomAnimations(R.anim.fade_in_top, android.R.anim.fade_out, android.R.anim.fade_in, R.anim.fade_out_bottom_fragment)
+      .setCustomAnimations(
+        android.R.anim.fade_in,
+        R.anim.fade_in_top,
+        android.R.anim.fade_in,
+        R.anim.fade_out_bottom_fragment
+      )
       .replace(R.id.nav_host_fragment, DetailFragment.newInstance(false))
       .addToBackStack(null)
       .commit()

app/src/main/java/net/ambitious/android/sharebookmarks/ui/others/OtherFragment.kt

@@ -57,7 +57,7 @@ class OtherFragment : PreferenceFragmentCompat() {
     preferenceScreen.findPreference<Preference>(QUESTIONS)?.setOnPreferenceClickListener {
       analyticsUtils.logOtherTap("Other", "inquiry")
       startActivity(Intent(context, FaqActivity::class.java))
-      activity?.overridePendingTransition(R.anim.fade_in_top, android.R.anim.fade_out)
+      activity?.overridePendingTransition(android.R.anim.fade_in, R.anim.fade_in_top)
       true
     }
   }

app/src/main/java/net/ambitious/android/sharebookmarks/ui/setting/SettingActivity.kt

@@ -15,6 +15,6 @@ class SettingActivity : BaseActivity() {
 
   override fun finish() {
     super.finish()
-    overridePendingTransition(R.anim.slide_out_right, R.anim.slide_out_left)
+    overridePendingTransition(R.anim.slide_out_right, android.R.anim.fade_out)
   }
 }

app/src/main/java/net/ambitious/android/sharebookmarks/ui/usage/UsageActivity.kt

@@ -43,7 +43,7 @@ class UsageActivity : BaseActivity() {
     if (fromDialog) {
       overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
     } else {
-      overridePendingTransition(R.anim.slide_out_right, R.anim.slide_out_left)
+      overridePendingTransition(R.anim.slide_out_right, android.R.anim.fade_out)
     }
   }
 

app/src/main/java/net/ambitious/android/sharebookmarks/util/OperationUtils.kt

@@ -102,6 +102,47 @@ object OperationUtils {
     return contactList
   }
 
+  fun hiraganaToKatakana(str: String) =
+    str.map {
+      if (it.code in 0x3041..0x3093) {
+        it + 0x60
+      } else {
+        it
+      }
+    }.joinToString("")
+
+  fun kanaZenToHan(str: String) =
+    hiraganaToKatakana(str)
+      .map {
+        if (it.code in ZEN[0].code..ZEN.last().code) {
+          HAN[it.code - ZEN[0].code]
+        } else {
+          it
+        }
+      }.joinToString("")
+
+  private val ZEN = listOf(
+    'ァ', 'ア', 'ィ', 'イ', 'ゥ',
+    'ウ', 'ェ', 'エ', 'ォ', 'オ', 'カ', 'ガ', 'キ', 'ギ', 'ク', 'グ', 'ケ', 'ゲ',
+    'コ', 'ゴ', 'サ', 'ザ', 'シ', 'ジ', 'ス', 'ズ', 'セ', 'ゼ', 'ソ', 'ゾ', 'タ',
+    'ダ', 'チ', 'ヂ', 'ッ', 'ツ', 'ヅ', 'テ', 'デ', 'ト', 'ド', 'ナ', 'ニ', 'ヌ',
+    'ネ', 'ノ', 'ハ', 'バ', 'パ', 'ヒ', 'ビ', 'ピ', 'フ', 'ブ', 'プ', 'ヘ', 'ベ',
+    'ペ', 'ホ', 'ボ', 'ポ', 'マ', 'ミ', 'ム', 'メ', 'モ', 'ャ', 'ヤ', 'ュ', 'ユ',
+    'ョ', 'ヨ', 'ラ', 'リ', 'ル', 'レ', 'ロ', 'ヮ', 'ワ', 'ヰ', 'ヱ', 'ヲ', 'ン',
+    'ヴ', 'ヵ', 'ヶ'
+  )
+
+  private val HAN = listOf(
+    "ｧ", "ｱ", "ｨ", "ｲ", "ｩ",
+    "ｳ", "ｪ", "ｴ", "ｫ", "ｵ", "ｶ", "ｶﾞ", "ｷ", "ｷﾞ", "ｸ", "ｸﾞ", "ｹ",
+    "ｹﾞ", "ｺ", "ｺﾞ", "ｻ", "ｻﾞ", "ｼ", "ｼﾞ", "ｽ", "ｽﾞ", "ｾ", "ｾﾞ", "ｿ",
+    "ｿﾞ", "ﾀ", "ﾀﾞ", "ﾁ", "ﾁﾞ", "ｯ", "ﾂ", "ﾂﾞ", "ﾃ", "ﾃﾞ", "ﾄ", "ﾄﾞ",
+    "ﾅ", "ﾆ", "ﾇ", "ﾈ", "ﾉ", "ﾊ", "ﾊﾞ", "ﾊﾟ", "ﾋ", "ﾋﾞ", "ﾋﾟ", "ﾌ",
+    "ﾌﾞ", "ﾌﾟ", "ﾍ", "ﾍﾞ", "ﾍﾟ", "ﾎ", "ﾎﾞ", "ﾎﾟ", "ﾏ", "ﾐ", "ﾑ", "ﾒ",
+    "ﾓ", "ｬ", "ﾔ", "ｭ", "ﾕ", "ｮ", "ﾖ", "ﾗ", "ﾘ", "ﾙ", "ﾚ", "ﾛ", "ﾜ",
+    "ﾜ", "ｲ", "ｴ", "ｦ", "ﾝ", "ｳﾞ", "ｶ", "ｹ"
+  )
+
   private fun getUserImage(contentResolver: ContentResolver, contactId: Long) =
     Contacts.openContactPhotoInputStream(
       contentResolver,

app/src/main/res/anim/fade_in_top.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
   <translate android:fromYDelta="20%p" android:toYDelta="0"
-    android:duration="@android:integer/config_mediumAnimTime"/>
-  <alpha
-    android:interpolator="@android:interpolator/accelerate_quad"
-    android:fromAlpha="0.0" android:toAlpha="1.0"
-    android:duration="@android:integer/config_longAnimTime" />
+    android:duration="@android:integer/config_shortAnimTime"/>
 </set>

app/src/main/res/anim/fade_out_bottom.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
   <translate android:fromYDelta="0" android:toYDelta="50%p"
-    android:duration="@android:integer/config_mediumAnimTime"/>
+    android:duration="@android:integer/config_shortAnimTime"/>
   <alpha
     android:interpolator="@android:interpolator/accelerate_quad"
     android:fromAlpha="1.0" android:toAlpha="0.0"
-    android:duration="@android:integer/config_longAnimTime" />
+    android:duration="@android:integer/config_shortAnimTime" />
 </set>

app/src/main/res/anim/fade_out_bottom_fragment.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
   <translate android:fromYDelta="0" android:toYDelta="100%p"
-    android:duration="@android:integer/config_mediumAnimTime"/>
+    android:duration="@android:integer/config_shortAnimTime"/>
   <alpha
     android:interpolator="@android:interpolator/accelerate_quad"
     android:fromAlpha="1.0" android:toAlpha="0.0"
-    android:duration="@android:integer/config_longAnimTime" />
+    android:duration="@android:integer/config_shortAnimTime" />
 </set>

app/src/main/res/anim/slide_in_left.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-  <translate android:fromXDelta="-100%p" android:toXDelta="0"
-    android:duration="@android:integer/config_mediumAnimTime"/>
+  <translate android:fromXDelta="0" android:toXDelta="100%p"
+    android:duration="@android:integer/config_shortAnimTime"/>
 </set>

app/src/main/res/anim/slide_out_right.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
   <translate android:fromXDelta="100%p" android:toXDelta="0"
-    android:duration="@android:integer/config_mediumAnimTime"/>
+    android:duration="@android:integer/config_shortAnimTime"/>
 </set>

app/src/main/res/values-ja/strings.xml

@@ -140,7 +140,7 @@
     <string name="all_sync_dialog_title">全データ更新を行います</string>
     <string name="all_sync_dialog_subject">この機能は緊急用です。\n管理者より案内がない場合は使用をお控えください。\n\n端末のデータを全て削除し、サーバーから全データを取得しますか？</string>
     <string name="all_sync_dialog_exec">理解のうえで実行</string>
-    <string name="communication_error">読み込みに失敗しました。\n通信化環境をご確認ください。</string>
+    <string name="communication_error">読み込みに失敗しました。\nWi-Fi やモバイル通信の状況をご確認下さい。</string>
 
     <!-- 使い方 -->
     <string name="how_to_use_text_main_1">このアプリがあれば、いつも使っているレシピもお気に入りのサイトも画像付きで自由に保存してシェア（共有）できます！</string>

app/src/main/res/values/strings.xml

@@ -140,7 +140,7 @@
     <string name="all_sync_dialog_title">Update all data</string>
     <string name="all_sync_dialog_subject">This feature is for emergency use only.\nPlease refrain from using it unless you are informed by the administrator.\n\nDo you want to delete all data on the device and get all data from the server?</string>
     <string name="all_sync_dialog_exec">Execute with understanding</string>
-    <string name="communication_error">Failed to load.\nPlease check your communication environment.</string>
+    <string name="communication_error">Failed to load.\nPlease check the status of your Wi-Fi and mobile communications.</string>
 
     <!-- 使い方 -->
     <string name="how_to_use_text_main_1">With this app, you\'re free to save and share both your regular recipes and your favorite sites, complete with images!</string>

app/src/test/java/net/ambitious/android/sharebookmarks/util/OperationUtilsUnitTest.kt

@@ -32,8 +32,8 @@ class OperationUtilsUnitTest {
   fun createThumbnailUrlTest() {
     // favicon 取得 URL 生成
     assertThat(
-        OperationUtils.createThumbnailUrl("https://bvlion-app.firebaseapp.com"),
-        `is`("${Const.GOOGLE_FAVICON_URL}bvlion-app.firebaseapp.com")
+      OperationUtils.createThumbnailUrl("https://bvlion-app.firebaseapp.com"),
+      `is`("${Const.GOOGLE_FAVICON_URL}bvlion-app.firebaseapp.com")
     )
 
     // null
@@ -54,8 +54,8 @@ class OperationUtilsUnitTest {
     runBlocking {
       // OGP 取得
       assertThat(
-          OperationUtils.getOgpImage("https://www.ambitious-i.net", etcApi),
-          `is`("https://www.ambitious-i.net/img/main.jpg")
+        OperationUtils.getOgpImage("https://www.ambitious-i.net", etcApi),
+        `is`("https://www.ambitious-i.net/img/main.jpg")
       )
 
       // URL 形式でない