Remove QQ Group

SchoolPower · Jul 14, 2019 · 56dfeb1 · 56dfeb1
1 parent 715e016
commit 56dfeb1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":26,"versionName":"1.5.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":27,"versionName":"1.5.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/java/com/carbonylgroup/schoolpower/fragments/AboutFragment.kt b/app/src/main/java/com/carbonylgroup/schoolpower/fragments/AboutFragment.kt
@@ -69,10 +69,10 @@ class AboutFragment : Fragment() {
         view.findViewById<View>(R.id.about_website_cell).setOnClickListener {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.website_address))))
         }
-
+/*
         view.findViewById<View>(R.id.about_qq_cell).setOnClickListener {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.qq_group_address))))
-        }
+        }*/
 
         view.findViewById<View>(R.id.about_code_cell).setOnClickListener {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.source_code_address))))

diff --git a/app/src/main/java/com/carbonylgroup/schoolpower/fragments/SettingsFragment.kt b/app/src/main/java/com/carbonylgroup/schoolpower/fragments/SettingsFragment.kt
@@ -104,11 +104,11 @@ class SettingsFragment : PreferenceFragmentCompat(),
         findPreference("website").onPreferenceClickListener = Preference.OnPreferenceClickListener {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.website_address))))
             true
-        }
+        }/*
         findPreference("qq_group").onPreferenceClickListener = Preference.OnPreferenceClickListener {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.qq_group_address))))
             true
-        }
+        }*/
         findPreference("source_code").onPreferenceClickListener = Preference.OnPreferenceClickListener {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.source_code_address))))
             true

diff --git a/app/src/main/res/layout/about_content.xml b/app/src/main/res/layout/about_content.xml
@@ -576,7 +576,7 @@
                     </LinearLayout>
 
                 </LinearLayout>
-
+<!--
                 <LinearLayout
                     android:id="@+id/about_qq_cell"
                     android:layout_width="match_parent"
@@ -600,7 +600,6 @@
                         android:scaleType="centerInside"
                         android:tint="?android:textColorPrimary"
                         android:src="@drawable/ic_qq_feedback" />
-
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -622,9 +621,8 @@
                             android:textColor="?android:textColorPrimary" />
 
                     </LinearLayout>
-
                 </LinearLayout>
-
+-->
                 <LinearLayout
                     android:id="@+id/about_code_cell"
                     android:layout_width="match_parent"

diff --git a/app/src/main/res/xml/preferences_content.xml b/app/src/main/res/xml/preferences_content.xml
@@ -147,10 +147,11 @@
             android:key="website"
             android:title="@string/visit_website" />
 
+        <!--
         <PreferenceScreen
             android:icon="@drawable/ic_qq_feedback"
             android:key="qq_group"
-            android:title="@string/qq_group" />
+            android:title="@string/qq_group" />-->
 
         <PreferenceScreen
             android:icon="@drawable/ic_code_black_24dp"