diff --git a/.gitmodules b/.gitmodules index 8a1a3a581a..280bbe3390 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "libraries/LGLibrary"] path = libraries/LGLibrary url = git@gitlab.ghzhushou.com:client/client-common.git + branch = master diff --git a/README.md b/README.md index 6d508adc64..13efd9c829 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,7 @@ ### 拉取代码步骤 1. 拉取主项目代码: `git clone -b master git@gitlab.ghzhushou.com:halo/assistant-android.git` 2. 初始化公用类库: `git submodule init && git submodule update` + +### submodule管理方式(只拉取master) +* 拉取子模块代码：`git submodule foreach git pull origin master` +* 提交代码，需要cd到submodule文件夹去做修改 \ No newline at end of file diff --git a/app/src/androidTest/java/com/gh/gamecenter/ApplicationTest.java b/app/src/androidTest/java/com/gh/gamecenter/ApplicationTest.java deleted file mode 100644 index 8b27fad01c..0000000000 --- a/app/src/androidTest/java/com/gh/gamecenter/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gh.gamecenter; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9a19f61194..ef5831800c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -52,7 +52,7 @@ android:allowBackup = "true" android:icon = "@drawable/logo" android:label = "@string/app_name" - android:theme = "@style/AppCompatTheme" > + android:theme = "@style/AppCompatTheme.APP" > cls) { - final Intent intent = getReorderToFrontIntent(context, cls); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - return intent; - } - - protected static Intent getReorderToFrontIntent(Context context, Class cls) { - final Intent intent = new Intent(context, cls); - intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - return intent; - } - - protected static void showActivity(Context context, Class cls) { - final Intent intent = getReorderToFrontIntent(context, cls); - context.startActivity(intent); - } - - protected static void startFragmentForResult(Context context, Class activity, - Class fragment, Bundle bundle, int requestCode) { - if (context instanceof Activity) { - ((Activity) context).startActivityForResult(getFragmentIntent(context, activity, fragment, bundle), - requestCode); - } - } - - /** - * 根据传进来的fragment class和bundle extra来决定跳转到哪一个fragment - * - * @param context - * @param fragment fragment.getCanonicalName() - * @param bundle fragment的构造参数 - * @return - */ - protected static Intent getFragmentIntent(Context context, Class activity, - Class fragment, Bundle bundle) { - final Intent intent = getReorderToFrontIntent(context, activity); - intent.putExtra(ARGS_FRAGMENT_NAME, fragment.getCanonicalName()); - intent.putExtra(ARGS_FRAGMENT_BUNDLE, bundle); - return intent; - } - - protected static void startFragment(Context context, Class activity, - Class fragment) { - startFragment(context, activity, fragment, null); - } - - /** - * 启动Fragment - * - * @param context - * @param fragment - * @param bundle - */ - protected static void startFragment(Context context, Class activity, - Class fragment, Bundle bundle) { - context.startActivity(getFragmentIntent(context, activity, fragment, bundle)); - } - - private void handleRedirectFromUri(Uri uri) { - try { - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodWithParams(this, uri, uri.getHost(), uri.getPath(), uri.getEncodedQuery()); - } -// switch (uri.getPath()) { -// case SchemeConstants.PATH_OPEN_GAME: { -// /** -// * 对于联运游戏：传入的game_id为0，game_url为对应的游戏链接，aid传联运游戏的aid -// * 对于非联运游戏：传入非联运游戏的game_id，game_url不传，aid传0 -// */ -// GameModel game = new GameModel(); -// int gameId = Integer.parseInt(uri.getQueryParameter(SchemeConstants.PARAMS_GAMEID)); -// game.setId(gameId); -//// if (AppDebugConfig.IS_DEBUG) { -//// int debugId = 1049; -//// game.setId(debugId); -//// } -// if (gameId == 0) { -// // cooperate -// int aid = Integer.parseInt(uri.getQueryParameter(SchemeConstants.PARAMS_AID)); -// game.setAid(aid); -// String gameUrl = uri.getQueryParameter(SchemeConstants.PARAMS_GAMEURL); -// game.setUrl(gameUrl); -// } -// ApiRequester.requestGameDetail(this, game); -// -// break; -// } -// case SchemeConstants.PATH_OPEN_ARTICLE: { -// -// String url = uri.getQueryParameter(SchemeConstants.PARAMS_ARTICLE_URL); -// String title = uri.getQueryParameter(SchemeConstants.PARAMS_ARTICLE_TITLE); -// -// if (!TextUtils.isEmpty(url) && !TextUtils.isEmpty(title)) { -// Bundle args = new Bundle(); -// args.putString(Fragment_Browser_Web.ARGS_URL, url); -// args.putString(Fragment_Browser_Web.ARGS_TITLE, getString(R.string.title_article_detail)); -// CommonActivity.startFragment(this, Fragment_Browser_Web.class, args); -// } -// -// break; -// } -// default: -// break; -// } - } catch (Exception e) { - if (AppDebugConfig.IS_DEBUG) { -// Debug_SDK.e(e); - } - } - } - - @Override - public boolean onHandleBackPressed() { - onBackPressed(); - return true; - } - - protected boolean handleBackPressed() { - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodWithParams(this); - } - final Fragment curFragment = getTopFragment(); - if (curFragment instanceof OnBackPressedListener && - ((OnBackPressedListener) curFragment).onHandleBackPressed()) { - return true; - } - if (popFragment()) { - return true; - } - return false; - } - - public Fragment getTopFragment() { - return getSupportFragmentManager().findFragmentById(R.id.layout_activity_content); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - final int layoutId = getLayoutId(); - if (layoutId != 0) { - mContentView = getLayoutInflater().inflate(layoutId, null); - setContentView(mContentView); - } - if (savedInstanceState == null) { - handleRedirectIntent(getIntent()); - } - AppManager.getInstance().addActivity(this); - } - - protected abstract int getLayoutId(); - - /** - * 1、判断当前是否存在某Fragment，例如下载管理器已经在栈中，则不重新启动，而将其带到最上层 (FindFragmentWithTag) - * 2、支持URI调用？ - * 是否需要重新导向到其他Activity - */ - protected void handleRedirectIntent(Intent intent) { - try { - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodWithParams(this, intent.toUri(Intent.URI_INTENT_SCHEME)); - } - - // 1、根据从网页抓取到的Intent跳转进来，处理custom uri -// final Uri uri = intent.getData(); -// if (uri != null && SchemeConstants.SCHEME_FFSS.equals(uri.getScheme())) { -// handleRedirectFromUri(uri); -// return; -// } -// -// // 2、根据序列化的数据来重新构建Fragment实例，若没有，则是旧的形式来决定传参 -// final String fragmentName = intent.getStringExtra(ARGS_FRAGMENT_NAME); -// if (AppDebugConfig.IS_DEBUG) { -// AppDebugConfig.logMethodWithParams(this, fragmentName); -// } -// if (!TextUtils.isEmpty(fragmentName)) { -// final Bundle args = intent.getBundleExtra(ARGS_FRAGMENT_BUNDLE); -// final Fragment fragment = Fragment.instantiate(this, fragmentName, args); -// if (fragment instanceof DialogFragment) { -// ((DialogFragment) fragment).show(getSupportFragmentManager(), fragmentName); -// } else { -// getSupportFragmentManager().beginTransaction().replace(R.id.layout_activity_content, fragment) -// .commitAllowingStateLoss(); -// } -// } - } catch (Throwable e) { - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodWithParams(this, e); - } - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - AppManager.getInstance().finishActivity(this); - } - - @Override - public void addFragment(Fragment fragment) { - getSupportFragmentManager().beginTransaction().add(R.id.layout_activity_content, fragment) - .addToBackStack(fragment.toString()).commitAllowingStateLoss(); - Util_System_Keyboard.hideSoftKeyboard(this); - } - - @Override - public void replaceFragment(Fragment toReplace) { - final FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - ft.replace(R.id.layout_activity_content, toReplace).addToBackStack(toReplace.toString()); - ft.commitAllowingStateLoss(); - Util_System_Keyboard.hideSoftKeyboard(this); - } - - @Override - public void removeFragment(Fragment toRemove) { - final FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - ft.replace(R.id.layout_activity_content, toRemove).addToBackStack(toRemove.toString()); - ft.commitAllowingStateLoss(); - Util_System_Keyboard.hideSoftKeyboard(this); - } - - @Override - public void showFragment(Fragment toShow) { - final FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - ft.show(toShow).addToBackStack(toShow.toString()); - ft.commitAllowingStateLoss(); - Util_System_Keyboard.hideSoftKeyboard(this); - } - - @Override - public void hideFragment(Fragment toHide) { - final FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - ft.show(toHide).addToBackStack(toHide.toString()); - ft.commitAllowingStateLoss(); - Util_System_Keyboard.hideSoftKeyboard(this); - } - - @Override - public boolean popFragment() { - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodWithParams(this, getSupportFragmentManager().getBackStackEntryCount()); - } - final int backStackCount = getSupportFragmentManager().getBackStackEntryCount(); - if (backStackCount > 0) { - Util_System_Keyboard.hideSoftKeyboard(this); - getSupportFragmentManager().popBackStack(); - return true; - } - return false; - } - - @Override - public void popFragmentToBase() { - getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); - } - - /** - * forward ActivityResultListener to fragments this activity hosts - * - * @param requestCode - * @param resultCode - * @param data - */ - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodWithParams(this, requestCode, resultCode, data); - } - final Fragment fragment = getTopFragment(); - if (fragment != null) { - fragment.onActivityResult(requestCode, resultCode, data); - } - } - - @Override - public void onBackPressed() { - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodWithParams(this); - } - if (handleBackPressed()) { - return; - } - // default finish activity - Util_System_Keyboard.hideSoftKeyboard(this); - finish(); - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - setIntent(intent); - handleRedirectIntent(intent); - } - -} diff --git a/app/src/main/java/com/gh/base/BaseAppCompatActivityLog.java b/app/src/main/java/com/gh/base/BaseAppCompatActivityLog.java deleted file mode 100644 index b306526084..0000000000 --- a/app/src/main/java/com/gh/base/BaseAppCompatActivityLog.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.gh.base; - -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; - -import com.gh.common.util.AppDebugConfig; - - -/** - * @author: CsHeng (csheng1204[at]gmail[dot]com) - * Date: 13-7-25 - * Time: 下午8:42 - */ -public class BaseAppCompatActivityLog extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } - - @Override - protected void onStop() { - super.onStop(); - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } - - @Override - public void onLowMemory() { - super.onLowMemory(); - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } - - @Override - protected void onPause() { - super.onPause(); - try { - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } catch (Throwable e) { - } - } - - @Override - protected void onResume() { - super.onResume(); - try { - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } catch (Throwable e) { - } - } - - @Override - protected void onStart() { - super.onStart(); - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } - - @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - if (AppDebugConfig.IS_DEBUG) { - AppDebugConfig.logMethodName(this); - } - } - -} diff --git a/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java b/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java index 7eafe7edbf..c692141925 100644 --- a/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java +++ b/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java @@ -9,6 +9,7 @@ import android.view.Window; import android.view.WindowManager; import com.gh.gamecenter.R; +import com.lightgame.BaseAppCompatActivity; import com.readystatesoftware.systembartint.SystemBarTintManager; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/gh/base/FragmentNavigationDelegate.java b/app/src/main/java/com/gh/base/FragmentNavigationDelegate.java deleted file mode 100644 index f82a59ebe5..0000000000 --- a/app/src/main/java/com/gh/base/FragmentNavigationDelegate.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gh.base; - -import android.support.v4.app.Fragment; - -/** - * @author CsHeng - * @Date 15-9-29 - * @Time 上午10:24 - */ -public interface FragmentNavigationDelegate { - - void addFragment(Fragment toAdd); - - void replaceFragment(Fragment toReplace); - - void removeFragment(Fragment toRemove); - - void showFragment(Fragment toShow); - - void hideFragment(Fragment toHide); - - boolean popFragment(); - - void popFragmentToBase(); - -} diff --git a/app/src/main/java/com/gh/common/util/AppManager.java b/app/src/main/java/com/gh/common/util/AppManager.java deleted file mode 100644 index fff39e395f..0000000000 --- a/app/src/main/java/com/gh/common/util/AppManager.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.gh.common.util; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Stack; - -/** - * 应用程序Activity管理类：用于Activity和Intent相关的管理 - * - * @author CsHeng - * @version 1.0 - */ -public class AppManager { - - private static AppManager mInstance; - private Stack mActivityStack; - - private AppManager() { - mActivityStack = new Stack<>(); - } - - /** - * 单一实例 - */ - public static AppManager getInstance() { - if (mInstance == null) { - mInstance = new AppManager(); - } - return mInstance; - } - - public boolean isEmpty() { - return mActivityStack.isEmpty(); - } - - /** - * 添加Activity到堆栈 - */ - public void addActivity(Activity activity) { - mActivityStack.add(activity); - } - - /** - * 获取当前Activity（堆栈中最后一个压入的） - */ - public Activity currentActivity() { - return mActivityStack.lastElement(); - } - - /** - * 结束当前Activity（堆栈中最后一个压入的） - */ - public void finishActivity() { - final Activity activity = mActivityStack.lastElement(); - finishActivity(activity); - } - - /** - * 结束指定的Activity - */ - public void finishActivity(Activity activity) { - if (activity != null) { - mActivityStack.remove(activity); - activity.finish(); - } - } - - /** - * 结束指定类名的Activity - */ - public void finishActivity(Class cls) { - for (Activity activity : mActivityStack) { - if (activity.getClass().equals(cls)) { - finishActivity(activity); - } - } - } - - public boolean isOnStack(Activity activity) { - return mActivityStack.contains(activity); - } - - public Intent[] getStartIntents(Intent... intent) { - List intentList = getCurrentIntents(); - if (intentList != null) { - Collections.addAll(intentList, intent); - return intentList.toArray(new Intent[intentList.size()]); - } - return intent; - } - - public List getCurrentIntents() { - List intentList = new ArrayList<>(); - for (Activity activity : mActivityStack) { - intentList.add(activity.getIntent()); - } - return intentList; - } - - /** - * 退出应用程序 - */ - public void appExit(Context context) { - try { - finishAllActivity(); - /* Need Permission */ - // ActivityManager activityMgr= (ActivityManager) - // context.getSystemService(Context.ACTIVITY_SERVICE); - // activityMgr.restartPackage(context.getPackageName()); - // activityMgr.killBackgroundProcesses(context.getPackageName()); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 结束所有Activity - */ - public void finishAllActivity() { - for (Activity activity : mActivityStack) { - activity.finish(); - } - mActivityStack.clear(); - try { - android.os.Process.killProcess(android.os.Process.myPid()); - } catch (Exception e) { - } - } - - public void destroy() { - if (mActivityStack != null) { - mActivityStack.clear(); - } - mInstance = null; - } - -} diff --git a/app/src/main/java/com/gh/common/util/Installation.java b/app/src/main/java/com/gh/common/util/Installation.java index bd9b339c18..6eba7ef2f5 100644 --- a/app/src/main/java/com/gh/common/util/Installation.java +++ b/app/src/main/java/com/gh/common/util/Installation.java @@ -4,6 +4,8 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; +import com.lightgame.utils.Util_System_Phone_State; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/app/src/main/java/com/gh/common/util/QQUtils.java b/app/src/main/java/com/gh/common/util/QQUtils.java index 7456455a2e..0cf9802038 100644 --- a/app/src/main/java/com/gh/common/util/QQUtils.java +++ b/app/src/main/java/com/gh/common/util/QQUtils.java @@ -5,6 +5,8 @@ import android.content.Intent; import android.net.Uri; import android.text.TextUtils; +import com.lightgame.utils.Util_System_ClipboardManager; + /** * Created by khy on 2017/3/30. */ diff --git a/app/src/main/java/com/gh/common/util/TokenUtils.java b/app/src/main/java/com/gh/common/util/TokenUtils.java index 9f92d4c0a5..6b5eec6477 100644 --- a/app/src/main/java/com/gh/common/util/TokenUtils.java +++ b/app/src/main/java/com/gh/common/util/TokenUtils.java @@ -15,6 +15,7 @@ import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.retrofit.StringResponse; +import com.lightgame.utils.Util_System_Phone_State; import com.tencent.stat.StatConfig; import org.json.JSONException; diff --git a/app/src/main/java/com/gh/common/util/Util_System_ClipboardManager.java b/app/src/main/java/com/gh/common/util/Util_System_ClipboardManager.java deleted file mode 100644 index 97671663d0..0000000000 --- a/app/src/main/java/com/gh/common/util/Util_System_ClipboardManager.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.gh.common.util; - -import android.content.ClipData; -import android.content.ClipDescription; -import android.content.ClipboardManager; -import android.content.Context; -import android.os.Build; - -/** - * 剪切板使用（暂时只支持文字剪切） - */ -public class Util_System_ClipboardManager { - - /** - * 保存文字到剪切板中 - * - * @param str - * @return - */ - public static boolean setText(Context context, String str) { - - if (context == null) { - return false; - } - Context appliactionContext = null; - try { - appliactionContext = context.getApplicationContext(); - } catch (Exception e) { - } - if (appliactionContext == null) { - return false; - } - - // 如果当前设备的android-sdk 版本号小于11 - if (Build.VERSION.SDK_INT < 11) { - try { - android.text.ClipboardManager clipManager = (android.text.ClipboardManager) appliactionContext - .getSystemService(Context.CLIPBOARD_SERVICE); - clipManager.setText(str); - return true; - } catch (Exception e) { - } - return false; - } - - // 如果当前设备的android-sdk 版本号大于等于11 - else { - try { - ClipboardManager clipManager = (ClipboardManager) appliactionContext - .getSystemService(Context.CLIPBOARD_SERVICE); - ClipData clip = ClipData.newPlainText("simple text", str); - clipManager.setPrimaryClip(clip); - return true; - } catch (Exception e) { - } - return false; - } - } - - /** - * 获取剪切版中的文字，如果有的话 - * - * @param context - * @return - */ - public static String getText(Context context) { - if (context == null) { - return null; - } - Context appliactionContext = null; - try { - appliactionContext = context.getApplicationContext(); - } catch (Exception e) { - } - if (appliactionContext == null) { - return null; - } - - // 如果当前设备的android-sdk 版本号小于11 - if (Build.VERSION.SDK_INT < 11) { - try { - android.text.ClipboardManager clipManager = (android.text.ClipboardManager) appliactionContext - .getSystemService(Context.CLIPBOARD_SERVICE); - if (clipManager.hasText()) { - return clipManager.getText().toString(); - } - } catch (Exception e) { - } - return null; - } - - // 如果当前设备的android-sdk 版本号大于等于11 - else { - try { - ClipboardManager clipManager = (ClipboardManager) appliactionContext - .getSystemService(Context.CLIPBOARD_SERVICE); - - if (clipManager.hasPrimaryClip()) { - - // 如果剪切版中的是文字 - if (clipManager.getPrimaryClipDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) { - StringBuilder sb = new StringBuilder(); - ClipData clipData = clipManager.getPrimaryClip(); - for (int i = 0; i < clipData.getItemCount(); ++i) { - sb.append(clipData.getItemAt(i).getText()); - - // ClipData.Item item = clipData.getItemAt(i); - // CharSequence str = item.coerceToText(MainActivity.this); - // resultString += str; - } - if (sb != null) { - return sb.toString(); - } - } - } - } catch (Exception e) { - } - return null; - } - - } - -} diff --git a/app/src/main/java/com/gh/common/util/Util_System_Keyboard.java b/app/src/main/java/com/gh/common/util/Util_System_Keyboard.java deleted file mode 100644 index fe4eb2765c..0000000000 --- a/app/src/main/java/com/gh/common/util/Util_System_Keyboard.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.gh.common.util; - -import android.app.Activity; -import android.content.Context; -import android.os.IBinder; -import android.view.View; -import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; - -/** - * @author: CsHeng (csheng1204[at]gmail[dot]com) - * Date: 13-5-28 - * Time: 上午11:04 - */ -public class Util_System_Keyboard { - - /** - * 显示键盘，使用postDelayed效果更加～ - * - * @param context - * @param edt - */ - public static void showSoftKeyboard(Context context, EditText edt) { - if (context == null || edt == null) return; - final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(edt, 0); - } - - /** - * 隐藏键盘 - * - * @param context - * @param edt - */ - public static void hideSoftKeyboard(Context context, EditText edt) { - if (context == null || edt == null) return; - final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(edt.getWindowToken(), 0); - } - - /** - * 隐藏键盘，使用Ibinder - * - * @param context - * @param binder - */ - public static void hideSoftKeyboardByIBinder(Context context, IBinder binder) { - if (context == null || binder == null) { - return; - } - final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(binder, 0); - } - - /** - * 利用Activity获取到当前界面focus，利用IBinder隐藏键盘 - * - * @param activity - */ - public static void hideSoftKeyboard(Activity activity) { - if (activity != null) { - final View view = activity.getCurrentFocus(); - if (view != null) { - final IBinder binder = view.getWindowToken(); - if (binder != null) { - final InputMethodManager imm = (InputMethodManager) activity.getApplicationContext() - .getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(binder, 0); - } - } - } - } -} diff --git a/app/src/main/java/com/gh/common/util/Util_System_Permission.java b/app/src/main/java/com/gh/common/util/Util_System_Permission.java deleted file mode 100644 index 9add0b1c79..0000000000 --- a/app/src/main/java/com/gh/common/util/Util_System_Permission.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.gh.common.util; - -import android.Manifest; -import android.content.Context; -import android.content.pm.PackageManager; -import android.os.Build; -import android.os.Build.VERSION_CODES; - -/** - * 权限工具 - * - * @author CsHeng - */ -public class Util_System_Permission { - - /** - * 检查是否具有写入外部存储卡的权限 - * - * @param context - * @return - */ - public static boolean isWith_WRITE_EXTERNAL_STORAGE_Permission(Context context) { - try { - - // Util_SDK_Compatibility.getSDKLevel(); - int sdkLevel = Build.VERSION.SDK_INT; - - if (sdkLevel < VERSION_CODES.DONUT) { - return true; - } - - return isWithPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE); - } catch (Throwable e) { - } - return false; - } - - /** - * 是否具有相应权限 - * - * @param context - * @param permissionName - * @return - */ - public static boolean isWithPermission(Context context, String permissionName) { - try { - if (context.checkCallingOrSelfPermission(permissionName) == PackageManager.PERMISSION_DENIED) { - return false; - } - } catch (Throwable e) { - } - return true; - } - - /** - * 检查是否具有联网INTERNET权限 - * - * @param context - * @return - */ - public static boolean isWith_INTERNET_Permission(Context context) { - return isWithPermission(context, Manifest.permission.INTERNET); - } - - /** - * 检查是否具有获取手机信息READ_PHONE_STATE权限 - * - * @param context - * @return - */ - public static boolean isWith_READ_PHONE_STATE_Permission(Context context) { - return isWithPermission(context, Manifest.permission.READ_PHONE_STATE); - } - - /** - * 检查是否具有ACCESS_NETWORK_STATE权限 - * - * @param context - * @return - */ - public static boolean isWith_ACCESS_NETWORK_STATE_Permission(Context context) { - return isWithPermission(context, Manifest.permission.ACCESS_NETWORK_STATE); - } - - /** - * 检查是否具有ACCESS_FINE_LOCATION权限 - * - * @param context - * @return - */ - public static boolean isWith_ACCESS_FINE_LOCATION_Permission(Context context) { - return isWithPermission(context, Manifest.permission.ACCESS_FINE_LOCATION); - } - - /** - * 检查是否具有ACCESS_COARSE_LOCATION权限 - * - * @param context - * @return - */ - public static boolean isWith_ACCESS_COARSE_LOCATION_Permission(Context context) { - return isWithPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION); - } - - /** - * 检查是否具有ACCESS_WIFI_STATE权限 - * - * @param context - * @return - */ - public static boolean isWith_ACCESS_WIFI_STATE_Permission(Context context) { - return isWithPermission(context, Manifest.permission.ACCESS_WIFI_STATE); - } - - /** - * 检查是否具有创建快捷方式的权限。 - * - * @param context - * @return - */ - public static boolean isWith_INSTALL_SHORTCUT_Permission(Context context) { - return isWithPermission(context, "com.android.launcher.permission.INSTALL_SHORTCUT"); - } - - /** - * 检查是否具有添加系统浏览器书签的权限 - * - * @param context - * @return - */ - public static boolean isWith_WRITE_HISTORY_BOOKMARKS(Context context) { - return isWithPermission(context, "com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"); - } - - /** - * 检查是否具有SYSTEM_ALERT_WINDOW方法 - * - * @param context - * @return - */ - public static boolean isWith_SYSTEM_ALERT_WINDOW_Permission(Context context) { - return isWithPermission(context, Manifest.permission.SYSTEM_ALERT_WINDOW); - } - - /** - * 检查是否具有GET_TASK方法 - * - * @param context - * @return - */ - public static boolean isWith_GET_TASK_Permission(Context context) { - return isWithPermission(context, Manifest.permission.GET_TASKS); - } -} diff --git a/app/src/main/java/com/gh/common/util/Util_System_Phone_State.java b/app/src/main/java/com/gh/common/util/Util_System_Phone_State.java deleted file mode 100644 index 01f09ad2f0..0000000000 --- a/app/src/main/java/com/gh/common/util/Util_System_Phone_State.java +++ /dev/null @@ -1,183 +0,0 @@ -/** - * project: CompanyPortalApp - *

