MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move AboutCardRow to components package

Browse Source
This commit is contained in:
topjohnwu 2017-02-13 03:12:10 +08:00
parent 44b0d4127c
commit 958c95732b
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
View File

@ -16,6 +16,7 @@ import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.TextView; import android.widget.TextView;
import com.topjohnwu.magisk.components.AboutCardRow;
import com.topjohnwu.magisk.components.Activity; import com.topjohnwu.magisk.components.Activity;
import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Logger;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;

4
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View File

@ -229,10 +229,10 @@ public class SettingsActivity extends Activity {
getApplication().suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1); getApplication().suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
break; break;
case "developer_logging": case "developer_logging":
getApplication().devLogging = prefs.getBoolean("developer_logging", false); MagiskManager.devLogging = prefs.getBoolean("developer_logging", false);
break; break;
case "shell_logging": case "shell_logging":
getApplication().shellLogging = prefs.getBoolean("shell_logging", false); MagiskManager.shellLogging = prefs.getBoolean("shell_logging", false);
break; break;
} }
setSummary(); setSummary();

4
app/src/main/java/com/topjohnwu/magisk/AboutCardRow.java → app/src/main/java/com/topjohnwu/magisk/components/AboutCardRow.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.topjohnwu.magisk; package com.topjohnwu.magisk.components;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
@ -26,6 +26,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.topjohnwu.magisk.R;
/** /**
* @author dvdandroid * @author dvdandroid
*/ */

14
app/src/main/res/layout/activity_about.xml
View File

@ -56,35 +56,35 @@
android:textAppearance="@style/TextAppearance.AppCompat.Headline"/> android:textAppearance="@style/TextAppearance.AppCompat.Headline"/>
</LinearLayout> </LinearLayout>
<com.topjohnwu.magisk.AboutCardRow <com.topjohnwu.magisk.components.AboutCardRow
android:id="@+id/app_version_info" android:id="@+id/app_version_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_info_outline" app:icon="@drawable/ic_info_outline"
app:text="@string/app_version"/> app:text="@string/app_version"/>
<com.topjohnwu.magisk.AboutCardRow <com.topjohnwu.magisk.components.AboutCardRow
android:id="@+id/app_changelog" android:id="@+id/app_changelog"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_history" app:icon="@drawable/ic_history"
app:text="@string/app_changelog"/> app:text="@string/app_changelog"/>
<com.topjohnwu.magisk.AboutCardRow <com.topjohnwu.magisk.components.AboutCardRow
android:id="@+id/app_developers" android:id="@+id/app_developers"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_person" app:icon="@drawable/ic_person"
app:text="@string/app_developers"/> app:text="@string/app_developers"/>
<com.topjohnwu.magisk.AboutCardRow <com.topjohnwu.magisk.components.AboutCardRow
android:id="@+id/app_translators" android:id="@+id/app_translators"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_language" app:icon="@drawable/ic_language"
app:text="@string/app_translators"/> app:text="@string/app_translators"/>
<com.topjohnwu.magisk.AboutCardRow <com.topjohnwu.magisk.components.AboutCardRow
android:id="@+id/app_source_code" android:id="@+id/app_source_code"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -109,14 +109,14 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:orientation="vertical"> android:orientation="vertical">
<com.topjohnwu.magisk.AboutCardRow <com.topjohnwu.magisk.components.AboutCardRow
android:id="@+id/support_thread" android:id="@+id/support_thread"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_xda" app:icon="@drawable/ic_xda"
app:text="@string/support_thread"/> app:text="@string/support_thread"/>
<com.topjohnwu.magisk.AboutCardRow <com.topjohnwu.magisk.components.AboutCardRow
android:id="@+id/donation" android:id="@+id/donation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"