Parcourir la source

Renamed package.
Updated README.

seavenois il y a 10 ans
Parent
commit
2e1cbddd72
44 fichiers modifiés avec 90 ajouts et 73 suppressions
  1. 25 2
      README.md
  2. 1 1
      app/build.gradle
  3. 4 4
      app/src/main/AndroidManifest.xml
  4. 1 1
      app/src/main/java/com/ivalentin/margolariak/ActivityFutureLayout.java
  5. 1 1
      app/src/main/java/com/ivalentin/margolariak/ActivityLayout.java
  6. 1 1
      app/src/main/java/com/ivalentin/margolariak/ActivityPastLayout.java
  7. 1 1
      app/src/main/java/com/ivalentin/margolariak/AlarmReceiver.java
  8. 1 1
      app/src/main/java/com/ivalentin/margolariak/AlbumLayout.java
  9. 1 1
      app/src/main/java/com/ivalentin/margolariak/BlogLayout.java
  10. 1 1
      app/src/main/java/com/ivalentin/margolariak/BootReceiver.java
  11. 1 1
      app/src/main/java/com/ivalentin/margolariak/CustomScrollView.java
  12. 1 1
      app/src/main/java/com/ivalentin/margolariak/Distance.java
  13. 1 1
      app/src/main/java/com/ivalentin/margolariak/DownloadImage.java
  14. 1 1
      app/src/main/java/com/ivalentin/margolariak/Event.java
  15. 1 1
      app/src/main/java/com/ivalentin/margolariak/FetchURL.java
  16. 1 1
      app/src/main/java/com/ivalentin/margolariak/GM.java
  17. 1 1
      app/src/main/java/com/ivalentin/margolariak/GalleryLayout.java
  18. 1 1
      app/src/main/java/com/ivalentin/margolariak/HomeLayout.java
  19. 1 1
      app/src/main/java/com/ivalentin/margolariak/HomeSectionLocation.java
  20. 1 1
      app/src/main/java/com/ivalentin/margolariak/LablancaLayout.java
  21. 1 1
      app/src/main/java/com/ivalentin/margolariak/LablancaNoFestivalsLayout.java
  22. 1 7
      app/src/main/java/com/ivalentin/margolariak/LocationLayout.java
  23. 1 1
      app/src/main/java/com/ivalentin/margolariak/MainActivity.java
  24. 1 1
      app/src/main/java/com/ivalentin/margolariak/MainLayout.java
  25. 1 1
      app/src/main/java/com/ivalentin/margolariak/PhotoLayout.java
  26. 1 1
      app/src/main/java/com/ivalentin/margolariak/PostComment.java
  27. 1 1
      app/src/main/java/com/ivalentin/margolariak/PostLayout.java
  28. 1 1
      app/src/main/java/com/ivalentin/margolariak/ScheduleLayout.java
  29. 1 1
      app/src/main/java/com/ivalentin/margolariak/SettingsLayout.java
  30. 1 1
      app/src/main/java/com/ivalentin/margolariak/Sync.java
  31. 7 7
      app/src/main/res/layout/activity_main.xml
  32. 2 2
      app/src/main/res/layout/fragment_layout_activities.xml
  33. 2 2
      app/src/main/res/layout/fragment_layout_activity_future.xml
  34. 2 2
      app/src/main/res/layout/fragment_layout_activity_past.xml
  35. 2 2
      app/src/main/res/layout/fragment_layout_album.xml
  36. 2 2
      app/src/main/res/layout/fragment_layout_blog.xml
  37. 2 2
      app/src/main/res/layout/fragment_layout_gallery.xml
  38. 2 2
      app/src/main/res/layout/fragment_layout_home.xml
  39. 2 2
      app/src/main/res/layout/fragment_layout_lablanca.xml
  40. 2 2
      app/src/main/res/layout/fragment_layout_lablanca_nofestivals.xml
  41. 2 2
      app/src/main/res/layout/fragment_layout_photo.xml
  42. 2 2
      app/src/main/res/layout/fragment_layout_post.xml
  43. 2 2
      app/src/main/res/layout/fragment_layout_schedule.xml
  44. 2 2
      app/src/main/res/layout/fragment_layout_settings.xml

+ 25 - 2
README.md

@@ -4,6 +4,29 @@ Gasteizko Margolariak Android App
 
 An Android app intended for members of <a href="http://margolariak.com/">Gasteizko Margolariak</a> in <a href="http://www.vitoria-gasteiz.org/">Vitoria-Gasteiz</a>, Spain.
 
-During the regional festival, it can help them find activities around the town, both hosted by Gasteizko Margolariak and other parties, as well as sugest them things to to when they are near places of interest.
 