- *

- * ======================================================================== - * amend date amend user amend reason - * 2012-2-14 CsHeng - */ - -package com.gh.common.util; - -import android.content.Context; -import android.content.pm.PackageManager.NameNotFoundException; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.net.wifi.WifiInfo; -import android.net.wifi.WifiManager; -import android.os.Build; -import android.telephony.TelephonyManager; -import android.text.format.Formatter; -import android.util.Log; - -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Enumeration; -import java.util.Locale; - -/** - * 读取手机信息工具类 - * - * @author CsHeng - * @date 2012-2-14 - * @date 2015-9-6 update by yxf getImei - */ -public class Util_System_Phone_State { - - public static String getMac(Context context) { - try { - if (Util_System_Permission.isWith_ACCESS_WIFI_STATE_Permission(context)) { - WifiManager wifi = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE); - WifiInfo info = wifi.getConnectionInfo(); - String str = info.getMacAddress(); - if (str != null) { - str = str.trim(); - return str; - } - } - } catch (Throwable e) { - } - return ""; - } - - public static String getLocalIpAddress() { - try { - for (Enumeration en = NetworkInterface - .getNetworkInterfaces(); en.hasMoreElements(); ) { - NetworkInterface intf = en.nextElement(); - for (Enumeration enumIpAddr = intf - .getInetAddresses(); enumIpAddr.hasMoreElements(); ) { - InetAddress inetAddress = enumIpAddr.nextElement(); - if (!inetAddress.isLoopbackAddress()) { - return inetAddress.getHostAddress(); - } - } - } - } catch (SocketException ex) { - } - return null; - } - - public static String getss(Context context) { - String ipString = null; - try { - WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE); - WifiInfo wifiInfo = wifiManager.getConnectionInfo(); - int ipAddress = wifiInfo.getIpAddress(); - ipString = String.format(Locale.getDefault(), - "%d.%d.%d.%d", - (ipAddress & 0xff), - (ipAddress >> 8 & 0xff), - (ipAddress >> 16 & 0xff), - (ipAddress >> 24 & 0xff)); - } catch (Exception e) { - } - return ipString; - } - - public static String getLocalIpAddressNum() { - try { - for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) { - NetworkInterface intf = en.nextElement(); - for (Enumeration enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) { - InetAddress inetAddress = enumIpAddr.nextElement(); - if (!inetAddress.isLoopbackAddress()) { - String ip = Formatter.formatIpAddress(inetAddress.hashCode()); - if (AppDebugConfig.IS_DEBUG) { - Log.i(Util_System_Phone_State.class.getSimpleName(), "***** IP=" + ip); - } - return ip; - } - } - } - } catch (SocketException ex) { - if (AppDebugConfig.IS_DEBUG) { - Log.e(Util_System_Phone_State.class.getSimpleName(), ex.toString()); - } - } - return null; - } - - //这里如果IMEI返回为NULL，我们用15个0代替 - public static String getImei(Context c) { - final String original = getTelephonyManager(c).getDeviceId(); - return original == null ? "000000000000000" : original; - } - - private static TelephonyManager getTelephonyManager(Context context) { - return (TelephonyManager) context.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE); - } - - public static String getImsi(Context c) { - final String imsi = getTelephonyManager(c).getSubscriberId(); - return imsi == null ? "" : imsi; - } - - public static String getSIMId(Context c) { - return getTelephonyManager(c).getSimSerialNumber(); - } - - public static String getDeviceId(Context c) { - return getTelephonyManager(c).getDeviceId(); - } - - public static String getDeviceName() { - final String deviceName = android.os.Build.MODEL + "," - + android.os.Build.VERSION.SDK_INT + "," - + android.os.Build.VERSION.RELEASE; - return deviceName; - } - - public static int getAppVersionCode(Context c) { - try { - return c.getPackageManager().getPackageInfo(c.getPackageName(), 0).versionCode; - } catch (NameNotFoundException e) { - e.printStackTrace(); - return -1; - } - } - - public static String getAppVersionName(Context c) { - try { - return c.getPackageManager().getPackageInfo(c.getPackageName(), 0).versionName; - } catch (NameNotFoundException e) { - e.printStackTrace(); - return null; - } - } - - public static String getPackageVersionName(Context ctx, String pn) { - try { - return ctx.getPackageManager().getPackageInfo(pn, 0).versionName; - } catch (NameNotFoundException e) { - return ""; - } - } - - public static String getDevideInfo() { - return Build.MANUFACTURER + " " + Build.MODEL + " " + Build.VERSION.RELEASE; - } - - public static boolean isNetworkConnected(Context context) { - try { - final ConnectivityManager connectivityManager = (ConnectivityManager) - context.getSystemService(Context.CONNECTIVITY_SERVICE); - final NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo(); - return activeNetworkInfo != null; - } catch (Exception e) { - } - return false; - } - -} diff --git a/app/src/main/java/com/gh/common/util/Util_Window.java b/app/src/main/java/com/gh/common/util/Util_Window.java deleted file mode 100644 index 68fbc25c10..0000000000 --- a/app/src/main/java/com/gh/common/util/Util_Window.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.gh.common.util; - -import android.graphics.PixelFormat; -import android.os.Build; -import android.view.View; -import android.view.Window; -import android.view.WindowManager; - -/** - * Created by csheng on 15-10-14. - */ -public class Util_Window { - - /** - * set status bar color - * //TODO View的两个标识会导致输入法无法resize，找解决方案 - * 解决方案：xml配置根视图要加android:fitsSystemWindows = "true" - * - * @param window - * @param color - */ - public static void initStatusBarColor(Window window, int color) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - // clear FLAG_TRANSLUCENT_STATUS flag: - window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - // add FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS flag to the window - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - // finally change the color - window.setStatusBarColor(color); - - window.getDecorView() - .setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); - } - } - - public static void enableAutoWakelock(Window window) { - // auto handle wake lock - window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - - // 网页中的视频，上屏幕的时候，可能出现闪烁的情况，需要如下设置：Activity在onCreate时需要设置: - window.setFormat(PixelFormat.TRANSLUCENT); - } - - public static void enableHardware(Window window) { - // open hardware accelerate - try { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - window.setFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, - WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); - } - } catch (Exception e) { - } - } - - /** - * Detects and toggles immersive mode (also known as "hidey bar" mode). - */ - public static void toggleHideYBar(Window window) { - - // The UI options currently enabled are represented by a bitfield. - // getSystemUiVisibility() gives us that bitfield. - int uiOptions = 0; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - uiOptions = window.getDecorView().getSystemUiVisibility(); - } - int newUiOptions = uiOptions; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - boolean isImmersiveModeEnabled = - ((uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) == uiOptions); - } - - // Navigation bar hiding: Backwards compatible to ICS. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { - newUiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; - } - - // Status bar hiding: Backwards compatible to Jellybean - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - newUiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN; - } - - // Immersive mode: Backward compatible to KitKat. - // Note that this flag doesn't do anything by itself, it only augments the behavior - // of HIDE_NAVIGATION and FLAG_FULLSCREEN. For the purposes of this sample - // all three flags are being toggled together. - // Note that there are two immersive mode UI flags, one of which is referred to as "sticky". - // Sticky immersive mode differs in that it makes the navigation and status bars - // semi-transparent, and the UI flag does not get cleared when the user interacts with - // the screen. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - newUiOptions ^= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - window.getDecorView().setSystemUiVisibility(newUiOptions); - } - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 4b6d969212..c7672c8a9c 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -22,7 +22,7 @@ import android.widget.TextView; import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; -import com.gh.common.util.AppManager; +import com.lightgame.utils.AppManager; import com.gh.common.util.FileUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index ea045d89a0..e5dccbd5c4 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -36,8 +36,8 @@ import com.gh.common.util.FileUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.PatternUtils; import com.gh.common.util.TokenUtils; -import com.gh.common.util.Util_System_Keyboard; -import com.gh.common.util.Util_System_Phone_State; +import com.lightgame.utils.Util_System_Keyboard; +import com.lightgame.utils.Util_System_Phone_State; import com.gh.common.util.Utils; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.entity.SuggestionTypeEntity; diff --git a/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java b/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java index fb6c6f5385..e80484c5e2 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java @@ -11,7 +11,7 @@ import android.view.Window; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gh.common.util.Util_System_Phone_State; +import com.lightgame.utils.Util_System_Phone_State; import com.gh.common.util.Utils; import org.json.JSONException; diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index b4bd43333c..8c60600e03 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -15,7 +15,7 @@ import android.widget.Toast; import com.gh.base.AppController; import com.gh.common.constant.Config; -import com.gh.common.util.AppManager; +import com.lightgame.utils.AppManager; import com.gh.common.util.DataLogUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; diff --git a/app/src/main/res/drawable-xhdpi/btn_fastscrollbar.png b/app/src/main/res/drawable-xhdpi/btn_fastscrollbar.png deleted file mode 100644 index 780c159626..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_fastscrollbar.png and /dev/null differ diff --git a/app/src/main/res/drawable/layer_white_05_opacity.xml b/app/src/main/res/drawable/layer_white_05_opacity.xml deleted file mode 100644 index 7b453b19fa..0000000000 --- a/app/src/main/res/drawable/layer_white_05_opacity.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_common_item.xml b/app/src/main/res/drawable/selector_common_item.xml deleted file mode 100644 index f25d0c320c..0000000000 --- a/app/src/main/res/drawable/selector_common_item.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_common_item_transparent.xml b/app/src/main/res/drawable/selector_common_item_transparent.xml deleted file mode 100644 index 8a60c8a399..0000000000 --- a/app/src/main/res/drawable/selector_common_item_transparent.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_common_item_white.xml b/app/src/main/res/drawable/selector_common_item_white.xml deleted file mode 100644 index 7151e04d65..0000000000 --- a/app/src/main/res/drawable/selector_common_item_white.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_scrollbar.xml b/app/src/main/res/drawable/shape_scrollbar.xml deleted file mode 100644 index f171a0f638..0000000000 --- a/app/src/main/res/drawable/shape_scrollbar.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/common_toolbar.xml b/app/src/main/res/layout/common_toolbar.xml deleted file mode 100755 index 826a5fd565..0000000000 --- a/app/src/main/res/layout/common_toolbar.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/layout_actionbar.xml b/app/src/main/res/layout/layout_actionbar.xml deleted file mode 100644 index f76796a363..0000000000 --- a/app/src/main/res/layout/layout_actionbar.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_wrapper_activity.xml b/app/src/main/res/layout/layout_wrapper_activity.xml deleted file mode 100755 index 59bebc2e7d..0000000000 --- a/app/src/main/res/layout/layout_wrapper_activity.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_wrapper_fragment.xml b/app/src/main/res/layout/layout_wrapper_fragment.xml deleted file mode 100755 index f4bb95cf2d..0000000000 --- a/app/src/main/res/layout/layout_wrapper_fragment.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_wrapper_toolbar.xml b/app/src/main/res/layout/layout_wrapper_toolbar.xml deleted file mode 100755 index ba79b08765..0000000000 --- a/app/src/main/res/layout/layout_wrapper_toolbar.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_wrapper_toolbar_home.xml b/app/src/main/res/layout/layout_wrapper_toolbar_home.xml deleted file mode 100755 index f132b1dea0..0000000000 --- a/app/src/main/res/layout/layout_wrapper_toolbar_home.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml deleted file mode 100644 index 238153ffbe..0000000000 --- a/app/src/main/res/values-v21/dimens.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - 25dp - - \ No newline at end of file diff --git a/app/src/main/res/values-v23/dimens.xml b/app/src/main/res/values-v23/dimens.xml deleted file mode 100644 index 56de998b8d..0000000000 --- a/app/src/main/res/values-v23/dimens.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - 24dp - - - 96dp - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ecaba96a87..a5ca23d28d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,29 +1,6 @@ - #12000000 - #00000000 - #0D000000 - #1A000000 - #26000000 - #33000000 - #40000000 - #4D000000 - #59000000 - #66000000 - #73000000 - #80000000 - #8C000000 - #99000000 - #A6000000 - #B3000000 - #BF000000 - #CC000000 - #D9000000 - #E6000000 - #F2000000 - #FF000000 - #00B7FA diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 2d377dbeef..eedfe1b085 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,11 +5,6 @@ 6dp - 55dp - - - 72dp - 25dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1eda1693ca..7f06a15ed4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,35 +1,28 @@ - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/values/styles_themes.xml b/app/src/main/res/values/styles_themes.xml deleted file mode 100644 index fd31cc7756..0000000000 --- a/app/src/main/res/values/styles_themes.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/test/java/com/gh/gamecenter/ExampleUnitTest.java b/app/src/test/java/com/gh/gamecenter/ExampleUnitTest.java deleted file mode 100644 index 3e8b9b8ee8..0000000000 --- a/app/src/test/java/com/gh/gamecenter/ExampleUnitTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gh.gamecenter; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -/** - * To work on unit tests, switch the Test Artifact in the Build Variants view. - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 055ab5eeaa..4b39ce3cf6 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 055ab5eeaa6218943511b6123e4d3cf323e56de0 +Subproject commit 4b39ce3cf6b6f56aca438beac76c6da0b677523d