From 3681177be4f82c6875e9472c76901f6ed318cb3e Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 25 Jan 2017 17:07:23 +0800 Subject: [PATCH] Rename fragment layouts --- app/build.gradle | 3 ++- app/src/main/java/com/topjohnwu/magisk/InstallFragment.java | 2 +- app/src/main/java/com/topjohnwu/magisk/LogFragment.java | 2 +- app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java | 2 +- app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java | 2 +- app/src/main/java/com/topjohnwu/magisk/ReposFragment.java | 2 +- app/src/main/java/com/topjohnwu/magisk/StatusFragment.java | 2 +- .../res/layout/{install_fragment.xml => fragment_install.xml} | 0 app/src/main/res/layout/{log_fragment.xml => fragment_log.xml} | 0 .../{magisk_hide_fragment.xml => fragment_magisk_hide.xml} | 0 .../res/layout/{modules_fragment.xml => fragment_modules.xml} | 0 .../main/res/layout/{repos_fragment.xml => fragment_repos.xml} | 0 .../res/layout/{status_fragment.xml => fragment_status.xml} | 0 app/src/main/res/values/strings.xml | 3 +++ 14 files changed, 11 insertions(+), 7 deletions(-) rename app/src/main/res/layout/{install_fragment.xml => fragment_install.xml} (100%) rename app/src/main/res/layout/{log_fragment.xml => fragment_log.xml} (100%) rename app/src/main/res/layout/{magisk_hide_fragment.xml => fragment_magisk_hide.xml} (100%) rename app/src/main/res/layout/{modules_fragment.xml => fragment_modules.xml} (100%) rename app/src/main/res/layout/{repos_fragment.xml => fragment_repos.xml} (100%) rename app/src/main/res/layout/{status_fragment.xml => fragment_status.xml} (100%) diff --git a/app/build.gradle b/app/build.gradle index b3eb62c69..acd58459f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,6 +59,7 @@ dependencies { compile 'com.madgag.spongycastle:prov:1.54.0.0' compile 'com.madgag.spongycastle:pkix:1.54.0.0' compile 'com.madgag.spongycastle:pg:1.54.0.0' - compile 'com.google.android.gms:play-services-safetynet:9.0.1' + compile 'com.google.android.gms:play-services-safetynet:10.0.1' + compile 'com.android.support:support-v4:25.1.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' } diff --git a/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java b/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java index d6bfbae68..46c639493 100644 --- a/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java @@ -40,7 +40,7 @@ public class InstallFragment extends Fragment implements CallbackHandler.EventLi @Nullable @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.install_fragment, container, false); + View v = inflater.inflate(R.layout.fragment_install, container, false); unbinder = ButterKnife.bind(this, v); detectButton.setOnClickListener(v1 -> toAutoDetect()); currentVersionTitle.setText(getString(R.string.current_magisk_title, Global.Info.magiskVersionString)); diff --git a/app/src/main/java/com/topjohnwu/magisk/LogFragment.java b/app/src/main/java/com/topjohnwu/magisk/LogFragment.java index 09ffdb859..c985f8485 100644 --- a/app/src/main/java/com/topjohnwu/magisk/LogFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/LogFragment.java @@ -62,7 +62,7 @@ public class LogFragment extends Fragment { @Nullable @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.log_fragment, container, false); + View view = inflater.inflate(R.layout.fragment_log, container, false); unbinder = ButterKnife.bind(this, view); txtLog.setTextIsSelectable(true); diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java b/app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java index 4678380db..1568bcbff 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java @@ -54,7 +54,7 @@ public class MagiskHideFragment extends Fragment implements CallbackHandler.Even @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.magisk_hide_fragment, container, false); + View view = inflater.inflate(R.layout.fragment_magisk_hide, container, false); unbinder = ButterKnife.bind(this, view); PackageManager packageManager = getActivity().getPackageManager(); diff --git a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java index 91d448e82..116543668 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java @@ -43,7 +43,7 @@ public class ModulesFragment extends Fragment implements CallbackHandler.EventLi @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.modules_fragment, container, false); + View view = inflater.inflate(R.layout.fragment_modules, container, false); unbinder = ButterKnife.bind(this, view); fabio.setOnClickListener(v -> { diff --git a/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java b/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java index e2df10522..da4be6256 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java @@ -56,7 +56,7 @@ public class ReposFragment extends Fragment implements CallbackHandler.EventList @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.repos_fragment, container, false); + View view = inflater.inflate(R.layout.fragment_repos, container, false); unbinder = ButterKnife.bind(this, view); mSectionedAdapter = new diff --git a/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java b/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java index c5f76abda..ef388fcf2 100644 --- a/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java @@ -68,7 +68,7 @@ public class StatusFragment extends Fragment implements CallbackHandler.EventLis @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.status_fragment, container, false); + View v = inflater.inflate(R.layout.fragment_status, container, false); unbinder = ButterKnife.bind(this, v); defaultColor = magiskUpdateText.getCurrentTextColor(); diff --git a/app/src/main/res/layout/install_fragment.xml b/app/src/main/res/layout/fragment_install.xml similarity index 100% rename from app/src/main/res/layout/install_fragment.xml rename to app/src/main/res/layout/fragment_install.xml diff --git a/app/src/main/res/layout/log_fragment.xml b/app/src/main/res/layout/fragment_log.xml similarity index 100% rename from app/src/main/res/layout/log_fragment.xml rename to app/src/main/res/layout/fragment_log.xml diff --git a/app/src/main/res/layout/magisk_hide_fragment.xml b/app/src/main/res/layout/fragment_magisk_hide.xml similarity index 100% rename from app/src/main/res/layout/magisk_hide_fragment.xml rename to app/src/main/res/layout/fragment_magisk_hide.xml diff --git a/app/src/main/res/layout/modules_fragment.xml b/app/src/main/res/layout/fragment_modules.xml similarity index 100% rename from app/src/main/res/layout/modules_fragment.xml rename to app/src/main/res/layout/fragment_modules.xml diff --git a/app/src/main/res/layout/repos_fragment.xml b/app/src/main/res/layout/fragment_repos.xml similarity index 100% rename from app/src/main/res/layout/repos_fragment.xml rename to app/src/main/res/layout/fragment_repos.xml diff --git a/app/src/main/res/layout/status_fragment.xml b/app/src/main/res/layout/fragment_status.xml similarity index 100% rename from app/src/main/res/layout/status_fragment.xml rename to app/src/main/res/layout/fragment_status.xml diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3a6f2424f..946aa8854 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -157,5 +157,8 @@ %1$s is granted Superuser permissions %1$s is denied Superuser permissions + + Hello blank fragment +