-For the rest of the year, it helps users keep track of the activities organized by Gasteizko Margolariak, check the blog, and view and upload photos.
+### Features during the city festivals ###
+
+This features wil be only available during the city festivals.
+
+* Check out the festival schedule, showing events all around the city, and indicating their location.
+* Check out the schedule for the members of Gasteizko Margolariak, indicating the location of every event and activity...
+* ... but, since we are not known for our puntuality, check out the location of Gasteizko Margolariak in real time.
+
+
+### Features for the rest of the year ###
+
+* Check out and be notified of all activities organized by gasteizzko margolariak.
+* View nd comment our blog.
+* View and comment our gallery.
+
+
+### Compatibility ###
+
+Required Android 3.0 (Honeycomb, API level 11) or higher.
+
+
+### Permissions ###
+
+* __ACCESS_FINE_LOCATION__: Allow the use of GPS location to indicate distance to certain events and activities.
+

+ 1 - 1
app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "23.0.3"
 
     defaultConfig {
-        applicationId "com.ivalentin.gm"
+        applicationId "com.ivalentin.margolariak"
         minSdkVersion 12
         targetSdkVersion 22
     }

+ 4 - 4
app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ivalentin.gm"
+    package="com.ivalentin.margolariak"
     android:versionCode="8"
     android:versionName="2.0" >
 
@@ -41,7 +41,7 @@
     		android:value="AIzaSyC6DgCJRiBkYiNUivE0VH9fsTZDbfVDpS0"/>
         
         <activity
-            android:name=".MainActivity"
+            android:name="com.ivalentin.margolariak.MainActivity"
             android:theme="@style/Theme.NoTitle"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:label="@string/app_name">
@@ -55,10 +55,10 @@
         
         <receiver
             android:process=":remote"
-            android:name=".AlarmReceiver"/>
+            android:name="com.ivalentin.margolariak.AlarmReceiver"/>
         
         <receiver
-            android:name=".BootReceiver"
+            android:name="com.ivalentin.margolariak.BootReceiver"
 			android:enabled="false">
 		    <intent-filter>
 		        <action android:name="android.intent.action.BOOT_COMPLETED"></action>

