Merge branch 'master-5' into main-5-oss

# Conflicts: # app/src/main/res/values-in/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values/strings.xml
BaltiApps · Nov 12, 2021 · 9a9ed0a · 9a9ed0a
2 parents 36eb0a7 + d4c7bfa
commit 9a9ed0a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/app/src/main/java/balti/migrate/simpleActivities/MainActivityKotlin.kt b/app/src/main/java/balti/migrate/simpleActivities/MainActivityKotlin.kt
@@ -30,7 +30,6 @@ import balti.migrate.R
 import balti.migrate.backupActivity.BackupActivityKotlin
 import balti.migrate.messages.MessagesView
 import balti.migrate.preferences.MainPreferenceActivity
-import balti.migrate.storageSelector.StorageDisplayUtils
 import balti.migrate.storageSelector.StorageSelectorActivity
 import balti.migrate.storageSelector.StorageType
 import balti.migrate.utilities.CommonToolsKotlin
@@ -46,6 +45,7 @@ import balti.migrate.utilities.CommonToolsKotlin.Companion.LAST_SUPPORTED_ANDROI
 import balti.migrate.utilities.CommonToolsKotlin.Companion.MESSAGE_ACTIVITY_CODE
 import balti.migrate.utilities.CommonToolsKotlin.Companion.MESSAGE_BOARD_URL
 import balti.migrate.utilities.CommonToolsKotlin.Companion.MESSAGE_FIELD_LAST_UPDATE_NO
+import balti.migrate.utilities.CommonToolsKotlin.Companion.MIGRATE_OSS_GITHUB
 import balti.migrate.utilities.CommonToolsKotlin.Companion.PACKAGE_MIGRATE_FLASHER
 import balti.migrate.utilities.CommonToolsKotlin.Companion.PREF_ALTERNATE_METHOD
 import balti.migrate.utilities.CommonToolsKotlin.Companion.PREF_ANDROID_VERSION_WARNING
@@ -194,9 +194,9 @@ class MainActivityKotlin : AppCompatActivity(), NavigationView.OnNavigationItemS
             drawer_layout.openDrawer(GravityCompat.START)
         }
 
-        learn_sd_card_support.paintFlags = Paint.UNDERLINE_TEXT_FLAG
-        learn_sd_card_support.setOnClickListener {
-            StorageDisplayUtils.showSdCardSupportDialog(this)
+        migrate_oss_link.paintFlags = Paint.UNDERLINE_TEXT_FLAG
+        migrate_oss_link.setOnClickListener {
+            openWebLink(MIGRATE_OSS_GITHUB)
         }
 
         startStorageSpaceMonitor()

diff --git a/app/src/main/java/balti/migrate/utilities/CommonToolsKotlin.kt b/app/src/main/java/balti/migrate/utilities/CommonToolsKotlin.kt
@@ -385,6 +385,8 @@ class CommonToolsKotlin(val context: Context? = null) {
 
         val MESSAGE_BOARD_URL = "https://gitlab.com/SayantanRC/update-files/-/raw/master/migrate_message_board.txt"
 
+        val MIGRATE_OSS_GITHUB = "https://github.com/BaltiApps/Migrate-OSS.git"
+
         val MESSAGE_FIELD_LAST_UPDATE_NO = "message_update_no"
         val MESSAGE_FIELD_MESSAGE_ARRAY = "messages"
         val MESSAGE_FIELD_MESSAGE_NO = "message_no"

diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
@@ -227,10 +227,10 @@
                         />
 
                     <TextView
-                        android:id="@+id/learn_sd_card_support"
+                        android:id="@+id/migrate_oss_link"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/learn_about_sd_card_support"
+                        android:text="@string/based_on_migrate_oss"
                         android:textColor="@color/colorAccent"
                         android:clickable="true"
                         android:focusable="true"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -213,10 +213,10 @@
                         />
 
                     <TextView
-                        android:id="@+id/learn_sd_card_support"
+                        android:id="@+id/migrate_oss_link"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/learn_about_sd_card_support"
+                        android:text="@string/based_on_migrate_oss"
                         android:textColor="@color/colorAccent"
                         android:clickable="true"
                         android:focusable="true"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -200,6 +200,8 @@
     <string name="restoreApp">In app restore</string>
     <string name="internal_storage">Internal storage</string>
     <string name="learn_about_sd_card_support">Learn about SD card support</string>
+    <string name="based_on_migrate_oss">Based on Open Source Migrate-OSS</string>
+    <string name="migrate_oss_link">Open source codebase on GitHub</string>
 
     <!--backup_layout.xml-->
     <string name="select_apps">Select apps</string>