Skip to content

Commit 0b71c7f

Browse files
ADFA-3412: Update Git-related texts with Git commands (#1108)
feat(ADFA-3412): Update Git-related texts with Git commands
1 parent ff9337e commit 0b71c7f

5 files changed

Lines changed: 9 additions & 10 deletions

File tree

‎app/src/main/java/com/itsaky/androidide/actions/main/CloneRepositoryAction.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CloneRepositoryAction(context: Context) : ActionItem {
1919
const val ID = "ide.main.cloneRepository"
2020
}
2121

22-
override var label: String = context.getString(R.string.download_git_project)
22+
override var label: String = context.getString(R.string.clone_git_project)
2323
override var visible: Boolean = true
2424
override var enabled: Boolean = true
2525
override var icon: Drawable? = ContextCompat.getDrawable(context, R.drawable.ic_clone_repo)

‎app/src/main/java/com/itsaky/androidide/fragments/CloneRepositoryFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class CloneRepositoryFragment : BaseFragment() {
205205
setIconResource(if (isForRetry) R.drawable.ic_refresh else 0)
206206

207207
text = context.getString(
208-
if (isForRetry) R.string.retry else R.string.download_project
208+
if (isForRetry) R.string.retry else R.string.clone_project
209209
)
210210
}
211211

‎app/src/main/java/com/itsaky/androidide/preferences/gitPrefExts.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import kotlinx.parcelize.Parcelize
99
@Parcelize
1010
class GitPreferencesScreen(
1111
override val key: String = "idepref_git",
12-
override val title: Int = R.string.idepref_git_title,
12+
override val title: Int = R.string.git_title,
1313
override val summary: Int? = R.string.idepref_git_summary,
1414
override val children: List<IPreference> = mutableListOf()
1515
) : IPreferenceScreen() {

‎app/src/main/res/layout/fragment_clone_repository.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
android:id="@+id/tv_download_project"
1616
android:layout_width="wrap_content"
1717
android:layout_height="wrap_content"
18-
android:text="@string/download_git_project"
18+
android:text="@string/clone_git_project"
1919
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
2020
android:transitionName="title"
2121
app:layout_constraintStart_toStartOf="parent"
@@ -126,7 +126,7 @@
126126
android:layout_height="wrap_content"
127127
android:layout_marginTop="24dp"
128128
android:enabled="false"
129-
android:text="@string/download_project"
129+
android:text="@string/clone_project"
130130
app:layout_constraintEnd_toEndOf="parent"
131131
app:layout_constraintTop_toBottomOf="@id/passwordLayout"
132132
app:layout_goneMarginTop="16dp" />

‎resources/src/main/res/values/strings.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<string name="msg_create_new_project">Create new project</string>
138138
<string name="msg_open_existing_project">Open a saved project</string>
139139
<string name="msg_delete_existing_project">Delete a saved project</string>
140-
<string name="download_git_project">Download a Git project</string>
140+
<string name="clone_git_project">Clone a Git project</string>
141141
<string name="msg_delete_existing_project_failed">Failed to delete existing project.</string>
142142
<string name="title_confirm_project_close">Close project</string>
143143
<string name="cancel_project_text">Cancel</string>
@@ -1189,7 +1189,7 @@
11891189
<string name="use_authentication">Use Authentication</string>
11901190
<string name="username">Username</string>
11911191
<string name="personal_access_token">Personal access token</string>
1192-
<string name="download_project">Download project</string>
1192+
<string name="clone_project">Clone project</string>
11931193
<string name="destination_directory_not_empty">Destination directory is not empty</string>
11941194
<string name="clone_successful">Clone successful!</string>
11951195
<string name="clone_failed">Clone failed: %1$s</string>
@@ -1221,8 +1221,7 @@
12211221
<string name="cancelling_clone">Cancelling clone…</string>
12221222

12231223
<!-- Git Preferences -->
1224-
<string name="idepref_git_title">Git</string>
1225-
<string name="idepref_git_summary">Set and update git configuration</string>
1224+
<string name="idepref_git_summary">Set and update Git configuration</string>
12261225
<string name="idepref_git_author_title">Author Identity</string>
12271226
<string name="idepref_git_author_summary">Set the name and email used for commits</string>
12281227
<string name="idepref_git_user_name_title">User Name</string>
@@ -1232,7 +1231,7 @@
12321231
<string name="idepref_git_author_missing_warning">Configure Git author in Preferences to enable commits.\nClick on the avatar for more info.</string>
12331232
<string name="git_committing_as">Committing as %1$s</string>
12341233
<string name="git_committing_email">Email - %1$s</string>
1235-
<string name="git_update_config_in_preferences">You can update your git configuration in Preferences.</string>
1234+
<string name="git_update_config_in_preferences">You can update your Git configuration in Preferences.</string>
12361235
<string name="author_not_set">Not set</string>
12371236
<string name="not_a_git_repo">This project is not a Git repository</string>
12381237
</resources>

0 commit comments

Comments
 (0)