撤消造成错误的about修改

Author: ztc1997

app/src/main/kotlin/com/rayfantasy/icode/ui/fragment/AboutFragment.kt

@@ -9,21 +9,16 @@ import com.rayfantasy.icode.R
 import kotlinx.android.synthetic.main.fragment_about.*
 
 
-class AboutFragment : PreferenceFragment() {
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        addPreferencesFromResource(R.xml.about)
-        val OSWeb = findPreference("OSWeb")
-        OSWeb.onPreferenceClickListener = OnPreferenceClickListener {
-            var uri = Uri.parse("https://github.com/RayFantasyStudio/iCode-Android")
-            var intent = Intent(Intent.ACTION_VIEW, uri)
-            startActivity(intent)
-            true
-        }
+class AboutFragment : FragmentBase() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        // Inflate the layout for this fragment
+        /*AboutFragment_iv_version?.text = getVersion()*/
+        return inflater.inflate(R.layout.fragment_about, container, false)
     }
 
     override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        
+        tv_version.text = getString(R.string.version, BuildConfig.VERSION_NAME)
     }
 }

app/src/main/kotlin/com/rayfantasy/icode/ui/fragment/SettingFragment.kt

@@ -58,7 +58,6 @@ class SettingFragment : PreferenceFragment() {
             LicensesDialog.Builder(activity).setNotices(R.raw.licenses).setIncludeOwnLicense(true).build().show()
             true
         }
-        S_pref_ver.text = getString(R.string.version, BuildConfig.VERSION_NAME)
         highlight = findPreference(PREF_HIGHLIGHT) as ListPreference
         highlight.entries = highlightThemes
         highlight.entryValues = highlightThemes

app/src/main/res/layout/fragment_about.xml

@@ -5,12 +5,12 @@
     tools:context=".ui.fragment.AboutFragment">
 
     <ImageView
-        android:layout_width="185dp"
-        android:layout_height="185dp"
-        android:id="@+id/AboutFragment_iv"
-        android:src="@mipmap/ic_studio"
-        android:layout_gravity="center_horizontal|top"
-        android:layout_marginTop="30dp" />
+			android:layout_width="185dp"
+			android:layout_height="185dp"
+			android:id="@+id/AboutFragment_iv"
+			android:src="@mipmap/ic_launcher"
+			android:layout_gravity="center_horizontal|top"
+			android:layout_marginTop="30dp"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -28,11 +28,4 @@
             android:id="@+id/tv_version"
             android:layout_gravity="center"
             android:layout_marginTop="50dp" />
-	<android.support.v7.widget.AppCompatButton
-		android:id="@+id/_btn"
-		android:layout_height="wrap_content"
-		android:padding="12dp"
-		android:text="@string/login"
-		android:layout_marginTop="10dp"
-		android:layout_width="match_parent"/>
 </FrameLayout>

app/src/main/res/mipmap-hdpi/studio.jpg

@@ -133,24 +133,10 @@
     <string name="exit">退出</string>
 
     <!--自动更新-->
-	<string name="T_pref_ver">版本号</string>
-	<string name="S_pref_ver">Null</string>
     <string name="repo_download_failed_http">Downloading %1$s failed: %2$d (%3$s)</string>
     <string name="repo_download_failed">Downloading %1$s failed: %2$s</string>
     <string name="title_new_version">发现新版本：%1$s</string>
     <string name="msg_new_version">%1$s\n\n大小：%2$s</string>
     <string name="positive_new_version">更新</string>
-	
-	<!--团队、作者-->
-	<string name="S_OSWeb">查看开源项目</string>
-	<string name="T_OSWeb">点击查看开源项目</string>
-	<string name="pref_studio">团队</string>
-	<string name="pref_member">作者</string>
-	<string name="S_author_ztc">ztc1997</string>
-	<string name="T_author_ztc">Alex Zhang</string>
-	<string name="S_author_dzh">Takayama</string>
-	<string name="T_author_dzh">Allen Tom</string>
-	<string name="S_author_fjy">LolliKit</string>
-	<string name="T_author_fjy">JunyuanFeng</string>
 
 </resources>

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

@@ -1,12 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <PreferenceScreen xmlns:android='http://schemas.android.com/apk/res/android'>
-	<com.rayfantasy.icode.ui.preference.PreferenceCategory android:title='@string/action_settings'>
-        <Preference
-			android:key="pref_ver"
-			android:summary="@string/S_pref_ver"
-			android:title="@string/S_pref_ver"/>
-    </com.rayfantasy.icode.ui.preference.PreferenceCategory>
-	
     <com.rayfantasy.icode.ui.preference.PreferenceCategory android:title='@string/action_settings'>
         <Preference
                 android:key="pref_clear_cache"