Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #11 Resources review and optimization #59

Closed
wants to merge 9 commits into from
Closed

Issue #11 Resources review and optimization #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1549aaa
Issue #11 Resources review and optimization
Jun 11, 2021
1da5999
Issue #11 Resources review and optimization
Jun 16, 2021
e4635a1
Issue #11 Resources review and optimization
Jun 29, 2021
7774558
Issue #11 Resources review and optimization
Jul 23, 2021
95de085
Issue #11 Resources review and optimization
Jul 23, 2021
c94bc78
All Pictos have all density options
Aug 6, 2021
9bdabed
Merge remote-tracking branch 'origin/dev' into reviewResources
Nov 3, 2021
e945d9e
Resources still nedd som ework on themes
Nov 5, 2021
dff0348
Need some work on the themes, mainly with actionbar, need fixing the …
Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
156 changes: 101 additions & 55 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.stonefacesoft.ottaa">

<uses-feature
android:name="android.hardware.camera"
android:required="true" />
Expand Down Expand Up @@ -32,30 +33,28 @@
</intent>
</queries>
<application

android:allowBackup="true"
android:configChanges="orientation|keyboardHidden|screenSize"
android:fullBackupContent="@xml/backup_descriptor"
android:hardwareAccelerated="false"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:installLocation="auto"
android:label="@string/app_name"
android:largeHeap="true"
android:requestLegacyExternalStorage="true"
android:screenOrientation="sensorLandscape"
android:supportsRtl="true"
android:theme="@style/CustomActionBarTheme"
android:usesCleartextTraffic="true"

tools:targetApi="m">

<activity
android:name=".view.ReportActivity" />

<activity android:name=".view.ReportActivity" />
<activity
android:name=".ActivityInformes"
android:label="@string/title_activity_informes"
android:theme="@style/CustomActionBarTheme.NoActionBar"
android:screenOrientation="sensorLandscape"/>
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<uses-library
android:name="android.test.runner"
Expand Down Expand Up @@ -84,140 +83,187 @@
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name" />

<activity
android:name=".MainJuegos"
android:label="@string/title_activity_main_juegos"
android:screenOrientation="sensorLandscape"
android:theme="@style/CustomActionBarTheme.NoActionBar" />
android:theme="@style/OTTAATheme"/>

