gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Share

Browse Source
This commit is contained in:
Smarshall 2023-08-30 15:12:49 +05:30 committed by GitHub
commit 70973ef028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/assembleFlavors.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
matrix: matrix:
flavor: [ Generic, Gplay ] flavor: [ Generic, Gplay ]
steps: steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- name: set up JDK 17 - name: set up JDK 17
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with: with:

2
.github/workflows/check.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
matrix: matrix:
task: [ detekt, ktlintCheck ] task: [ detekt, ktlintCheck ]
steps: steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with: with:

2
.github/workflows/command-rebase.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
reaction-type: "+1" reaction-type: "+1"
- name: Checkout the latest code - name: Checkout the latest code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with: with:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.COMMAND_BOT_PAT }} token: ${{ secrets.COMMAND_BOT_PAT }}

2
.github/workflows/qa.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Check if secrets are available - name: Check if secrets are available
run: echo "::set-output name=ok::${{ secrets.KS_PASS != '' }}" run: echo "::set-output name=ok::${{ secrets.KS_PASS != '' }}"
id: check-secrets id: check-secrets
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
if: ${{ steps.check-secrets.outputs.ok == 'true' }} if: ${{ steps.check-secrets.outputs.ok == 'true' }}
- name: set up JDK 17 - name: set up JDK 17
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0

22
app/src/main/res/drawable/ic_logo.xml
View File

@ -17,10 +17,20 @@
~ You should have received a copy of the GNU General Public License ~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>. ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
<vector android:autoMirrored="true" android:height="128dp" android:width="128dp"
android:viewportHeight="128" android:viewportWidth="128" android:height="128dp"
android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:autoMirrored="true"
<path android:fillColor="#ffffff" android:viewportWidth="128"
android:pathData="M63.992,0.689C29.031,0.689 0.691,29.031 0.692,63.992c0,34.96 28.34,63.301 63.3,63.302 6.982,-0.014 13.881,-1.183 20.426,-3.43 4.317,-1.482 8.48,-3.433 12.411,-5.831 3.383,1.344 8.59,3.838 13.736,5.902 6.688,2.683 13.274,4.639 15.618,2.399 2.317,-2.212 0.703,-8.809 -1.647,-15.575 -2.046,-5.892 -4.649,-11.913 -5.701,-15.282 2.544,-4.415 4.535,-9.101 5.945,-13.954 1.648,-5.674 2.5,-11.574 2.512,-17.532C127.291,29.032 98.952,0.692 63.992,0.691ZM63.999,24.756l0.001,0c21.677,0 39.25,17.573 39.25,39.251 -0.001,21.677 -17.574,39.249 -39.251,39.249 -21.676,0 -39.249,-17.572 -39.25,-39.249 0,-21.678 17.573,-39.251 39.25,-39.251z" android:strokeWidth="4.78543139"/> android:viewportHeight="128">
<group
android:scaleX="0.88"
android:scaleY="0.88"
android:pivotX="64"
android:pivotY="64">
<path
android:fillColor="#ffffff"
android:pathData="M63.992,0.689C29.031,0.689 0.691,29.031 0.692,63.992c0,34.96 28.34,63.301 63.3,63.302 6.982,-0.014 13.881,-1.183 20.426,-3.43 4.317,-1.482 8.48,-3.433 12.411,-5.831 3.383,1.344 8.59,3.838 13.736,5.902 6.688,2.683 13.274,4.639 15.618,2.399 2.317,-2.212 0.703,-8.809 -1.647,-15.575 -2.046,-5.892 -4.649,-11.913 -5.701,-15.282 2.544,-4.415 4.535,-9.101 5.945,-13.954 1.648,-5.674 2.5,-11.574 2.512,-17.532C127.291,29.032 98.952,0.692 63.992,0.691ZM63.999,24.756l0.001,0c21.677,0 39.25,17.573 39.25,39.251 -0.001,21.677 -17.574,39.249 -39.251,39.249 -21.676,0 -39.249,-17.572 -39.25,-39.249 0,-21.678 17.573,-39.251 39.25,-39.251z"
android:strokeWidth="4.78543139" />
</group>
</vector> </vector>

1
app/src/main/res/values-eu/strings.xml
View File

@ -10,6 +10,7 @@
<string name="avatar">Avatarra</string> <string name="avatar">Avatarra</string>
<string name="away">Kanpoan</string> <string name="away">Kanpoan</string>
<string name="call_more_actions_dialog_headline">Dei-ezarpen aurreratuak</string> <string name="call_more_actions_dialog_headline">Dei-ezarpen aurreratuak</string>
<string name="call_running_since_one_hour">Deia ordubetez egon da martxan.</string>
<string name="call_without_notification">Deitu jakinarazpenik gabe</string> <string name="call_without_notification">Deitu jakinarazpenik gabe</string>
<string name="camera_permission_granted">Kameraren baimena eman da. Aukeratu kamera berriro.</string> <string name="camera_permission_granted">Kameraren baimena eman da. Aukeratu kamera berriro.</string>
<string name="choose_avatar_from_cloud">Aukeratu avatarra cloudetik</string> <string name="choose_avatar_from_cloud">Aukeratu avatarra cloudetik</string>