+ 1 - 1
app/src/main/java/com/ivalentin/gm/ActivityFutureLayout.java → app/src/main/java/com/ivalentin/margolariak/ActivityFutureLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/ActivityLayout.java → app/src/main/java/com/ivalentin/margolariak/ActivityLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 
 import android.annotation.SuppressLint;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/ActivityPastLayout.java → app/src/main/java/com/ivalentin/margolariak/ActivityPastLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/AlarmReceiver.java → app/src/main/java/com/ivalentin/margolariak/AlarmReceiver.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/AlbumLayout.java → app/src/main/java/com/ivalentin/margolariak/AlbumLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/BlogLayout.java → app/src/main/java/com/ivalentin/margolariak/BlogLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 
 import android.annotation.SuppressLint;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/BootReceiver.java → app/src/main/java/com/ivalentin/margolariak/BootReceiver.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/CustomScrollView.java → app/src/main/java/com/ivalentin/margolariak/CustomScrollView.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/Distance.java → app/src/main/java/com/ivalentin/margolariak/Distance.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 /**
  * Static class that allows to calculate the distance between tho 

+ 1 - 1
app/src/main/java/com/ivalentin/gm/DownloadImage.java → app/src/main/java/com/ivalentin/margolariak/DownloadImage.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/Event.java → app/src/main/java/com/ivalentin/margolariak/Event.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/FetchURL.java → app/src/main/java/com/ivalentin/margolariak/FetchURL.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/GM.java → app/src/main/java/com/ivalentin/margolariak/GM.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.util.Log;
 

+ 1 - 1
app/src/main/java/com/ivalentin/gm/GalleryLayout.java → app/src/main/java/com/ivalentin/margolariak/GalleryLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 
 import android.annotation.SuppressLint;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/HomeLayout.java → app/src/main/java/com/ivalentin/margolariak/HomeLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import java.io.File;
 import java.text.DateFormat;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/HomeSectionLocation.java → app/src/main/java/com/ivalentin/margolariak/HomeSectionLocation.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.app.Activity;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/LablancaLayout.java → app/src/main/java/com/ivalentin/margolariak/LablancaLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.app.Fragment;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/LablancaNoFestivalsLayout.java → app/src/main/java/com/ivalentin/margolariak/LablancaNoFestivalsLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.app.Fragment;

+ 1 - 7
app/src/main/java/com/ivalentin/gm/LocationLayout.java → app/src/main/java/com/ivalentin/margolariak/LocationLayout.java

@@ -1,13 +1,12 @@
 //TODO: Rework this file
 
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.MapView;
@@ -19,8 +18,6 @@ import com.google.android.gms.maps.model.MarkerOptions;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationListener;
@@ -31,9 +28,6 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 //TODO: Try to fetch a new location report when created

+ 1 - 1
app/src/main/java/com/ivalentin/gm/MainActivity.java → app/src/main/java/com/ivalentin/margolariak/MainActivity.java

@@ -1,6 +1,6 @@
 //TODO: implement onResume, to try and fetch location
 
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import java.io.File;
 import java.math.BigInteger;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/MainLayout.java → app/src/main/java/com/ivalentin/margolariak/MainLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/PhotoLayout.java → app/src/main/java/com/ivalentin/margolariak/PhotoLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.app.Fragment;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/PostComment.java → app/src/main/java/com/ivalentin/margolariak/PostComment.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/PostLayout.java → app/src/main/java/com/ivalentin/margolariak/PostLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/ScheduleLayout.java → app/src/main/java/com/ivalentin/margolariak/ScheduleLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import java.text.DateFormat;
 import java.text.ParseException;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/SettingsLayout.java → app/src/main/java/com/ivalentin/margolariak/SettingsLayout.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;

+ 1 - 1
app/src/main/java/com/ivalentin/gm/Sync.java → app/src/main/java/com/ivalentin/margolariak/Sync.java

@@ -1,4 +1,4 @@
-package com.ivalentin.gm;
+package com.ivalentin.margolariak;
 
 import java.util.ArrayList;
 import java.util.List;

+ 7 - 7
app/src/main/res/layout/activity_main.xml

@@ -1,9 +1,9 @@
-<com.ivalentin.gm.MainLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	android:background="@color/background_menu"
-	android:fitsSystemWindows="true" >
+<com.ivalentin.margolariak.MainLayout xmlns:android="http://schemas.android.com/apk/res/android"
+									  android:id="@+id/main_layout"
+									  android:layout_width="match_parent"
+									  android:layout_height="match_parent"
+									  android:background="@color/background_menu"
+									  android:fitsSystemWindows="true" >
     
 	
     <!-- Slider menu -->
@@ -277,4 +277,4 @@
 		
 	</LinearLayout>
 
-</com.ivalentin.gm.MainLayout>
+</com.ivalentin.margolariak.MainLayout>

+ 2 - 2
app/src/main/res/layout/fragment_layout_activities.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -67,4 +67,4 @@
                 android:id="@+id/ll_activities_past_list"/>
         </LinearLayout>
     </LinearLayout>
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_activity_future.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -170,4 +170,4 @@
         </LinearLayout>
 
     </LinearLayout>
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_activity_past.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -113,4 +113,4 @@
         </LinearLayout>
 
     </LinearLayout>
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_album.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -48,4 +48,4 @@
 
     </LinearLayout>
 
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_blog.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -61,4 +61,4 @@
                 android:layout_margin="5dp" />
         </LinearLayout>
     </LinearLayout>
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_gallery.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -77,4 +77,4 @@
                 android:id="@+id/ll_gallery_album_list"/>
         </LinearLayout>
     </LinearLayout>
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_home.xml

@@ -1,4 +1,4 @@
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/sh_home_layout"
     android:layout_width="fill_parent"
@@ -616,4 +616,4 @@
 
 	</LinearLayout>
 
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_lablanca.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -174,4 +174,4 @@
 
     </LinearLayout>
 
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_lablanca_nofestivals.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -32,4 +32,4 @@
     </LinearLayout>
 
 
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_photo.xml

@@ -1,4 +1,4 @@
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -191,4 +191,4 @@
 
     </LinearLayout>
 
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_post.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.ivalentin.gm.CustomScrollView
+<com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -203,4 +203,4 @@
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-</com.ivalentin.gm.CustomScrollView>
+</com.ivalentin.margolariak.CustomScrollView>

+ 2 - 2
app/src/main/res/layout/fragment_layout_schedule.xml

@@ -92,7 +92,7 @@
             <requestFocus />
         </EditText>
 
-        <com.ivalentin.gm.CustomScrollView
+        <com.ivalentin.margolariak.CustomScrollView
             android:id="@+id/sv_schedule"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
                 </LinearLayout>
             </LinearLayout>
 
-        </com.ivalentin.gm.CustomScrollView>
+        </com.ivalentin.margolariak.CustomScrollView>
 
     </LinearLayout>
 

+ 2 - 2
app/src/main/res/layout/fragment_layout_settings.xml

@@ -5,7 +5,7 @@
     android:background="@color/background_app"
     android:layout_height="fill_parent">
 
-    <com.ivalentin.gm.CustomScrollView
+    <com.ivalentin.margolariak.CustomScrollView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
 
@@ -142,5 +142,5 @@
                 />
 
         </LinearLayout>
-    </com.ivalentin.gm.CustomScrollView>
+    </com.ivalentin.margolariak.CustomScrollView>
 </LinearLayout>