diff --git a/app/build.gradle b/app/build.gradle index a041b9c..7916f0b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.github.kr328.clash" minSdkVersion 24 targetSdkVersion 29 - versionCode 1 - versionName "1.0" + versionCode 10001 + versionName "1.0.1-alpha" } buildTypes { release { diff --git a/app/src/main/java/com/github/kr328/clash/FeedbackActivity.kt b/app/src/main/java/com/github/kr328/clash/FeedbackActivity.kt index b93b9d4..f23d1e1 100644 --- a/app/src/main/java/com/github/kr328/clash/FeedbackActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/FeedbackActivity.kt @@ -1,10 +1,12 @@ package com.github.kr328.clash import android.os.Bundle +import androidx.annotation.Keep import androidx.preference.PreferenceFragmentCompat import kotlinx.android.synthetic.main.activity_feedback.* class FeedbackActivity : BaseActivity() { + @Keep class Fragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.feedback, rootKey) diff --git a/app/src/main/java/com/github/kr328/clash/SettingApplicationActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingApplicationActivity.kt index 13c6a2e..143cf53 100644 --- a/app/src/main/java/com/github/kr328/clash/SettingApplicationActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/SettingApplicationActivity.kt @@ -4,6 +4,7 @@ import android.content.ComponentName import android.content.Context import android.content.pm.PackageManager import android.os.Bundle +import androidx.annotation.Keep import androidx.preference.CheckBoxPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat @@ -16,6 +17,7 @@ class SettingApplicationActivity : BaseActivity() { const val KEY_START_ON_BOOT = "key_application_start_on_boot" } + @Keep class Fragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.setting_application, rootKey) diff --git a/app/src/main/java/com/github/kr328/clash/SettingMainActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingMainActivity.kt index 4bcb48c..d8b1ae5 100644 --- a/app/src/main/java/com/github/kr328/clash/SettingMainActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/SettingMainActivity.kt @@ -1,10 +1,12 @@ package com.github.kr328.clash import android.os.Bundle +import androidx.annotation.Keep import androidx.preference.PreferenceFragmentCompat import kotlinx.android.synthetic.main.activity_setting_main.* class SettingMainActivity : BaseActivity() { + @Keep class Fragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.setting_main, rootKey) diff --git a/app/src/main/java/com/github/kr328/clash/SettingProxyActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingProxyActivity.kt index f6da6ce..4a5cd1a 100644 --- a/app/src/main/java/com/github/kr328/clash/SettingProxyActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/SettingProxyActivity.kt @@ -3,6 +3,7 @@ package com.github.kr328.clash import android.content.Context import android.os.Bundle import android.view.View +import androidx.annotation.Keep import androidx.core.content.edit import androidx.preference.CheckBoxPreference import androidx.preference.PreferenceFragmentCompat @@ -14,6 +15,7 @@ class SettingProxyActivity : BaseActivity() { private const val KEY_IPV6_SUPPORT = "key_vpn_setting_ipv6_support" } + @Keep class Fragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.setting_proxy, rootKey) diff --git a/app/src/main/java/com/github/kr328/clash/adapter/LogAdapter.kt b/app/src/main/java/com/github/kr328/clash/adapter/LogAdapter.kt index 68508e2..d728a19 100644 --- a/app/src/main/java/com/github/kr328/clash/adapter/LogAdapter.kt +++ b/app/src/main/java/com/github/kr328/clash/adapter/LogAdapter.kt @@ -14,7 +14,7 @@ import java.util.* class LogAdapter(private val content: Context, private val buffer: CircularArray) : RecyclerView.Adapter() { - private val formatter = SimpleDateFormat("hh:MM:ss", Locale.getDefault()) + private val formatter = SimpleDateFormat("HH:mm:ss", Locale.getDefault()) class Holder(view: View) : RecyclerView.ViewHolder(view) { val type: TextView = view.findViewById(R.id.adapter_log_type)