<activity
android:name=".welcome.SplashActivity"
android:label="@string/app_name"
android:exported="true"
android:theme="@style/OTTAATheme"
android:screenOrientation="sensorLandscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<!--
Set custom default icon. This is used when no icon is set for incoming notification messages.
See README(https://goo.gl/l4GJaQ) for more.
-->
<!-- <meta-data -->
<!-- android:name="com.google.firebase.messaging.default_notification_icon" -->
<!-- android:resource="@drawable/icono_blanco"/> -->
<!--
Set color used with incoming notification messages. This is used when no color is set for the incoming
notification message. See README(https://goo.gl/6BKBk7) for more.
-->

<activity
android:name=".Principal"
android:theme="@style/OTTAATheme"
android:configChanges="orientation|keyboardHidden|screenSize"
android:icon="@drawable/ic_launcher"
android:icon="@drawable/ic_launcher_foreground"
android:label="@string/app_name"
android:screenOrientation="sensorLandscape" />
<!--
Set color used with incoming notification messages. This is used when no color is set for the incoming
notification message. See README(https://goo.gl/6BKBk7) for more.
-->

<activity
android:name=".prefs"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_configuracion"
android:screenOrientation="sensorLandscape"
android:theme="@android:style/Theme.Holo.Light" />
android:theme="@style/OTTAATheme" />

<activity
android:name=".GaleriaArasaac"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_galeria_pictos"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Viewpagers.Viewpager_tutorial"
android:label="@string/activity_calendario"
android:screenOrientation="sensorLandscape" /> <!-- Referencias de campañas de MKT -->
<!-- Used for Google Play Store Campaign Measurement -->
<!-- <service -->
<!-- android:name="com.google.android.gms.analytics.CampaignTrackingService" -->
<!-- android:enabled="true" -->
<!-- android:exported="false"/> -->
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Edit_Picto_Visual"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_editar"
android:screenOrientation="sensorLandscape" /> <!-- GEOFE -->
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".LicenciaExpirada"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_licencia_expirada"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Games.WhichIsThePicto"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_licencia_expirada"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".GaleriaGrupos2"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_galeria_grupos2"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".GaleriaPictos3"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="fullSensor" />
android:screenOrientation="fullSensor"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".utils.AboutOttaa"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_about_ottaa"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Games.MatchPictograms"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Games.GameSelector"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Games.DescribirPictograma"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Games.ArmarFrases"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Games.MemoryGame"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Activities.Phrases.VincularFrases"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".LoginActivity2"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_login"
android:screenOrientation="sensorLandscape" />
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".LoginActivity2Step2"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_login"
android:screenOrientation="sensorLandscape" />
<activity android:name=".Activities.Pictures.AvatarPictureCropper" android:screenOrientation="sensorLandscape"/>
<activity android:name=".Activities.Pictures.EditPictogramCropper" android:screenOrientation="sensorLandscape"/>
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".Activities.Pictures.AvatarPictureCropper"
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity android:name=".LoginActivity2Avatar" android:screenOrientation="sensorLandscape" />
<activity android:name=".LoginActivity2Step3" android:screenOrientation="sensorLandscape" />
<activity android:name=".Activities.FindAllPictograms" android:screenOrientation="sensorLandscape" />
<activity android:name=".Activities.Phrases.FavoritePhrases" android:screenOrientation="sensorLandscape" />
<activity android:name=".Activities.Phrases.MostUsedPhrases" android:screenOrientation="sensorLandscape" />
<activity android:name=".Activities.Phrases.AllPhrases" android:screenOrientation="sensorLandscape" />
<activity
android:name=".Activities.Pictures.EditPictogramCropper"
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".LoginActivity2Avatar"
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>

<activity
android:name=".LoginActivity2Step3"
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>


<activity
android:name=".Activities.FindAllPictograms"
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>
<activity
android:name=".Activities.Phrases.FavoritePhrases"
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>
<activity
android:name=".Activities.Phrases.MostUsedPhrases"
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>
<activity
android:name=".Activities.Phrases.AllPhrases"
android:screenOrientation="sensorLandscape"
android:theme="@style/OTTAATheme"/>


<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/logo_ottaa_dev" /> <!-- GEOFE -->
android:resource="@drawable/ic_launcher_foreground" /> <!-- GEOFE -->
<meta-data
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/NaranjaOTTAA" />
Expand Down
Binary file added app/src/main/ic_launcher-playstore.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/src/main/java/com/stonefacesoft/ottaa/Activities/Phrases/MostUsedPhrases.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void initComponents() {
myTTS = textToSpeech.getInstance(this);
most_used_recycler_view.setMyTTS(myTTS);
most_used_recycler_view.setOnClickListener();
btnEditar.setImageDrawable(getResources().getDrawable(R.drawable.ic_search));
btnEditar.setImageDrawable(getResources().getDrawable(R.drawable.ic_baseline_search_24));
if(barridoPantalla.isBarridoActivado())
most_used_recycler_view.setScrollVertical(false);
// most_used_recycler_view = new MostUsedPhrases_Recycler_View(this,firebaseUser.getmAuth());
Expand Down Expand Up @@ -85,7 +85,7 @@ public void onBackPressed() {
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItem menuItem =menu.findItem(R.id.vincular);
menuItem.setIcon(getResources().getDrawable(R.drawable.ic_star_black_24dp));
menuItem.setIcon(getResources().getDrawable(R.drawable.ic_baseline_star_24));
menuItem.setVisible(true);
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/stonefacesoft/ottaa/Bitmap/GestionarBitmap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public Bitmap combineImages(int mDeltax,int mDeltay) {
if (imagenes.size() > 0 && imagenes.get(0) != null) {

Bitmap mBufferPictos = Bitmap.createScaledBitmap(imagenes.get(0), 250, 250, false);
Bitmap logo=drawableToBitmap(mContext.getResources().getDrawable(R.drawable.logo_ottaa_dev));
Bitmap logo=drawableToBitmap(mContext.getResources().getDrawable(R.drawable.logo_ottaa));
logo = Bitmap.createScaledBitmap(logo,75,75,true);

mImagenFinalWidth = (mBufferPictos.getWidth()+mDeltax) * imagenes.size()+mDeltax;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stonefacesoft/ottaa/Games/DescribirPictograma.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
mMenu.getItem(1).setOnMenuItemClickListener(this::onMenuItemClick);
mMenu.getItem(3).setOnMenuItemClickListener(this::onMenuItemClick);

setIcon(mMenu.getItem(3),mute,R.drawable.ic_volume_off_white_24dp,R.drawable.ic_volume_up_white_24dp);
setIcon(mMenu.getItem(3),mute,R.drawable.ic_baseline_volume_off_24,R.drawable.ic_baseline_volume_up_24);
setIcon(mMenu.getItem(1),isChecked,R.drawable.ic_live_help_white_24dp,R.drawable.ic_unhelp);

return super.onCreateOptionsMenu(menu);
Expand All @@ -649,7 +649,7 @@ public boolean onMenuItemClick(MenuItem item) {
mute=!mute;
sharedPrefsDefault.edit().putBoolean("muteSound",mute).apply();
music.setMuted(mute);
setIcon(item,mute,R.drawable.ic_volume_off_white_24dp,R.drawable.ic_volume_up_white_24dp);
setIcon(item,mute,R.drawable.ic_baseline_volume_off_24,R.drawable.ic_baseline_volume_up_24);

return true;
case R.id.score:
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/stonefacesoft/ottaa/Games/MatchPictograms.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ public boolean onMenuItemClick(MenuItem item) {
gamesSettings.enableSound(gamesSettings.changeStatus(gamesSettings.isSoundOn()));
sharedPrefsDefault.edit().putBoolean("muteSound", gamesSettings.isSoundOn()).apply();
music.setMuted(gamesSettings.isSoundOn());
setIcon(item, gamesSettings.isSoundOn(), R.drawable.ic_volume_off_white_24dp, R.drawable.ic_volume_up_white_24dp);
setIcon(item, gamesSettings.isSoundOn(), R.drawable.ic_baseline_volume_off_24, R.drawable.ic_baseline_volume_up_24);
return true;
case R.id.check:
analyticsFirebase.customEvents("Touch", "Match Pictograms", "Help Action");
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/stonefacesoft/ottaa/Games/MemoryGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public boolean onMenuItemClick(MenuItem item) {
gamesSettings.enableSound(gamesSettings.changeStatus(gamesSettings.isSoundOn()));
sharedPrefsDefault.edit().putBoolean("muteSound", gamesSettings.isSoundOn()).apply();
music.setMuted(gamesSettings.isSoundOn());
setIcon(item, gamesSettings.isSoundOn(), R.drawable.ic_volume_off_white_24dp, R.drawable.ic_volume_up_white_24dp);
setIcon(item, gamesSettings.isSoundOn(), R.drawable.ic_baseline_volume_off_24, R.drawable.ic_baseline_volume_up_24);
return true;
case R.id.check:
analyticsFirebase.customEvents("Touch", "Memory Game", "Help Action");
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stonefacesoft/ottaa/Games/WhichIsThePicto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
mMenu.getItem(1).setOnMenuItemClickListener(this::onMenuItemClick);
mMenu.getItem(3).setOnMenuItemClickListener(this::onMenuItemClick);

setIcon(mMenu.getItem(3), gamesSettings.isSoundOn(), R.drawable.ic_volume_off_white_24dp, R.drawable.ic_volume_up_white_24dp);
setIcon(mMenu.getItem(3), gamesSettings.isSoundOn(), R.drawable.ic_baseline_volume_off_24, R.drawable.ic_baseline_volume_up_24);
setIcon(mMenu.getItem(1), gamesSettings.isHelpFunction(), R.drawable.ic_live_help_white_24dp, R.drawable.ic_unhelp);

return super.onCreateOptionsMenu(menu);
Expand All @@ -642,7 +642,7 @@ public boolean onMenuItemClick(MenuItem item) {
gamesSettings.enableSound(gamesSettings.changeStatus(gamesSettings.isSoundOn()));
sharedPrefsDefault.edit().putBoolean("muteSound", gamesSettings.isSoundOn()).apply();
music.setMuted(gamesSettings.isSoundOn());
setIcon(item, gamesSettings.isSoundOn(), R.drawable.ic_volume_off_white_24dp, R.drawable.ic_volume_up_white_24dp);
setIcon(item, gamesSettings.isSoundOn(), R.drawable.ic_baseline_volume_off_24, R.drawable.ic_baseline_volume_up_24);
analitycsFirebase.customEvents("Touch", "WhichIsThePicto", "Mute");
return true;
case R.id.score:
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stonefacesoft/ottaa/LicenciaExpirada.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public class LicenciaExpirada extends AppCompatActivity implements SharedPrefere
public static String STR_LOGOUT;
public GoogleSignInApi mGoogleSignInClient;
ViewPager viewPager;
int[] images = new int[]{R.drawable.licencia_accesibilidad, R.drawable.licencia_games, R.drawable.licencia_informe, R
.drawable.licencia_ubicacion};
int[] images = new int[]{R.drawable.ic_baseline_accessible_forward_24, R.drawable.ic_videogame_asset_black_24dp, R.drawable.ic_baseline_auto_graph_24, R
.drawable.ic_location_on_black_24dp};
int[] textos = new int[]{R.string.obtain_ottaa_project,
R.string.test_game_vocabulary,
R.string.premium_report_description
Expand Down
Loading