diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 08a34f31..1b591aee 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -44,11 +44,11 @@ fun getVersionCode(): Int = System.getenv("VERSION_CODE")?.toIntOrNull() ?: 1 val cemuDataFilesFolder = "../../../bin" android { - namespace = "com.izzy2lost.weeu" + namespace = "info.cemu.cemu" compileSdk = 36 ndkVersion = "28.2.13676358" defaultConfig { - applicationId = "com.izzy2lost.weeu" + applicationId = "info.cemu.cemu" minSdk = 31 targetSdk = 36 versionCode = getVersionCode() diff --git a/src/android/app/src/androidTest/java/com/izzy2lost/weeu/tests/PlaceholderInstrumentedTest.kt b/src/android/app/src/androidTest/java/info/cemu/cemu/tests/PlaceholderInstrumentedTest.kt similarity index 88% rename from src/android/app/src/androidTest/java/com/izzy2lost/weeu/tests/PlaceholderInstrumentedTest.kt rename to src/android/app/src/androidTest/java/info/cemu/cemu/tests/PlaceholderInstrumentedTest.kt index 0a3d2192..fc9361b1 100644 --- a/src/android/app/src/androidTest/java/com/izzy2lost/weeu/tests/PlaceholderInstrumentedTest.kt +++ b/src/android/app/src/androidTest/java/info/cemu/cemu/tests/PlaceholderInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.tests +package info.cemu.cemu.tests import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert.* diff --git a/src/android/app/src/debug/res/values/strings.xml b/src/android/app/src/debug/res/values/strings.xml index c7c87c95..f37573ce 100644 --- a/src/android/app/src/debug/res/values/strings.xml +++ b/src/android/app/src/debug/res/values/strings.xml @@ -1,3 +1,3 @@ - Wee U debug + Cemu debug \ No newline at end of file diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index 5262049c..c6e714fd 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.WeeU"> + android:theme="@style/Theme.Cemu"> diff --git a/src/android/app/src/main/cpp/AndroidFilesystemCallbacks.h b/src/android/app/src/main/cpp/AndroidFilesystemCallbacks.h index bec35553..5ef29109 100644 --- a/src/android/app/src/main/cpp/AndroidFilesystemCallbacks.h +++ b/src/android/app/src/main/cpp/AndroidFilesystemCallbacks.h @@ -26,7 +26,7 @@ class AndroidFilesystemCallbacks : public FilesystemAndroid::FilesystemCallbacks AndroidFilesystemCallbacks() { JNIUtils::ScopedJNIENV env; - m_fileUtilClass = JNIUtils::Scopedjclass("com/izzy2lost/weeu/nativeinterface/NativeFiles"); + m_fileUtilClass = JNIUtils::Scopedjclass("info/cemu/cemu/nativeinterface/NativeFiles"); m_openContentUriMid = env->GetStaticMethodID(*m_fileUtilClass, "openContentUri", "(Ljava/lang/String;)I"); m_listFilesMid = env->GetStaticMethodID(*m_fileUtilClass, "listFiles", "(Ljava/lang/String;)[Ljava/lang/String;"); m_isDirectoryMid = env->GetStaticMethodID(*m_fileUtilClass, "isDirectory", "(Ljava/lang/String;)Z"); diff --git a/src/android/app/src/main/cpp/AndroidGameTitleLoadedCallback.h b/src/android/app/src/main/cpp/AndroidGameTitleLoadedCallback.h index a66d0e65..71ac63ca 100644 --- a/src/android/app/src/main/cpp/AndroidGameTitleLoadedCallback.h +++ b/src/android/app/src/main/cpp/AndroidGameTitleLoadedCallback.h @@ -9,7 +9,7 @@ class AndroidGameTitleLoadedCallback : public GameTitleLoadedCallback jmethodID m_onGameTitleLoadedMID; JNIUtils::Scopedjobject m_gameTitleLoadedCallbackObj; jmethodID m_gameConstructorMID; - JNIUtils::Scopedjclass m_gamejclass{"com/izzy2lost/weeu/nativeinterface/NativeGameTitles$Game"}; + JNIUtils::Scopedjclass m_gamejclass{"info/cemu/cemu/nativeinterface/NativeGameTitles$Game"}; jmethodID m_createBitmapMID; JNIUtils::Scopedjclass m_bitmapClass{"android/graphics/Bitmap"}; JNIUtils::Scopedjobject m_bitmapFormat; diff --git a/src/android/app/src/main/cpp/AndroidSwkbdCallbacks.cpp b/src/android/app/src/main/cpp/AndroidSwkbdCallbacks.cpp index bc17cb69..270248d3 100644 --- a/src/android/app/src/main/cpp/AndroidSwkbdCallbacks.cpp +++ b/src/android/app/src/main/cpp/AndroidSwkbdCallbacks.cpp @@ -4,7 +4,7 @@ AndroidSwkbdCallbacks::AndroidSwkbdCallbacks() { JNIUtils::ScopedJNIENV env; - m_emulationActivityClass = JNIUtils::Scopedjclass("com/izzy2lost/weeu/emulation/EmulationActivity"); + m_emulationActivityClass = JNIUtils::Scopedjclass("info/cemu/cemu/emulation/EmulationActivity"); m_showSoftwareKeyboardMethodID = env->GetStaticMethodID(*m_emulationActivityClass, "showEmulationTextInput", "(Ljava/lang/String;I)V"); m_hideSoftwareKeyboardMethodID = env->GetStaticMethodID(*m_emulationActivityClass, "hideEmulationTextInput", "()V"); } diff --git a/src/android/app/src/main/cpp/CompressTitleCallbacks.cpp b/src/android/app/src/main/cpp/CompressTitleCallbacks.cpp index f79e8200..60bce301 100644 --- a/src/android/app/src/main/cpp/CompressTitleCallbacks.cpp +++ b/src/android/app/src/main/cpp/CompressTitleCallbacks.cpp @@ -4,7 +4,7 @@ CompressTitleCallbacks::CompressTitleCallbacks(jobject compressTitleCallbacks) : m_compressTitleCallbacks{compressTitleCallbacks} { JNIUtils::ScopedJNIENV env; - JNIUtils::Scopedjclass compressTitleCallbacksClass("com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleCompressCallbacks"); + JNIUtils::Scopedjclass compressTitleCallbacksClass("info/cemu/cemu/nativeinterface/NativeGameTitles$TitleCompressCallbacks"); m_onFinishedMID = env->GetMethodID(*compressTitleCallbacksClass, "onFinished", "()V"); m_onErrorMID = env->GetMethodID(*compressTitleCallbacksClass, "onError", "()V"); } diff --git a/src/android/app/src/main/cpp/JNIUtils.cpp b/src/android/app/src/main/cpp/JNIUtils.cpp index 313e1845..c3019c01 100644 --- a/src/android/app/src/main/cpp/JNIUtils.cpp +++ b/src/android/app/src/main/cpp/JNIUtils.cpp @@ -64,11 +64,11 @@ void JNIUtils::handleNativeException(JNIEnv* env, const std::function& f fn(); } catch (const std::exception& exception) { - jclass exceptionClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeException"); + jclass exceptionClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeException"); env->ThrowNew(exceptionClass, exception.what()); } catch (...) { - jclass exceptionClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeException"); + jclass exceptionClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeException"); env->ThrowNew(exceptionClass, "Unknown native exception"); } } diff --git a/src/android/app/src/main/cpp/NativeAccount.cpp b/src/android/app/src/main/cpp/NativeAccount.cpp index e35545a6..c2d52251 100644 --- a/src/android/app/src/main/cpp/NativeAccount.cpp +++ b/src/android/app/src/main/cpp/NativeAccount.cpp @@ -54,7 +54,7 @@ Java_info_cemu_cemu_nativeinterface_NativeAccount_saveAccount(JNIEnv* env, [[may { using namespace std::chrono; - jclass accountClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeAccount$Account"); + jclass accountClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeAccount$Account"); auto getAccountField = [&](const char* fieldName, const char* sig, auto getFieldFn) -> auto { auto getField = std::bind(getFieldFn, env, account_java, std::placeholders::_1); return getField(env->GetFieldID(accountClass, fieldName, sig)); @@ -101,7 +101,7 @@ extern "C" [[maybe_unused]] JNIEXPORT jobjectArray JNICALL Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccounts(JNIEnv* env, [[maybe_unused]] jclass clazz) { using namespace std::chrono; - jclass accountClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeAccount$Account"); + jclass accountClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeAccount$Account"); jmethodID accountCtrId = env->GetMethodID(accountClass, "", "(ILjava/lang/String;JBLjava/lang/String;IZ)V"); const auto& accounts = Account::GetAccounts(); @@ -138,7 +138,7 @@ Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccounts(JNIEnv* env, [[may extern "C" [[maybe_unused]] JNIEXPORT jobjectArray JNICALL Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccountCountries(JNIEnv* env, [[maybe_unused]] jclass clazz) { - jclass countryClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeAccount$AccountCountry"); + jclass countryClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeAccount$AccountCountry"); jmethodID countryCtrId = env->GetMethodID(countryClass, "", "(ILjava/lang/String;)V"); struct Country @@ -184,13 +184,13 @@ Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccountValidationErrors(JNI auto newError = [&](const ErrorType& error, auto... args) { return env->NewObject(error.first, error.second, args...); }; - auto missingOTPError = getErrorType("com/izzy2lost/weeu/nativeinterface/NativeAccount$MissingOTP"); - auto corruptedOTPError = getErrorType("com/izzy2lost/weeu/nativeinterface/NativeAccount$CorruptedOTP"); - auto missingSEEPROMError = getErrorType("com/izzy2lost/weeu/nativeinterface/NativeAccount$MissingSEEPROM"); - auto corruptedSEEPROMError = getErrorType("com/izzy2lost/weeu/nativeinterface/NativeAccount$CorruptedSEEPROM"); - auto missingFileError = getErrorType("com/izzy2lost/weeu/nativeinterface/NativeAccount$MissingFile", "(Ljava/lang/String;)V"); - auto accountError = getErrorType("com/izzy2lost/weeu/nativeinterface/NativeAccount$AccountError", "(I)V"); - auto baseErrorType = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeAccount$OnlineValidationError"); + auto missingOTPError = getErrorType("info/cemu/cemu/nativeinterface/NativeAccount$MissingOTP"); + auto corruptedOTPError = getErrorType("info/cemu/cemu/nativeinterface/NativeAccount$CorruptedOTP"); + auto missingSEEPROMError = getErrorType("info/cemu/cemu/nativeinterface/NativeAccount$MissingSEEPROM"); + auto corruptedSEEPROMError = getErrorType("info/cemu/cemu/nativeinterface/NativeAccount$CorruptedSEEPROM"); + auto missingFileError = getErrorType("info/cemu/cemu/nativeinterface/NativeAccount$MissingFile", "(Ljava/lang/String;)V"); + auto accountError = getErrorType("info/cemu/cemu/nativeinterface/NativeAccount$AccountError", "(I)V"); + auto baseErrorType = env->FindClass("info/cemu/cemu/nativeinterface/NativeAccount$OnlineValidationError"); uint32 persistentId = persistent_id; auto account = Account::GetAccount(persistentId); diff --git a/src/android/app/src/main/cpp/NativeGameTitles.cpp b/src/android/app/src/main/cpp/NativeGameTitles.cpp index 8bb104e5..181c1538 100644 --- a/src/android/app/src/main/cpp/NativeGameTitles.cpp +++ b/src/android/app/src/main/cpp/NativeGameTitles.cpp @@ -130,7 +130,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setGameTitleLoadedCallback( return; } jclass gameTitleLoadedCallbackClass = env->GetObjectClass(game_title_loaded_callback); - jmethodID onGameTitleLoadedMID = env->GetMethodID(gameTitleLoadedCallbackClass, "onGameTitleLoaded", "(Lcom/izzy2lost/weeu/nativeinterface/NativeGameTitles$Game;)V"); + jmethodID onGameTitleLoadedMID = env->GetMethodID(gameTitleLoadedCallbackClass, "onGameTitleLoaded", "(Linfo/cemu/cemu/nativeinterface/NativeGameTitles$Game;)V"); env->DeleteLocalRef(gameTitleLoadedCallbackClass); NativeGameTitles::s_gameTitleLoader.setOnTitleLoaded(std::make_shared(onGameTitleLoadedMID, game_title_loaded_callback)); } @@ -194,9 +194,9 @@ class SaveListCallback { JNIUtils::ScopedJNIENV env; m_saveListCallbackObj = JNIUtils::Scopedjobject(saveListCallbackObject); - JNIUtils::Scopedjclass saveCallbacksClass{"com/izzy2lost/weeu/nativeinterface/NativeGameTitles$SaveListCallback"}; - m_onSaveDiscoveredMID = env->GetMethodID(*saveCallbacksClass, "onSaveDiscovered", "(Lcom/izzy2lost/weeu/nativeinterface/NativeGameTitles$SaveData;)V"); - m_saveDataClass = JNIUtils::Scopedjclass("com/izzy2lost/weeu/nativeinterface/NativeGameTitles$SaveData"); + JNIUtils::Scopedjclass saveCallbacksClass{"info/cemu/cemu/nativeinterface/NativeGameTitles$SaveListCallback"}; + m_onSaveDiscoveredMID = env->GetMethodID(*saveCallbacksClass, "onSaveDiscovered", "(Linfo/cemu/cemu/nativeinterface/NativeGameTitles$SaveData;)V"); + m_saveDataClass = JNIUtils::Scopedjclass("info/cemu/cemu/nativeinterface/NativeGameTitles$SaveData"); m_saveDataConstructorMID = env->GetMethodID(*m_saveDataClass, "", "(Ljava/lang/String;Ljava/lang/String;JJSI)V"); m_callbackIdSaveList = CafeSaveList::RegisterCallback( [](CafeSaveListCallbackEvent* evt, void* ctx) { @@ -281,11 +281,11 @@ class TitleListCallbacks { JNIUtils::ScopedJNIENV env; m_titleListCallbacksObj = JNIUtils::Scopedjobject(titleListCallbacks); - jclass titleCallbacksClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleListCallbacks"); - m_onTitleDiscoveredMID = env->GetMethodID(titleCallbacksClass, "onTitleDiscovered", "(Lcom/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleData;)V"); + jclass titleCallbacksClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeGameTitles$TitleListCallbacks"); + m_onTitleDiscoveredMID = env->GetMethodID(titleCallbacksClass, "onTitleDiscovered", "(Linfo/cemu/cemu/nativeinterface/NativeGameTitles$TitleData;)V"); m_onTitleRemovedMID = env->GetMethodID(titleCallbacksClass, "onTitleRemoved", "(J)V"); env->DeleteLocalRef(titleCallbacksClass); - m_titleDataClass = JNIUtils::Scopedjclass("com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleData"); + m_titleDataClass = JNIUtils::Scopedjclass("info/cemu/cemu/nativeinterface/NativeGameTitles$TitleData"); m_titleDataConstructorMID = env->GetMethodID(*m_titleDataClass, "", "(Ljava/lang/String;Ljava/lang/String;JJSIII)V"); m_callbackIdTitleList = CafeTitleList::RegisterCallback( [](CafeTitleListCallbackEvent* evt, void* ctx) { @@ -340,11 +340,11 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_checkIfTitleExists(JNIEnv* auto createTitleExistsStatus = [&](jobject existsError = nullptr) { if (existsError == nullptr) - existsError = JNIUtils::newObject(env, "com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleExistsError$None"); + existsError = JNIUtils::newObject(env, "info/cemu/cemu/nativeinterface/NativeGameTitles$TitleExistsError$None"); return JNIUtils::newObject( env, - "com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleExistsStatus", - "(Lcom/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleExistsError;Ljava/lang/String;)V", + "info/cemu/cemu/nativeinterface/NativeGameTitles$TitleExistsStatus", + "(Linfo/cemu/cemu/nativeinterface/NativeGameTitles$TitleExistsError;Ljava/lang/String;)V", existsError, JNIUtils::toJString(env, target_location)); }; @@ -373,7 +373,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_checkIfTitleExists(JNIEnv* { jobject err = JNIUtils::newObject( env, - "com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleExistsError$DifferentType", + "info/cemu/cemu/nativeinterface/NativeGameTitles$TitleExistsError$DifferentType", "(II)V", oldType, toInstallType); @@ -381,12 +381,12 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_checkIfTitleExists(JNIEnv* } else if (tmp.GetAppTitleVersion() == titleInfo.GetAppTitleVersion()) { - jobject err = JNIUtils::newObject(env, "com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleExistsError$SameVersion"); + jobject err = JNIUtils::newObject(env, "info/cemu/cemu/nativeinterface/NativeGameTitles$TitleExistsError$SameVersion"); return createTitleExistsStatus(err); } else if (tmp.GetAppTitleVersion() > titleInfo.GetAppTitleVersion()) { - jobject err = JNIUtils::newObject(env, "com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleExistsError$NewVersion"); + jobject err = JNIUtils::newObject(env, "info/cemu/cemu/nativeinterface/NativeGameTitles$TitleExistsError$NewVersion"); return createTitleExistsStatus(err); } } catch (const std::exception& ex) @@ -413,8 +413,8 @@ extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL Java_info_cemu_cemu_nativeinterface_NativeGameTitles_queueTitleToCompress(JNIEnv* env, [[maybe_unused]] jclass clazz, jlong titleId, jlong selectedUID, jobject titlesCallback) { jclass titlesCallbackClass = env->GetObjectClass(titlesCallback); - jmethodID getTitlesMID = env->GetMethodID(titlesCallbackClass, "getTitlesByTitleId", "(J)[Lcom/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleIdToTitlesCallback$Title;"); - jclass titleClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleIdToTitlesCallback$Title"); + jmethodID getTitlesMID = env->GetMethodID(titlesCallbackClass, "getTitlesByTitleId", "(J)[Linfo/cemu/cemu/nativeinterface/NativeGameTitles$TitleIdToTitlesCallback$Title;"); + jclass titleClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeGameTitles$TitleIdToTitlesCallback$Title"); jfieldID versionFieldId = env->GetFieldID(titleClass, "version", "S"); jfieldID titleUIDFieldId = env->GetFieldID(titleClass, "titleUID", "J"); @@ -502,7 +502,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_queueTitleToCompress(JNIEnv jobject compressTitleInfo = JNIUtils::newObject( env, - "com/izzy2lost/weeu/nativeinterface/NativeGameTitles$CompressTitleInfo", + "info/cemu/cemu/nativeinterface/NativeGameTitles$CompressTitleInfo", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", getTitlePrintPath(titleInfo_base), getTitlePrintPath(titleInfo_update), diff --git a/src/android/app/src/main/cpp/NativeGraphicPacks.cpp b/src/android/app/src/main/cpp/NativeGraphicPacks.cpp index bea70365..15badc5c 100644 --- a/src/android/app/src/main/cpp/NativeGraphicPacks.cpp +++ b/src/android/app/src/main/cpp/NativeGraphicPacks.cpp @@ -42,7 +42,7 @@ namespace NativeGraphicPacks jobject getGraphicPresets(JNIEnv* env, GraphicPackPtr graphicPack, sint64 id) { - auto graphicPackPresetClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeGraphicPacks$GraphicPackPreset"); + auto graphicPackPresetClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeGraphicPacks$GraphicPackPreset"); auto graphicPackPresetCtorId = env->GetMethodID(graphicPackPresetClass, "", "(JLjava/lang/String;Ljava/util/ArrayList;Ljava/lang/String;)V"); std::vector order; @@ -98,7 +98,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_refreshGraphicPacks([[may extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_getGraphicPackBasicInfos(JNIEnv* env, [[maybe_unused]] jclass clazz) { - auto graphicPackInfoClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeGraphicPacks$GraphicPackBasicInfo"); + auto graphicPackInfoClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeGraphicPacks$GraphicPackBasicInfo"); auto graphicPackInfoCtorId = env->GetMethodID(graphicPackInfoClass, "", "(JLjava/lang/String;ZLjava/util/ArrayList;)V"); std::vector graphicPackInfoJObjects; @@ -117,7 +117,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_getGraphicPackBasicInfos( extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_getGraphicPack(JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id) { - auto graphicPackClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeGraphicPacks$GraphicPack"); + auto graphicPackClass = env->FindClass("info/cemu/cemu/nativeinterface/NativeGraphicPacks$GraphicPack"); auto graphicPackCtorId = env->GetMethodID(graphicPackClass, "", "(JZLjava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;)V"); auto graphicPack = NativeGraphicPacks::s_graphicPacks.at(id); diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameViewModel.kt b/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameViewModel.kt deleted file mode 100644 index 241c4d8e..00000000 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameViewModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.izzy2lost.weeu.gamelist - -import androidx.lifecycle.ViewModel -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles.Game - -class GameViewModel(var game: Game? = null) : ViewModel() diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/CemuApplication.kt b/src/android/app/src/main/java/info/cemu/cemu/CemuApplication.kt similarity index 81% rename from src/android/app/src/main/java/com/izzy2lost/weeu/CemuApplication.kt rename to src/android/app/src/main/java/info/cemu/cemu/CemuApplication.kt index fa8d0843..651de7de 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/CemuApplication.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/CemuApplication.kt @@ -1,19 +1,19 @@ -package com.izzy2lost.weeu +package info.cemu.cemu import android.app.Application -import com.izzy2lost.weeu.common.android.context.internalFolder -import com.izzy2lost.weeu.common.ui.localization.setLanguage -import com.izzy2lost.weeu.common.ui.localization.setTranslations -import com.izzy2lost.weeu.nativeinterface.NativeActiveSettings.initializeActiveSettings -import com.izzy2lost.weeu.nativeinterface.NativeActiveSettings.setInternalDir -import com.izzy2lost.weeu.nativeinterface.NativeActiveSettings.setNativeLibDir -import com.izzy2lost.weeu.nativeinterface.NativeEmulation.initializeEmulation -import com.izzy2lost.weeu.nativeinterface.NativeEmulation.setDPI -import com.izzy2lost.weeu.nativeinterface.NativeGraphicPacks.refreshGraphicPacks -import com.izzy2lost.weeu.nativeinterface.NativeLogging.crashLog -import com.izzy2lost.weeu.nativeinterface.NativeSwkbd.initializeSwkbd -import com.izzy2lost.weeu.common.settings.SettingsManager -import com.izzy2lost.weeu.nativeinterface.NativeFiles +import info.cemu.cemu.common.android.context.internalFolder +import info.cemu.cemu.common.ui.localization.setLanguage +import info.cemu.cemu.common.ui.localization.setTranslations +import info.cemu.cemu.nativeinterface.NativeActiveSettings.initializeActiveSettings +import info.cemu.cemu.nativeinterface.NativeActiveSettings.setInternalDir +import info.cemu.cemu.nativeinterface.NativeActiveSettings.setNativeLibDir +import info.cemu.cemu.nativeinterface.NativeEmulation.initializeEmulation +import info.cemu.cemu.nativeinterface.NativeEmulation.setDPI +import info.cemu.cemu.nativeinterface.NativeGraphicPacks.refreshGraphicPacks +import info.cemu.cemu.nativeinterface.NativeLogging.crashLog +import info.cemu.cemu.nativeinterface.NativeSwkbd.initializeSwkbd +import info.cemu.cemu.common.settings.SettingsManager +import info.cemu.cemu.nativeinterface.NativeFiles import java.io.File import java.io.IOException import java.io.PrintWriter diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/MainActivity.kt b/src/android/app/src/main/java/info/cemu/cemu/MainActivity.kt similarity index 88% rename from src/android/app/src/main/java/com/izzy2lost/weeu/MainActivity.kt rename to src/android/app/src/main/java/info/cemu/cemu/MainActivity.kt index 7dc5184e..4f204812 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/MainActivity.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/MainActivity.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu +package info.cemu.cemu import android.app.PendingIntent import android.content.Context @@ -32,24 +32,24 @@ import androidx.compose.ui.unit.dp import androidx.documentfile.provider.DocumentFile import androidx.navigation.compose.NavHost import androidx.navigation.compose.rememberNavController -import com.izzy2lost.weeu.about.AboutCemuRoute -import com.izzy2lost.weeu.about.aboutCemuNavigation -import com.izzy2lost.weeu.common.ui.components.ActivityContent -import com.izzy2lost.weeu.common.ui.localization.TranslatableContent -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.emulation.EmulationActivity -import com.izzy2lost.weeu.gamelist.GameListRoute -import com.izzy2lost.weeu.gamelist.gameListNavigation -import com.izzy2lost.weeu.graphicpacks.GraphicPacksRoute -import com.izzy2lost.weeu.graphicpacks.graphicPacksNavigation -import com.izzy2lost.weeu.nativeinterface.NativeActiveSettings -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles.Game -import com.izzy2lost.weeu.nativeinterface.NativeSettings -import com.izzy2lost.weeu.provider.DocumentsProvider -import com.izzy2lost.weeu.settings.SettingsRoute -import com.izzy2lost.weeu.settings.settingsNavigation -import com.izzy2lost.weeu.titlemanager.TitleManagerRoute -import com.izzy2lost.weeu.titlemanager.titleManagerNavigation +import info.cemu.cemu.about.AboutCemuRoute +import info.cemu.cemu.about.aboutCemuNavigation +import info.cemu.cemu.common.ui.components.ActivityContent +import info.cemu.cemu.common.ui.localization.TranslatableContent +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.emulation.EmulationActivity +import info.cemu.cemu.gamelist.GameListRoute +import info.cemu.cemu.gamelist.gameListNavigation +import info.cemu.cemu.graphicpacks.GraphicPacksRoute +import info.cemu.cemu.graphicpacks.graphicPacksNavigation +import info.cemu.cemu.nativeinterface.NativeActiveSettings +import info.cemu.cemu.nativeinterface.NativeGameTitles.Game +import info.cemu.cemu.nativeinterface.NativeSettings +import info.cemu.cemu.provider.DocumentsProvider +import info.cemu.cemu.settings.SettingsRoute +import info.cemu.cemu.settings.settingsNavigation +import info.cemu.cemu.titlemanager.TitleManagerRoute +import info.cemu.cemu.titlemanager.titleManagerNavigation import java.io.File import android.graphics.drawable.Icon as AndroidIcon diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/about/AboutCemuNavigation.kt b/src/android/app/src/main/java/info/cemu/cemu/about/AboutCemuNavigation.kt similarity index 92% rename from src/android/app/src/main/java/com/izzy2lost/weeu/about/AboutCemuNavigation.kt rename to src/android/app/src/main/java/info/cemu/cemu/about/AboutCemuNavigation.kt index e9201536..459a326d 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/about/AboutCemuNavigation.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/about/AboutCemuNavigation.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.about +package info.cemu.cemu.about import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/about/AboutCemuScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/about/AboutCemuScreen.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/about/AboutCemuScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/about/AboutCemuScreen.kt index 6ae4e148..37a42d7f 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/about/AboutCemuScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/about/AboutCemuScreen.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.about +package info.cemu.cemu.about import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -37,10 +37,10 @@ import com.mikepenz.aboutlibraries.ui.compose.m3.LicenseDialog import com.mikepenz.aboutlibraries.ui.compose.m3.LicenseDialogBody import com.mikepenz.aboutlibraries.ui.compose.m3.libraryColors import com.mikepenz.aboutlibraries.ui.compose.util.author -import com.izzy2lost.weeu.BuildConfig -import com.izzy2lost.weeu.R -import com.izzy2lost.weeu.common.ui.components.ScreenContentLazy -import com.izzy2lost.weeu.common.ui.localization.tr +import info.cemu.cemu.BuildConfig +import info.cemu.cemu.R +import info.cemu.cemu.common.ui.components.ScreenContentLazy +import info.cemu.cemu.common.ui.localization.tr import kotlinx.collections.immutable.persistentListOf typealias AboutLibrary = com.mikepenz.aboutlibraries.entity.Library diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/android/contentresolver/ContentResolverExtensions.kt b/src/android/app/src/main/java/info/cemu/cemu/common/android/contentresolver/ContentResolverExtensions.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/android/contentresolver/ContentResolverExtensions.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/android/contentresolver/ContentResolverExtensions.kt index ee28f177..edacfe6b 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/android/contentresolver/ContentResolverExtensions.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/android/contentresolver/ContentResolverExtensions.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.android.contentresolver +package info.cemu.cemu.common.android.contentresolver import android.content.ContentResolver import android.net.Uri diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/android/context/ContextExtensions.kt b/src/android/app/src/main/java/info/cemu/cemu/common/android/context/ContextExtensions.kt similarity index 82% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/android/context/ContextExtensions.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/android/context/ContextExtensions.kt index 6d2c6795..855b92e0 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/android/context/ContextExtensions.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/android/context/ContextExtensions.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.android.context +package info.cemu.cemu.common.android.context import android.content.Context import java.io.File diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/android/inputdevice/InputDeviceExtensions.kt b/src/android/app/src/main/java/info/cemu/cemu/common/android/inputdevice/InputDeviceExtensions.kt similarity index 87% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/android/inputdevice/InputDeviceExtensions.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/android/inputdevice/InputDeviceExtensions.kt index 95f87199..a7faf6c6 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/android/inputdevice/InputDeviceExtensions.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/android/inputdevice/InputDeviceExtensions.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.android.inputdevice +package info.cemu.cemu.common.android.inputdevice import android.view.InputDevice diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/android/motionevent/MotionEventExtensions.kt b/src/android/app/src/main/java/info/cemu/cemu/common/android/motionevent/MotionEventExtensions.kt similarity index 84% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/android/motionevent/MotionEventExtensions.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/android/motionevent/MotionEventExtensions.kt index 37b6bf92..df2abbea 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/android/motionevent/MotionEventExtensions.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/android/motionevent/MotionEventExtensions.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.android.motionevent +package info.cemu.cemu.common.android.motionevent import android.view.InputDevice import android.view.MotionEvent diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/collections/CollectionExtensions.kt b/src/android/app/src/main/java/info/cemu/cemu/common/collections/CollectionExtensions.kt similarity index 70% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/collections/CollectionExtensions.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/collections/CollectionExtensions.kt index 1c2dc283..0172ae17 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/collections/CollectionExtensions.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/collections/CollectionExtensions.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.collections +package info.cemu.cemu.common.collections fun Set.toggleInSet(item: T): Set { diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/io/IOUtils.kt b/src/android/app/src/main/java/info/cemu/cemu/common/io/IOUtils.kt similarity index 90% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/io/IOUtils.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/io/IOUtils.kt index daaac419..654f8911 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/io/IOUtils.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/io/IOUtils.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.io +package info.cemu.cemu.common.io import java.io.InputStream import java.nio.file.Path diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/io/JsonUtils.kt b/src/android/app/src/main/java/info/cemu/cemu/common/io/JsonUtils.kt similarity index 92% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/io/JsonUtils.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/io/JsonUtils.kt index b8e44c72..7bacaa3e 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/io/JsonUtils.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/io/JsonUtils.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.io +package info.cemu.cemu.common.io import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/io/ZipUtils.kt b/src/android/app/src/main/java/info/cemu/cemu/common/io/ZipUtils.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/io/ZipUtils.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/io/ZipUtils.kt index 7e878b2f..cb304f29 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/io/ZipUtils.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/io/ZipUtils.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.io +package info.cemu.cemu.common.io import java.io.FileOutputStream import java.io.InputStream diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/settings/PreferenceDelegate.kt b/src/android/app/src/main/java/info/cemu/cemu/common/settings/PreferenceDelegate.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/settings/PreferenceDelegate.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/settings/PreferenceDelegate.kt index a80c3d21..df0d39bf 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/settings/PreferenceDelegate.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/settings/PreferenceDelegate.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.settings +package info.cemu.cemu.common.settings import android.content.SharedPreferences import kotlin.properties.ReadWriteProperty diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/settings/SettingsManager.kt b/src/android/app/src/main/java/info/cemu/cemu/common/settings/SettingsManager.kt similarity index 92% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/settings/SettingsManager.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/settings/SettingsManager.kt index e467722a..c8cc1aa6 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/settings/SettingsManager.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/settings/SettingsManager.kt @@ -1,8 +1,8 @@ -package com.izzy2lost.weeu.common.settings +package info.cemu.cemu.common.settings import android.content.Context import android.content.SharedPreferences -import com.izzy2lost.weeu.common.ui.localization.DEFAULT_LANGUAGE +import info.cemu.cemu.common.ui.localization.DEFAULT_LANGUAGE import kotlin.getValue enum class GamePadPosition { diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/string/StringExtensions.kt b/src/android/app/src/main/java/info/cemu/cemu/common/string/StringExtensions.kt similarity index 89% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/string/StringExtensions.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/string/StringExtensions.kt index 80256ccd..78facc1a 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/string/StringExtensions.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/string/StringExtensions.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.string +package info.cemu.cemu.common.string import java.net.URLDecoder diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ActivityContent.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ActivityContent.kt similarity index 82% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ActivityContent.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ActivityContent.kt index 83992db8..9ade7d83 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ActivityContent.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ActivityContent.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.izzy2lost.weeu.common.ui.theme.CemuTheme +import info.cemu.cemu.common.ui.theme.CemuTheme @Composable fun ActivityContent(content: @Composable () -> Unit) { diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Button.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Button.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Button.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Button.kt index 6347218e..cd2cc30d 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Button.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Button.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ComposeExtensions.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ComposeExtensions.kt similarity index 87% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ComposeExtensions.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ComposeExtensions.kt index c2c56107..5c895954 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ComposeExtensions.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ComposeExtensions.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import android.text.format.Formatter import androidx.compose.runtime.Composable diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/DrawerLayout.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/DrawerLayout.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/DrawerLayout.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/DrawerLayout.kt index 95429b6b..d8109bb9 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/DrawerLayout.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/DrawerLayout.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import android.content.Context import android.util.AttributeSet diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/FilledSearchToolbar.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/FilledSearchToolbar.kt similarity index 99% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/FilledSearchToolbar.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/FilledSearchToolbar.kt index 3de59ff0..b0329c80 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/FilledSearchToolbar.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/FilledSearchToolbar.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.Box diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Header.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Header.kt similarity index 91% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Header.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Header.kt index 88c70c0c..5e0bd7ae 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Header.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Header.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ScreenContent.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ScreenContent.kt similarity index 99% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ScreenContent.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ScreenContent.kt index 6171cf68..14f0f359 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/ScreenContent.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/ScreenContent.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/SingleSelection.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/SingleSelection.kt similarity index 98% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/SingleSelection.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/SingleSelection.kt index b2075242..bc084307 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/SingleSelection.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/SingleSelection.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -30,7 +30,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Dialog -import com.izzy2lost.weeu.common.ui.localization.tr +import info.cemu.cemu.common.ui.localization.tr @Composable fun SingleSelection( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Slider.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Slider.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Slider.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Slider.kt index 4e497b67..6c5e3db8 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Slider.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Slider.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import androidx.annotation.IntRange import androidx.compose.foundation.layout.Column diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Toggle.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Toggle.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Toggle.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Toggle.kt index f1842871..0187fc72 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/components/Toggle.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/components/Toggle.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.components +package info.cemu.cemu.common.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/NativeTranslationHelpers.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/NativeTranslationHelpers.kt similarity index 80% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/NativeTranslationHelpers.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/NativeTranslationHelpers.kt index aac06499..72e9375f 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/NativeTranslationHelpers.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/NativeTranslationHelpers.kt @@ -1,7 +1,7 @@ -package com.izzy2lost.weeu.common.ui.localization +package info.cemu.cemu.common.ui.localization -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles.ConsoleRegion -import com.izzy2lost.weeu.nativeinterface.NativeInput.EmulatedControllerType +import info.cemu.cemu.nativeinterface.NativeGameTitles.ConsoleRegion +import info.cemu.cemu.nativeinterface.NativeInput.EmulatedControllerType fun regionToString(region: Int): String = when (region) { ConsoleRegion.JPN -> tr("Japan") diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/PoFile.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/PoFile.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/PoFile.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/PoFile.kt index e2138e61..ed2e9e3b 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/PoFile.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/PoFile.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.localization +package info.cemu.cemu.common.ui.localization import java.io.InputStream diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/Translation.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/Translation.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/Translation.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/Translation.kt index a59f0729..0d345cc2 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/localization/Translation.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/localization/Translation.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.localization +package info.cemu.cemu.common.ui.localization import android.content.Context import android.util.Log @@ -8,7 +8,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.runtime.staticCompositionLocalOf -import com.izzy2lost.weeu.nativeinterface.NativeLocalization +import info.cemu.cemu.nativeinterface.NativeLocalization import name.kropp.kotlinx.gettext.Gettext import name.kropp.kotlinx.gettext.Locale import name.kropp.kotlinx.gettext.load diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/theme/Theme.kt b/src/android/app/src/main/java/info/cemu/cemu/common/ui/theme/Theme.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/theme/Theme.kt rename to src/android/app/src/main/java/info/cemu/cemu/common/ui/theme/Theme.kt index e51708b6..bb5e3c39 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/theme/Theme.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/common/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.common.ui.theme +package info.cemu.cemu.common.ui.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/CanvasOnTouchListener.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/CanvasOnTouchListener.kt similarity index 93% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/CanvasOnTouchListener.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/CanvasOnTouchListener.kt index 4db09a7a..16545cec 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/CanvasOnTouchListener.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/CanvasOnTouchListener.kt @@ -1,9 +1,9 @@ -package com.izzy2lost.weeu.emulation +package info.cemu.cemu.emulation import android.annotation.SuppressLint import android.view.MotionEvent import android.view.View -import com.izzy2lost.weeu.nativeinterface.NativeInput +import info.cemu.cemu.nativeinterface.NativeInput class CanvasOnTouchListener(val isTV: Boolean) : View.OnTouchListener { private var currentPointerId: Int = -1 diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/EmulationActivity.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/EmulationActivity.kt similarity index 95% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/EmulationActivity.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/EmulationActivity.kt index 81424e66..8e6b5b68 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/EmulationActivity.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/EmulationActivity.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation +package info.cemu.cemu.emulation import android.annotation.SuppressLint import android.graphics.SurfaceTexture @@ -21,19 +21,19 @@ import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.izzy2lost.weeu.BuildConfig -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.databinding.ActivityEmulationBinding -import com.izzy2lost.weeu.databinding.LayoutSideMenuCheckboxItemBinding -import com.izzy2lost.weeu.databinding.LayoutSideMenuEmulationBinding -import com.izzy2lost.weeu.databinding.LayoutSideMenuTextItemBinding -import com.izzy2lost.weeu.nativeinterface.NativeEmulation -import com.izzy2lost.weeu.nativeinterface.NativeException -import com.izzy2lost.weeu.common.settings.EmulationSettings -import com.izzy2lost.weeu.common.settings.GamePadPosition -import com.izzy2lost.weeu.common.settings.InputOverlaySettings -import com.izzy2lost.weeu.common.settings.SettingsManager -import com.izzy2lost.weeu.emulation.inputoverlay.InputOverlaySurfaceView +import info.cemu.cemu.BuildConfig +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.databinding.ActivityEmulationBinding +import info.cemu.cemu.databinding.LayoutSideMenuCheckboxItemBinding +import info.cemu.cemu.databinding.LayoutSideMenuEmulationBinding +import info.cemu.cemu.databinding.LayoutSideMenuTextItemBinding +import info.cemu.cemu.nativeinterface.NativeEmulation +import info.cemu.cemu.nativeinterface.NativeException +import info.cemu.cemu.common.settings.EmulationSettings +import info.cemu.cemu.common.settings.GamePadPosition +import info.cemu.cemu.common.settings.InputOverlaySettings +import info.cemu.cemu.common.settings.SettingsManager +import info.cemu.cemu.emulation.inputoverlay.InputOverlaySurfaceView import java.lang.ref.WeakReference import kotlin.system.exitProcess diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/EmulationTextInputEditText.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/EmulationTextInputEditText.kt similarity index 91% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/EmulationTextInputEditText.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/EmulationTextInputEditText.kt index ccbbe022..2e778e0a 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/EmulationTextInputEditText.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/EmulationTextInputEditText.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation +package info.cemu.cemu.emulation import android.content.Context import android.content.DialogInterface @@ -14,8 +14,8 @@ import com.google.android.material.R import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeSwkbd +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeSwkbd import java.util.regex.Pattern class EmulationTextInputEditText @JvmOverloads constructor( @@ -92,12 +92,12 @@ fun showEmulationTextInputDialog( val inputEditTextLayout = layoutInflater.inflate( - com.izzy2lost.weeu.R.layout.layout_emulation_input, + info.cemu.cemu.R.layout.layout_emulation_input, null ) val inputEditText = - inputEditTextLayout.requireViewById(com.izzy2lost.weeu.R.id.emulation_input_text) + inputEditTextLayout.requireViewById(info.cemu.cemu.R.id.emulation_input_text) inputEditText.updateText(initialText) @@ -118,7 +118,7 @@ fun showEmulationTextInputDialog( } val parentTextInputLayout = - inputEditTextLayout.requireViewById(com.izzy2lost.weeu.R.id.emulation_input_layout) + inputEditTextLayout.requireViewById(info.cemu.cemu.R.id.emulation_input_layout) if (maxLength > 0) { parentTextInputLayout.isCounterEnabled = true diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/InputHandler.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/InputHandler.kt similarity index 81% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/InputHandler.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/InputHandler.kt index 0ebad9c8..ec745496 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/InputHandler.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/InputHandler.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.emulation +package info.cemu.cemu.emulation import android.view.KeyEvent import android.view.MotionEvent -import com.izzy2lost.weeu.common.android.inputdevice.isGameController -import com.izzy2lost.weeu.common.android.motionevent.isMotionEventFromJoystickOrGamepad -import com.izzy2lost.weeu.nativeinterface.NativeInput.onNativeAxis -import com.izzy2lost.weeu.nativeinterface.NativeInput.onNativeKey +import info.cemu.cemu.common.android.inputdevice.isGameController +import info.cemu.cemu.common.android.motionevent.isMotionEventFromJoystickOrGamepad +import info.cemu.cemu.nativeinterface.NativeInput.onNativeAxis +import info.cemu.cemu.nativeinterface.NativeInput.onNativeKey private fun KeyEvent.isSpecialKey(): Boolean { return keyCode == KeyEvent.KEYCODE_VOLUME_DOWN diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/SensorManager.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/SensorManager.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/SensorManager.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/SensorManager.kt index 26a926aa..6ac97b5c 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/SensorManager.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/SensorManager.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation +package info.cemu.cemu.emulation import android.content.Context import android.hardware.Sensor @@ -6,7 +6,7 @@ import android.hardware.SensorEvent import android.hardware.SensorEventListener import android.hardware.SensorManager import android.view.Surface -import com.izzy2lost.weeu.nativeinterface.NativeInput +import info.cemu.cemu.nativeinterface.NativeInput class SensorManager(context: Context) : SensorEventListener { private val sensorManager = diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/SurfaceChangedListener.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/SurfaceChangedListener.kt similarity index 92% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/SurfaceChangedListener.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/SurfaceChangedListener.kt index dbfb034e..122f2988 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/SurfaceChangedListener.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/SurfaceChangedListener.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation +package info.cemu.cemu.emulation import android.view.SurfaceHolder diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/CanvasExtensions.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/CanvasExtensions.kt similarity index 95% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/CanvasExtensions.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/CanvasExtensions.kt index abc0ef7c..c9717063 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/CanvasExtensions.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/CanvasExtensions.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation.inputoverlay +package info.cemu.cemu.emulation.inputoverlay import android.graphics.Canvas import android.graphics.Paint diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/Colors.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/Colors.kt similarity index 90% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/Colors.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/Colors.kt index 51dddc36..c5b892bd 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/Colors.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/Colors.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation.inputoverlay +package info.cemu.cemu.emulation.inputoverlay import android.graphics.Color diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlayDefaultConfigParser.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlayDefaultConfigParser.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlayDefaultConfigParser.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlayDefaultConfigParser.kt index feb211a6..58c2d0cb 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlayDefaultConfigParser.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlayDefaultConfigParser.kt @@ -1,6 +1,6 @@ -package com.izzy2lost.weeu.emulation.inputoverlay +package info.cemu.cemu.emulation.inputoverlay -import com.izzy2lost.weeu.common.string.toIntOrZero +import info.cemu.cemu.common.string.toIntOrZero import org.xmlpull.v1.XmlPullParser data class InputConfig( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlayInputsSettingsManager.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlayInputsSettingsManager.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlayInputsSettingsManager.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlayInputsSettingsManager.kt index be8e35a1..7822a568 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlayInputsSettingsManager.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlayInputsSettingsManager.kt @@ -1,10 +1,10 @@ -package com.izzy2lost.weeu.emulation.inputoverlay +package info.cemu.cemu.emulation.inputoverlay import android.content.Context import android.content.SharedPreferences import android.graphics.Rect import android.util.DisplayMetrics.DENSITY_DEFAULT -import com.izzy2lost.weeu.R +import info.cemu.cemu.R import kotlin.math.max import kotlin.math.min diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlaySurfaceView.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlaySurfaceView.kt similarity index 94% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlaySurfaceView.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlaySurfaceView.kt index cf8f2fae..55400cc4 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/InputOverlaySurfaceView.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/InputOverlaySurfaceView.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation.inputoverlay +package info.cemu.cemu.emulation.inputoverlay import android.content.Context import android.graphics.Canvas @@ -12,23 +12,23 @@ import android.view.MotionEvent import android.view.SurfaceView import android.view.View import android.view.View.OnTouchListener -import com.izzy2lost.weeu.R -import com.izzy2lost.weeu.common.settings.SettingsManager -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.DPadInput -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.Input -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.Joystick -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.RectangleButton -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.RoundButton -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing.BlowButtonInnerDrawing -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing.ButtonInnerDrawing -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing.HomeButtonInnerDrawing -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing.StickClickInnerDrawing -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing.TextButtonInnerDrawing -import com.izzy2lost.weeu.nativeinterface.NativeInput -import com.izzy2lost.weeu.nativeinterface.NativeInput.getControllerType -import com.izzy2lost.weeu.nativeinterface.NativeInput.isControllerDisabled -import com.izzy2lost.weeu.nativeinterface.NativeInput.onOverlayAxis -import com.izzy2lost.weeu.nativeinterface.NativeInput.onOverlayButton +import info.cemu.cemu.R +import info.cemu.cemu.common.settings.SettingsManager +import info.cemu.cemu.emulation.inputoverlay.inputs.DPadInput +import info.cemu.cemu.emulation.inputoverlay.inputs.Input +import info.cemu.cemu.emulation.inputoverlay.inputs.Joystick +import info.cemu.cemu.emulation.inputoverlay.inputs.RectangleButton +import info.cemu.cemu.emulation.inputoverlay.inputs.RoundButton +import info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing.BlowButtonInnerDrawing +import info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing.ButtonInnerDrawing +import info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing.HomeButtonInnerDrawing +import info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing.StickClickInnerDrawing +import info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing.TextButtonInnerDrawing +import info.cemu.cemu.nativeinterface.NativeInput +import info.cemu.cemu.nativeinterface.NativeInput.getControllerType +import info.cemu.cemu.nativeinterface.NativeInput.isControllerDisabled +import info.cemu.cemu.nativeinterface.NativeInput.onOverlayAxis +import info.cemu.cemu.nativeinterface.NativeInput.onOverlayButton import kotlin.math.roundToInt class InputOverlaySurfaceView(context: Context, attrs: AttributeSet?) : diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/OverlayInput.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/OverlayInput.kt similarity index 93% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/OverlayInput.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/OverlayInput.kt index 992a7034..7ec1fd17 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/OverlayInput.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/OverlayInput.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation.inputoverlay +package info.cemu.cemu.emulation.inputoverlay sealed interface OverlayInput { val configName: String diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Button.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Button.kt similarity index 95% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Button.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Button.kt index f4695226..938dd63e 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Button.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Button.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs +package info.cemu.cemu.emulation.inputoverlay.inputs import android.graphics.Rect import android.view.MotionEvent diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/DPadInput.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/DPadInput.kt similarity index 95% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/DPadInput.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/DPadInput.kt index a87b71af..4f3dae41 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/DPadInput.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/DPadInput.kt @@ -1,13 +1,13 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs +package info.cemu.cemu.emulation.inputoverlay.inputs import android.graphics.Canvas import android.graphics.Rect import android.graphics.RectF import android.view.MotionEvent -import com.izzy2lost.weeu.emulation.inputoverlay.fillCircleWithStroke -import com.izzy2lost.weeu.emulation.inputoverlay.fillRoundRectangleWithStroke -import com.izzy2lost.weeu.emulation.inputoverlay.Colors -import com.izzy2lost.weeu.emulation.inputoverlay.OverlayDpad +import info.cemu.cemu.emulation.inputoverlay.fillCircleWithStroke +import info.cemu.cemu.emulation.inputoverlay.fillRoundRectangleWithStroke +import info.cemu.cemu.emulation.inputoverlay.Colors +import info.cemu.cemu.emulation.inputoverlay.OverlayDpad import kotlin.math.atan2 import kotlin.math.min diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Input.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Input.kt similarity index 95% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Input.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Input.kt index 273a6a1d..47497a9f 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Input.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Input.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs +package info.cemu.cemu.emulation.inputoverlay.inputs import android.graphics.Canvas import android.graphics.Paint import android.graphics.Rect import android.view.MotionEvent import androidx.annotation.ColorInt -import com.izzy2lost.weeu.emulation.inputoverlay.Colors +import info.cemu.cemu.emulation.inputoverlay.Colors import kotlin.math.max import kotlin.math.min diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Joystick.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Joystick.kt similarity index 95% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Joystick.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Joystick.kt index 1586acd5..c2e4c91d 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/Joystick.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/Joystick.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs +package info.cemu.cemu.emulation.inputoverlay.inputs import android.graphics.Canvas import android.graphics.Paint import android.graphics.Rect import android.view.MotionEvent -import com.izzy2lost.weeu.emulation.inputoverlay.Colors -import com.izzy2lost.weeu.emulation.inputoverlay.fillCircleWithStroke +import info.cemu.cemu.emulation.inputoverlay.Colors +import info.cemu.cemu.emulation.inputoverlay.fillCircleWithStroke import kotlin.math.min import kotlin.math.sqrt diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/RectangleButton.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/RectangleButton.kt similarity index 86% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/RectangleButton.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/RectangleButton.kt index 9adc8c78..03d5c706 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/RectangleButton.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/RectangleButton.kt @@ -1,9 +1,9 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs +package info.cemu.cemu.emulation.inputoverlay.inputs import android.graphics.Canvas import android.graphics.Rect -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing.ButtonInnerDrawing -import com.izzy2lost.weeu.emulation.inputoverlay.fillRoundRectangleWithStroke +import info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing.ButtonInnerDrawing +import info.cemu.cemu.emulation.inputoverlay.fillRoundRectangleWithStroke class RectangleButton( private val innerDrawing: ButtonInnerDrawing, diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/RoundButton.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/RoundButton.kt similarity index 86% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/RoundButton.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/RoundButton.kt index fa2936fb..64d0c24f 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/RoundButton.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/RoundButton.kt @@ -1,9 +1,9 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs +package info.cemu.cemu.emulation.inputoverlay.inputs import android.graphics.Canvas import android.graphics.Rect -import com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing.ButtonInnerDrawing -import com.izzy2lost.weeu.emulation.inputoverlay.fillCircleWithStroke +import info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing.ButtonInnerDrawing +import info.cemu.cemu.emulation.inputoverlay.fillCircleWithStroke import kotlin.math.min class RoundButton( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/BlowButtonInnerDrawing.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/BlowButtonInnerDrawing.kt similarity index 92% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/BlowButtonInnerDrawing.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/BlowButtonInnerDrawing.kt index 419ecf83..557e89fb 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/BlowButtonInnerDrawing.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/BlowButtonInnerDrawing.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing +package info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing import android.graphics.Path import androidx.core.graphics.PathParser diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/ButtonInnerDrawing.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/ButtonInnerDrawing.kt similarity index 72% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/ButtonInnerDrawing.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/ButtonInnerDrawing.kt index bfdf6d2f..e5a3ee69 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/ButtonInnerDrawing.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/ButtonInnerDrawing.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing +package info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing import android.graphics.Canvas import android.graphics.Rect diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/HomeButtonInnerDrawing.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/HomeButtonInnerDrawing.kt similarity index 88% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/HomeButtonInnerDrawing.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/HomeButtonInnerDrawing.kt index 91c77836..18bce4f2 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/HomeButtonInnerDrawing.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/HomeButtonInnerDrawing.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing +package info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing import android.graphics.Path import androidx.core.graphics.PathParser diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/PathInnerDrawing.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/PathInnerDrawing.kt similarity index 90% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/PathInnerDrawing.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/PathInnerDrawing.kt index dc6717e5..52145344 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/PathInnerDrawing.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/PathInnerDrawing.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing +package info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing import android.graphics.Canvas import android.graphics.Matrix import android.graphics.Paint import android.graphics.Path import android.graphics.Rect -import com.izzy2lost.weeu.emulation.inputoverlay.Colors +import info.cemu.cemu.emulation.inputoverlay.Colors import kotlin.math.min abstract class PathInnerDrawing : ButtonInnerDrawing { diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/StickClickInnerDrawing.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/StickClickInnerDrawing.kt similarity index 93% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/StickClickInnerDrawing.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/StickClickInnerDrawing.kt index 9a7c6d5d..b8f1710f 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/StickClickInnerDrawing.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/StickClickInnerDrawing.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing +package info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing import android.graphics.Canvas import android.graphics.Matrix import android.graphics.Paint import android.graphics.Path import android.graphics.Rect -import com.izzy2lost.weeu.emulation.inputoverlay.Colors +import info.cemu.cemu.emulation.inputoverlay.Colors import kotlin.math.min class StickClickInnerDrawing : ButtonInnerDrawing { diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/TextButtonInnerDrawing.kt b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/TextButtonInnerDrawing.kt similarity index 92% rename from src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/TextButtonInnerDrawing.kt rename to src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/TextButtonInnerDrawing.kt index 079cfa9c..791cda11 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/emulation/inputoverlay/inputs/innerdrawing/TextButtonInnerDrawing.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/emulation/inputoverlay/inputs/innerdrawing/TextButtonInnerDrawing.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.emulation.inputoverlay.inputs.innerdrawing +package info.cemu.cemu.emulation.inputoverlay.inputs.innerdrawing import android.graphics.Canvas import android.graphics.Rect import android.text.StaticLayout import android.text.TextPaint import androidx.core.graphics.withTranslation -import com.izzy2lost.weeu.emulation.inputoverlay.Colors +import info.cemu.cemu.emulation.inputoverlay.Colors import kotlin.math.min class TextButtonInnerDrawing(private val text: String) : ButtonInnerDrawing { diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameDetailsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameDetailsScreen.kt similarity index 91% rename from src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameDetailsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/gamelist/GameDetailsScreen.kt index 2bbc8f8e..15aabdfd 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameDetailsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameDetailsScreen.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.gamelist +package info.cemu.cemu.gamelist import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -10,10 +10,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.localization.regionToString -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles.Game +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.localization.regionToString +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeGameTitles.Game import java.time.LocalDate import java.time.format.DateTimeFormatter import java.time.format.FormatStyle diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameIcon.kt b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameIcon.kt similarity index 91% rename from src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameIcon.kt rename to src/android/app/src/main/java/info/cemu/cemu/gamelist/GameIcon.kt index 36bc3f35..8752fcfd 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameIcon.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameIcon.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.gamelist +package info.cemu.cemu.gamelist import androidx.compose.foundation.Image import androidx.compose.foundation.border @@ -12,8 +12,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.izzy2lost.weeu.R -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles +import info.cemu.cemu.R +import info.cemu.cemu.nativeinterface.NativeGameTitles private fun Modifier.iconBorder(borderColor: Color) = diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameListNavigation.kt b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameListNavigation.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameListNavigation.kt rename to src/android/app/src/main/java/info/cemu/cemu/gamelist/GameListNavigation.kt index 1a0a455a..2593973d 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameListNavigation.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameListNavigation.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.gamelist +package info.cemu.cemu.gamelist import androidx.compose.animation.AnimatedContentScope import androidx.compose.foundation.layout.RowScope @@ -9,7 +9,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController import androidx.navigation.compose.composable import androidx.navigation.compose.navigation -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles +import info.cemu.cemu.nativeinterface.NativeGameTitles import kotlinx.serialization.Serializable @Serializable diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameListViewModel.kt b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameListViewModel.kt similarity index 91% rename from src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameListViewModel.kt rename to src/android/app/src/main/java/info/cemu/cemu/gamelist/GameListViewModel.kt index 32038b83..bad6a865 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameListViewModel.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameListViewModel.kt @@ -1,10 +1,10 @@ -package com.izzy2lost.weeu.gamelist +package info.cemu.cemu.gamelist import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles.Game -import com.izzy2lost.weeu.nativeinterface.NativeSettings +import info.cemu.cemu.nativeinterface.NativeGameTitles +import info.cemu.cemu.nativeinterface.NativeGameTitles.Game +import info.cemu.cemu.nativeinterface.NativeSettings import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameProfileEditScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameProfileEditScreen.kt similarity index 89% rename from src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameProfileEditScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/gamelist/GameProfileEditScreen.kt index 0988daa0..a7f8cec8 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GameProfileEditScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameProfileEditScreen.kt @@ -1,16 +1,16 @@ -package com.izzy2lost.weeu.gamelist +package info.cemu.cemu.gamelist import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.izzy2lost.weeu.common.ui.components.Header -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.components.SingleSelection -import com.izzy2lost.weeu.common.ui.components.Toggle -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles +import info.cemu.cemu.common.ui.components.Header +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.components.SingleSelection +import info.cemu.cemu.common.ui.components.Toggle +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeGameTitles @Composable fun GameProfileEditScreen(game: NativeGameTitles.Game?, navigateBack: () -> Unit) { diff --git a/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameViewModel.kt b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameViewModel.kt new file mode 100644 index 00000000..3e5efae1 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GameViewModel.kt @@ -0,0 +1,6 @@ +package info.cemu.cemu.gamelist + +import androidx.lifecycle.ViewModel +import info.cemu.cemu.nativeinterface.NativeGameTitles.Game + +class GameViewModel(var game: Game? = null) : ViewModel() diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GamesListScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GamesListScreen.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GamesListScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/gamelist/GamesListScreen.kt index d8cfe54a..ba952710 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/gamelist/GamesListScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/gamelist/GamesListScreen.kt @@ -2,7 +2,7 @@ ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class, ) -package com.izzy2lost.weeu.gamelist +package info.cemu.cemu.gamelist import androidx.activity.compose.BackHandler import androidx.compose.foundation.ExperimentalFoundationApi @@ -55,11 +55,11 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewmodel.compose.viewModel -import com.izzy2lost.weeu.R -import com.izzy2lost.weeu.common.ui.components.FilledSearchToolbar -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles.Game +import info.cemu.cemu.R +import info.cemu.cemu.common.ui.components.FilledSearchToolbar +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeGameTitles +import info.cemu.cemu.nativeinterface.NativeGameTitles.Game import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPackNodes.kt b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPackNodes.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPackNodes.kt rename to src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPackNodes.kt index 9f570517..ac951e28 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPackNodes.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPackNodes.kt @@ -1,6 +1,6 @@ -package com.izzy2lost.weeu.graphicpacks +package info.cemu.cemu.graphicpacks -import com.izzy2lost.weeu.nativeinterface.NativeGraphicPacks +import info.cemu.cemu.nativeinterface.NativeGraphicPacks import kotlin.math.max sealed class GraphicPackNode( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksDownloader.kt b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksDownloader.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksDownloader.kt rename to src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksDownloader.kt index 3baad6a1..b9a633ee 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksDownloader.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksDownloader.kt @@ -1,9 +1,9 @@ -package com.izzy2lost.weeu.graphicpacks +package info.cemu.cemu.graphicpacks import android.content.Context -import com.izzy2lost.weeu.BuildConfig -import com.izzy2lost.weeu.nativeinterface.NativeGraphicPacks -import com.izzy2lost.weeu.common.io.unzip +import info.cemu.cemu.BuildConfig +import info.cemu.cemu.nativeinterface.NativeGraphicPacks +import info.cemu.cemu.common.io.unzip import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okhttp3.OkHttpClient diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksNavigation.kt b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksNavigation.kt similarity index 91% rename from src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksNavigation.kt rename to src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksNavigation.kt index 3910a3c6..f5cdc078 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksNavigation.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksNavigation.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.graphicpacks +package info.cemu.cemu.graphicpacks import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksScreen.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksScreen.kt index 38856088..cc6d15ae 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksScreen.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package com.izzy2lost.weeu.graphicpacks +package info.cemu.cemu.graphicpacks import androidx.activity.compose.BackHandler import androidx.compose.foundation.background @@ -55,12 +55,12 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.dropUnlessResumed import androidx.lifecycle.viewmodel.compose.viewModel -import com.izzy2lost.weeu.R -import com.izzy2lost.weeu.common.ui.components.DefaultAppBarTitle -import com.izzy2lost.weeu.common.ui.components.ScreenContentLazy -import com.izzy2lost.weeu.common.ui.components.SearchToolbarInput -import com.izzy2lost.weeu.common.ui.components.SingleSelection -import com.izzy2lost.weeu.common.ui.localization.tr +import info.cemu.cemu.R +import info.cemu.cemu.common.ui.components.DefaultAppBarTitle +import info.cemu.cemu.common.ui.components.ScreenContentLazy +import info.cemu.cemu.common.ui.components.SearchToolbarInput +import info.cemu.cemu.common.ui.components.SingleSelection +import info.cemu.cemu.common.ui.localization.tr import kotlinx.coroutines.launch @Composable diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksViewModel.kt b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksViewModel.kt similarity index 98% rename from src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksViewModel.kt rename to src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksViewModel.kt index b8d43e31..4813a44c 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/graphicpacks/GraphicPacksViewModel.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksViewModel.kt @@ -1,10 +1,10 @@ -package com.izzy2lost.weeu.graphicpacks +package info.cemu.cemu.graphicpacks import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.izzy2lost.weeu.nativeinterface.NativeGameTitles -import com.izzy2lost.weeu.nativeinterface.NativeGraphicPacks +import info.cemu.cemu.nativeinterface.NativeGameTitles +import info.cemu.cemu.nativeinterface.NativeGraphicPacks import kotlinx.coroutines.Job import kotlinx.coroutines.cancelAndJoin import kotlinx.coroutines.flow.MutableStateFlow diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeAccount.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeAccount.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeAccount.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeAccount.kt index 4022ea4b..2edd48e1 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeAccount.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeAccount.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface import androidx.annotation.Keep diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeActiveSettings.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeActiveSettings.kt similarity index 91% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeActiveSettings.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeActiveSettings.kt index 7f936d92..c6432364 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeActiveSettings.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeActiveSettings.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface object NativeActiveSettings { @JvmStatic diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeEmulation.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeEmulation.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeEmulation.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeEmulation.kt index 373822b5..e31daef3 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeEmulation.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeEmulation.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface import android.view.Surface diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeException.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeException.kt similarity index 61% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeException.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeException.kt index 225de3ef..a1982492 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeException.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeException.kt @@ -1,3 +1,3 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface class NativeException(message: String) : RuntimeException(message) diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeFiles.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeFiles.kt similarity index 98% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeFiles.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeFiles.kt index fd7befac..47c6aac6 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeFiles.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeFiles.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface import android.content.ContentResolver import android.net.Uri diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeGameTitles.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeGameTitles.kt similarity index 99% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeGameTitles.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeGameTitles.kt index 1e1b9ae2..777a334e 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeGameTitles.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeGameTitles.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface import android.graphics.Bitmap import androidx.annotation.Keep diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeGraphicPacks.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeGraphicPacks.kt similarity index 98% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeGraphicPacks.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeGraphicPacks.kt index a85fdae4..eb2d7255 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeGraphicPacks.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeGraphicPacks.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface import androidx.annotation.Keep import java.util.Objects diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeInput.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeInput.kt similarity index 99% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeInput.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeInput.kt index 70157002..df53384d 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeInput.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeInput.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface object NativeInput { object VPADButton { diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeLocalization.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeLocalization.kt similarity index 72% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeLocalization.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeLocalization.kt index 4c0be16d..daa4c2fb 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeLocalization.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeLocalization.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface object NativeLocalization { @JvmStatic diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeLogging.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeLogging.kt similarity index 76% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeLogging.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeLogging.kt index 3fd1fd7b..e3f435c9 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeLogging.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeLogging.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface object NativeLogging { @JvmStatic diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeSettings.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeSettings.kt similarity index 99% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeSettings.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeSettings.kt index 4c82dd54..2cf78594 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeSettings.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeSettings.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface object NativeSettings { @JvmStatic diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeSwkbd.kt b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeSwkbd.kt similarity index 85% rename from src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeSwkbd.kt rename to src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeSwkbd.kt index d013af21..0611194d 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/nativeinterface/NativeSwkbd.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/nativeinterface/NativeSwkbd.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.nativeinterface +package info.cemu.cemu.nativeinterface object NativeSwkbd { @JvmStatic diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/provider/DocumentsProvider.kt b/src/android/app/src/main/java/info/cemu/cemu/provider/DocumentsProvider.kt similarity index 98% rename from src/android/app/src/main/java/com/izzy2lost/weeu/provider/DocumentsProvider.kt rename to src/android/app/src/main/java/info/cemu/cemu/provider/DocumentsProvider.kt index 80019524..8a76cd3f 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/provider/DocumentsProvider.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/provider/DocumentsProvider.kt @@ -2,7 +2,7 @@ // Skyline // SPDX-License-Identifier: MPL-2.0 // Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/) -package com.izzy2lost.weeu.provider +package info.cemu.cemu.provider import android.database.Cursor import android.database.MatrixCursor @@ -11,9 +11,9 @@ import android.os.ParcelFileDescriptor import android.provider.DocumentsContract import android.provider.DocumentsProvider import android.webkit.MimeTypeMap -import com.izzy2lost.weeu.BuildConfig -import com.izzy2lost.weeu.R -import com.izzy2lost.weeu.common.android.context.internalFolder +import info.cemu.cemu.BuildConfig +import info.cemu.cemu.R +import info.cemu.cemu.common.android.context.internalFolder import java.io.File import java.io.FileInputStream import java.io.FileNotFoundException diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/SettingsHomeScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/SettingsHomeScreen.kt similarity index 87% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/SettingsHomeScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/SettingsHomeScreen.kt index 1b43a272..807cc114 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/SettingsHomeScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/SettingsHomeScreen.kt @@ -1,10 +1,10 @@ -package com.izzy2lost.weeu.settings +package info.cemu.cemu.settings import androidx.compose.runtime.Composable import androidx.lifecycle.compose.dropUnlessResumed -import com.izzy2lost.weeu.common.ui.components.Button -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.localization.tr +import info.cemu.cemu.common.ui.components.Button +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.localization.tr data class SettingsHomeScreenActions( val goToGeneralSettings: () -> Unit, diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/SettingsNavigation.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/SettingsNavigation.kt similarity index 87% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/SettingsNavigation.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/SettingsNavigation.kt index faf41608..cc91755a 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/SettingsNavigation.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/SettingsNavigation.kt @@ -1,21 +1,21 @@ -package com.izzy2lost.weeu.settings +package info.cemu.cemu.settings import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController import androidx.navigation.compose.composable import androidx.navigation.compose.navigation import androidx.navigation.toRoute -import com.izzy2lost.weeu.settings.account.AccountSettingsScreen -import com.izzy2lost.weeu.settings.audio.AudioSettingsScreen -import com.izzy2lost.weeu.settings.customdrivers.CustomDriversScreen -import com.izzy2lost.weeu.settings.gamespath.GamePathsScreen -import com.izzy2lost.weeu.settings.general.GeneralSettingsScreen -import com.izzy2lost.weeu.settings.graphics.GraphicsSettingsScreen -import com.izzy2lost.weeu.settings.input.ControllerInputSettingsScreen -import com.izzy2lost.weeu.settings.input.InputSettingsScreen -import com.izzy2lost.weeu.settings.input.InputSettingsScreenActions -import com.izzy2lost.weeu.settings.inputoverlay.InputOverlaySettingsScreen -import com.izzy2lost.weeu.settings.overlay.OverlaySettingsScreen +import info.cemu.cemu.settings.account.AccountSettingsScreen +import info.cemu.cemu.settings.audio.AudioSettingsScreen +import info.cemu.cemu.settings.customdrivers.CustomDriversScreen +import info.cemu.cemu.settings.gamespath.GamePathsScreen +import info.cemu.cemu.settings.general.GeneralSettingsScreen +import info.cemu.cemu.settings.graphics.GraphicsSettingsScreen +import info.cemu.cemu.settings.input.ControllerInputSettingsScreen +import info.cemu.cemu.settings.input.InputSettingsScreen +import info.cemu.cemu.settings.input.InputSettingsScreenActions +import info.cemu.cemu.settings.inputoverlay.InputOverlaySettingsScreen +import info.cemu.cemu.settings.overlay.OverlaySettingsScreen import kotlinx.serialization.Serializable @Serializable diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/account/AccountsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/account/AccountsScreen.kt similarity index 95% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/account/AccountsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/account/AccountsScreen.kt index d44ad31c..c5557151 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/account/AccountsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/account/AccountsScreen.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package com.izzy2lost.weeu.settings.account +package info.cemu.cemu.settings.account import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -46,20 +46,20 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.withLink import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.izzy2lost.weeu.R -import com.izzy2lost.weeu.common.ui.components.Header -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.components.SingleSelection -import com.izzy2lost.weeu.common.ui.localization.getCurrentLocale -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeAccount -import com.izzy2lost.weeu.nativeinterface.NativeAccount.AccountGender -import com.izzy2lost.weeu.nativeinterface.NativeAccount.DEFAULT_MII_NAME -import com.izzy2lost.weeu.nativeinterface.NativeAccount.MAX_ACCOUNT_COUNT -import com.izzy2lost.weeu.nativeinterface.NativeAccount.MIN_ACCOUNT_COUNT -import com.izzy2lost.weeu.nativeinterface.NativeSettings -import com.izzy2lost.weeu.nativeinterface.NativeSettings.NetworkService -import com.izzy2lost.weeu.common.string.parseHexOrNull +import info.cemu.cemu.R +import info.cemu.cemu.common.ui.components.Header +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.components.SingleSelection +import info.cemu.cemu.common.ui.localization.getCurrentLocale +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeAccount +import info.cemu.cemu.nativeinterface.NativeAccount.AccountGender +import info.cemu.cemu.nativeinterface.NativeAccount.DEFAULT_MII_NAME +import info.cemu.cemu.nativeinterface.NativeAccount.MAX_ACCOUNT_COUNT +import info.cemu.cemu.nativeinterface.NativeAccount.MIN_ACCOUNT_COUNT +import info.cemu.cemu.nativeinterface.NativeSettings +import info.cemu.cemu.nativeinterface.NativeSettings.NetworkService +import info.cemu.cemu.common.string.parseHexOrNull import java.text.SimpleDateFormat import java.util.Date diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/account/AccountsViewModel.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/account/AccountsViewModel.kt similarity index 92% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/account/AccountsViewModel.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/account/AccountsViewModel.kt index 6bddabb3..eafe5264 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/account/AccountsViewModel.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/account/AccountsViewModel.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.settings.account +package info.cemu.cemu.settings.account import androidx.lifecycle.ViewModel -import com.izzy2lost.weeu.nativeinterface.NativeAccount -import com.izzy2lost.weeu.nativeinterface.NativeAccount.MAX_ACCOUNT_COUNT -import com.izzy2lost.weeu.nativeinterface.NativeAccount.MIN_ACCOUNT_COUNT -import com.izzy2lost.weeu.nativeinterface.NativeActiveSettings -import com.izzy2lost.weeu.nativeinterface.NativeSettings +import info.cemu.cemu.nativeinterface.NativeAccount +import info.cemu.cemu.nativeinterface.NativeAccount.MAX_ACCOUNT_COUNT +import info.cemu.cemu.nativeinterface.NativeAccount.MIN_ACCOUNT_COUNT +import info.cemu.cemu.nativeinterface.NativeActiveSettings +import info.cemu.cemu.nativeinterface.NativeSettings import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/audio/AudoSettingsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/audio/AudoSettingsScreen.kt similarity index 89% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/audio/AudoSettingsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/audio/AudoSettingsScreen.kt index 8a02b04f..79a58ef8 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/audio/AudoSettingsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/audio/AudoSettingsScreen.kt @@ -1,12 +1,12 @@ -package com.izzy2lost.weeu.settings.audio +package info.cemu.cemu.settings.audio import androidx.compose.runtime.Composable -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.components.SingleSelection -import com.izzy2lost.weeu.common.ui.components.Slider -import com.izzy2lost.weeu.common.ui.components.Toggle -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeSettings +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.components.SingleSelection +import info.cemu.cemu.common.ui.components.Slider +import info.cemu.cemu.common.ui.components.Toggle +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeSettings private const val AUDIO_LATENCY_STEPS = 22 diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/customdrivers/CustomDriversScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/customdrivers/CustomDriversScreen.kt similarity index 98% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/customdrivers/CustomDriversScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/customdrivers/CustomDriversScreen.kt index f858d8fe..f01c4f1f 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/customdrivers/CustomDriversScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/customdrivers/CustomDriversScreen.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.settings.customdrivers +package info.cemu.cemu.settings.customdrivers import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -41,8 +41,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel -import com.izzy2lost.weeu.common.ui.components.ScreenContentLazy -import com.izzy2lost.weeu.common.ui.localization.tr +import info.cemu.cemu.common.ui.components.ScreenContentLazy +import info.cemu.cemu.common.ui.localization.tr import kotlinx.coroutines.launch @Composable diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/customdrivers/CustomDriversViewModel.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/customdrivers/CustomDriversViewModel.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/customdrivers/CustomDriversViewModel.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/customdrivers/CustomDriversViewModel.kt index 94b1880a..95ce88ff 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/customdrivers/CustomDriversViewModel.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/customdrivers/CustomDriversViewModel.kt @@ -1,16 +1,16 @@ @file:OptIn(ExperimentalPathApi::class, ExperimentalUuidApi::class) -package com.izzy2lost.weeu.settings.customdrivers +package info.cemu.cemu.settings.customdrivers import android.content.Context import android.net.Uri import android.os.Build import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.izzy2lost.weeu.nativeinterface.NativeActiveSettings -import com.izzy2lost.weeu.nativeinterface.NativeSettings -import com.izzy2lost.weeu.common.io.decodeJsonFromFile -import com.izzy2lost.weeu.common.io.unzip +import info.cemu.cemu.nativeinterface.NativeActiveSettings +import info.cemu.cemu.nativeinterface.NativeSettings +import info.cemu.cemu.common.io.decodeJsonFromFile +import info.cemu.cemu.common.io.unzip import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/gamespath/GamePathsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/gamespath/GamePathsScreen.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/gamespath/GamePathsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/gamespath/GamePathsScreen.kt index 99e6ed9d..1b1140a2 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/gamespath/GamePathsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/gamespath/GamePathsScreen.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.settings.gamespath +package info.cemu.cemu.settings.gamespath import android.content.Intent import androidx.activity.compose.rememberLauncherForActivityResult @@ -28,8 +28,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import androidx.documentfile.provider.DocumentFile import androidx.lifecycle.viewmodel.compose.viewModel -import com.izzy2lost.weeu.common.ui.components.ScreenContentLazy -import com.izzy2lost.weeu.common.ui.localization.tr +import info.cemu.cemu.common.ui.components.ScreenContentLazy +import info.cemu.cemu.common.ui.localization.tr import kotlinx.coroutines.launch @Composable diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/gamespath/GamesPathsViewModel.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/gamespath/GamesPathsViewModel.kt similarity index 87% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/gamespath/GamesPathsViewModel.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/gamespath/GamesPathsViewModel.kt index be3b2825..f84ee998 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/gamespath/GamesPathsViewModel.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/gamespath/GamesPathsViewModel.kt @@ -1,7 +1,7 @@ -package com.izzy2lost.weeu.settings.gamespath +package info.cemu.cemu.settings.gamespath import androidx.lifecycle.ViewModel -import com.izzy2lost.weeu.nativeinterface.NativeSettings +import info.cemu.cemu.nativeinterface.NativeSettings import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/general/GeneralSettingsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/general/GeneralSettingsScreen.kt similarity index 90% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/general/GeneralSettingsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/general/GeneralSettingsScreen.kt index 38ecac02..2cb99cd5 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/general/GeneralSettingsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/general/GeneralSettingsScreen.kt @@ -1,15 +1,15 @@ -package com.izzy2lost.weeu.settings.general +package info.cemu.cemu.settings.general import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.lifecycle.compose.dropUnlessResumed import androidx.lifecycle.viewmodel.compose.viewModel -import com.izzy2lost.weeu.common.settings.GamePadPosition -import com.izzy2lost.weeu.common.ui.components.Button -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.components.SingleSelection -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeSettings +import info.cemu.cemu.common.settings.GamePadPosition +import info.cemu.cemu.common.ui.components.Button +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.components.SingleSelection +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeSettings @Composable fun GeneralSettingsScreen( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/general/GeneralSettingsViewModel.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/general/GeneralSettingsViewModel.kt similarity index 64% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/general/GeneralSettingsViewModel.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/general/GeneralSettingsViewModel.kt index 4061f71f..aa880b6b 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/general/GeneralSettingsViewModel.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/general/GeneralSettingsViewModel.kt @@ -1,11 +1,11 @@ -package com.izzy2lost.weeu.settings.general +package info.cemu.cemu.settings.general import android.content.Context import androidx.lifecycle.ViewModel -import com.izzy2lost.weeu.common.settings.EmulationSettings -import com.izzy2lost.weeu.common.settings.GuiSettings -import com.izzy2lost.weeu.common.settings.SettingsManager -import com.izzy2lost.weeu.common.ui.localization.getAvailableLanguages +import info.cemu.cemu.common.settings.EmulationSettings +import info.cemu.cemu.common.settings.GuiSettings +import info.cemu.cemu.common.settings.SettingsManager +import info.cemu.cemu.common.ui.localization.getAvailableLanguages class GeneralSettingsViewModel : ViewModel() { val languages: List @@ -20,7 +20,7 @@ class GeneralSettingsViewModel : ViewModel() { } fun setLanguage(language: String, context: Context) { - com.izzy2lost.weeu.common.ui.localization.setLanguage(language, context) + info.cemu.cemu.common.ui.localization.setLanguage(language, context) guiSettings.language = language } } \ No newline at end of file diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/graphics/GraphicsSettingsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/graphics/GraphicsSettingsScreen.kt similarity index 90% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/graphics/GraphicsSettingsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/graphics/GraphicsSettingsScreen.kt index bcb5816b..c8ea9b5e 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/graphics/GraphicsSettingsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/graphics/GraphicsSettingsScreen.kt @@ -1,14 +1,14 @@ -package com.izzy2lost.weeu.settings.graphics +package info.cemu.cemu.settings.graphics import androidx.compose.runtime.Composable import androidx.compose.runtime.saveable.rememberSaveable -import com.izzy2lost.weeu.common.ui.components.Button -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.components.SingleSelection -import com.izzy2lost.weeu.common.ui.components.Toggle -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeEmulation -import com.izzy2lost.weeu.nativeinterface.NativeSettings +import info.cemu.cemu.common.ui.components.Button +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.components.SingleSelection +import info.cemu.cemu.common.ui.components.Toggle +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeEmulation +import info.cemu.cemu.nativeinterface.NativeSettings private val ScalingFilterChoices = listOf( NativeSettings.ScalingFilter.BILINEAR_FILTER, diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ClassicControllerInputs.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/ClassicControllerInputs.kt similarity index 94% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ClassicControllerInputs.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/ClassicControllerInputs.kt index 6bc38e53..da076e79 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ClassicControllerInputs.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/ClassicControllerInputs.kt @@ -1,8 +1,8 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import androidx.compose.runtime.Composable -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeInput.ClassicButton +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeInput.ClassicButton @Composable fun ClassicControllerInputs( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ControllerInputSettingsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/ControllerInputSettingsScreen.kt similarity index 96% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ControllerInputSettingsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/ControllerInputSettingsScreen.kt index 317bcd6e..8a145db8 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ControllerInputSettingsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/ControllerInputSettingsScreen.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import android.content.Context import android.view.KeyEvent @@ -34,11 +34,11 @@ import androidx.compose.ui.window.Dialog import androidx.lifecycle.viewmodel.MutableCreationExtras import androidx.lifecycle.viewmodel.compose.viewModel import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.components.SingleSelection -import com.izzy2lost.weeu.common.ui.localization.controllerTypeToString -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeInput +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.components.SingleSelection +import info.cemu.cemu.common.ui.localization.controllerTypeToString +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeInput import kotlinx.coroutines.launch import androidx.compose.material3.Button as MaterialButton diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ControllersViewModel.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/ControllersViewModel.kt similarity index 97% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ControllersViewModel.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/ControllersViewModel.kt index b8dc6e29..31937bcc 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ControllersViewModel.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/ControllersViewModel.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import android.view.KeyEvent import android.view.MotionEvent @@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.CreationExtras import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.izzy2lost.weeu.nativeinterface.NativeInput +import info.cemu.cemu.nativeinterface.NativeInput import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputItemGroup.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/InputItemGroup.kt similarity index 93% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputItemGroup.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/InputItemGroup.kt index 5dc8329a..4ba2a5db 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputItemGroup.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/InputItemGroup.kt @@ -1,4 +1,4 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.izzy2lost.weeu.common.ui.components.Header +import info.cemu.cemu.common.ui.components.Header @Composable fun InputItemsGroup( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputMapper.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/InputMapper.kt similarity index 98% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputMapper.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/InputMapper.kt index da9ef036..b7cfec0c 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputMapper.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/InputMapper.kt @@ -1,12 +1,12 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import android.view.InputDevice import android.view.KeyEvent import android.view.MotionEvent -import com.izzy2lost.weeu.common.android.inputdevice.isGameController -import com.izzy2lost.weeu.common.android.motionevent.isMotionEventFromJoystickOrGamepad -import com.izzy2lost.weeu.nativeinterface.NativeInput -import com.izzy2lost.weeu.nativeinterface.NativeInput.setControllerMapping +import info.cemu.cemu.common.android.inputdevice.isGameController +import info.cemu.cemu.common.android.motionevent.isMotionEventFromJoystickOrGamepad +import info.cemu.cemu.nativeinterface.NativeInput +import info.cemu.cemu.nativeinterface.NativeInput.setControllerMapping import kotlin.math.abs private fun getNativeAxisKey(axis: Int, isPositive: Boolean): Int? { diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputSettingsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/InputSettingsScreen.kt similarity index 81% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputSettingsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/InputSettingsScreen.kt index af90fdd8..5b8ccd33 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/InputSettingsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/InputSettingsScreen.kt @@ -1,13 +1,13 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.lifecycle.compose.dropUnlessResumed -import com.izzy2lost.weeu.common.ui.components.Button -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.localization.controllerTypeToString -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeInput +import info.cemu.cemu.common.ui.components.Button +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.localization.controllerTypeToString +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeInput data class InputSettingsScreenActions( val goToInputOverlaySettings: () -> Unit, diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ProControllerInputs.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/ProControllerInputs.kt similarity index 94% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ProControllerInputs.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/ProControllerInputs.kt index 4630fb9d..e5f3aee3 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/ProControllerInputs.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/ProControllerInputs.kt @@ -1,8 +1,8 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import androidx.compose.runtime.Composable -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeInput.ProButton +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeInput.ProButton @Composable fun ProControllerInputs( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/VPADInputs.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/VPADInputs.kt similarity index 92% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/VPADInputs.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/VPADInputs.kt index 9bdf2a69..5b92687e 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/VPADInputs.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/VPADInputs.kt @@ -1,10 +1,10 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import androidx.compose.runtime.Composable -import com.izzy2lost.weeu.common.ui.components.Toggle -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeInput -import com.izzy2lost.weeu.nativeinterface.NativeInput.VPADButton +import info.cemu.cemu.common.ui.components.Toggle +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeInput +import info.cemu.cemu.nativeinterface.NativeInput.VPADButton @Composable fun VPADInputs( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/WiimoteControllerInputs.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/input/WiimoteControllerInputs.kt similarity index 93% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/WiimoteControllerInputs.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/input/WiimoteControllerInputs.kt index 47062446..fcf4af8c 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/input/WiimoteControllerInputs.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/input/WiimoteControllerInputs.kt @@ -1,8 +1,8 @@ -package com.izzy2lost.weeu.settings.input +package info.cemu.cemu.settings.input import androidx.compose.runtime.Composable -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeInput.WiimoteButton +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeInput.WiimoteButton @Composable fun WiimoteControllerInputs( diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/inputoverlay/InputOverlaySettingsScreen.kt b/src/android/app/src/main/java/info/cemu/cemu/settings/inputoverlay/InputOverlaySettingsScreen.kt similarity index 81% rename from src/android/app/src/main/java/com/izzy2lost/weeu/settings/inputoverlay/InputOverlaySettingsScreen.kt rename to src/android/app/src/main/java/info/cemu/cemu/settings/inputoverlay/InputOverlaySettingsScreen.kt index 16ec472e..c3590125 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/settings/inputoverlay/InputOverlaySettingsScreen.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/settings/inputoverlay/InputOverlaySettingsScreen.kt @@ -1,13 +1,13 @@ -package com.izzy2lost.weeu.settings.inputoverlay +package info.cemu.cemu.settings.inputoverlay import androidx.compose.runtime.Composable import androidx.lifecycle.viewmodel.compose.viewModel -import com.izzy2lost.weeu.common.ui.components.ScreenContent -import com.izzy2lost.weeu.common.ui.components.SingleSelection -import com.izzy2lost.weeu.common.ui.components.Slider -import com.izzy2lost.weeu.common.ui.components.Toggle -import com.izzy2lost.weeu.common.ui.localization.tr -import com.izzy2lost.weeu.nativeinterface.NativeInput +import info.cemu.cemu.common.ui.components.ScreenContent +import info.cemu.cemu.common.ui.components.SingleSelection +import info.cemu.cemu.common.ui.components.Slider +import info.cemu.cemu.common.ui.components.Toggle +import info.cemu.cemu.common.ui.localization.tr +import info.cemu.cemu.nativeinterface.NativeInput private val ControllerIndexChoices = (0.. - - @@ -67,4 +67,4 @@ android:id="@+id/side_menu" layout="@layout/layout_side_menu_emulation" /> - + diff --git a/src/android/app/src/main/res/layout/layout_emulation_input.xml b/src/android/app/src/main/res/layout/layout_emulation_input.xml index f86ffcd4..bf382d0e 100644 --- a/src/android/app/src/main/res/layout/layout_emulation_input.xml +++ b/src/android/app/src/main/res/layout/layout_emulation_input.xml @@ -6,7 +6,7 @@ android:layout_height="wrap_content" android:padding="16dp"> - diff --git a/src/android/app/src/main/res/values-night/themes.xml b/src/android/app/src/main/res/values-night/themes.xml index aaa48810..e866a714 100644 --- a/src/android/app/src/main/res/values-night/themes.xml +++ b/src/android/app/src/main/res/values-night/themes.xml @@ -1,4 +1,4 @@ -