other/bashgid
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Many changes + minor bug fixing

Browse Source
This commit is contained in:
vladislav.khorev committed 2015-06-25 19:00:11 +00:00
1 parent 1fb07ff884
commit c5e5df9e52
54 files changed
+2483 -488
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/res/layout/article_album_element.xml
+14
View File
@@ -9,6 +9,20 @@
android:paddingTop="4dp"
android:showDividers="middle" >
<TextView
android:id="@+id/titleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/contentTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView" />
<it.sephiroth.android.library.widget.HListView
android:id="@+id/hListView"
android:layout_width="match_parent"
android/res/layout/article_album_element_item.xml
-6
View File
@@ -13,10 +13,4 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/dateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView" />
</LinearLayout>
android/res/layout/article_photo_element.xml
+7 -3
View File
@@ -11,12 +11,16 @@
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
<TextView
android:id="@+id/dateTextView"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="TextView" />
android:gravity="center_horizontal"
android:text="TextView"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
android/res/layout/fragment_article_page.xml
+11
View File
@@ -7,6 +7,9 @@
android:orientation="vertical"
tools:context="fishrungames.bashgid.MainPageFragment" >
<ListView
android:id="@+id/listView"
android:layout_width="match_parent"
@@ -19,4 +22,12 @@
</ListView>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
</LinearLayout>
android/res/layout/fragment_catalog_page.xml
+30
View File
@@ -0,0 +1,30 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="0dp"
android:background="@color/bkg2"
android:orientation="vertical"
tools:context="fishrungames.bashgid.MainPageFragment" >
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<ListView
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:divider="@drawable/transparent"
android:dividerHeight="18dp"
android:paddingBottom="16dp" >
</ListView>
</LinearLayout>
android/res/layout/fragment_news_page.xml
+4
View File
@@ -7,6 +7,7 @@
android:orientation="vertical"
tools:context="fishrungames.bashgid.MainPageFragment" >
<ListView
android:id="@+id/listView"
android:layout_width="match_parent"
@@ -16,7 +17,10 @@
android:divider="@color/bkg2"
android:dividerHeight="2dp"
android:paddingBottom="16dp" >
</ListView>
</LinearLayout>
android/res/layout/fragment_osm_map_page.xml
+11
View File
@@ -9,6 +9,17 @@
android:paddingRight="0dp"
android:paddingTop="0dp"
tools:context="fishrungames.bashgid.MapHolderFragment" >
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="6dp"
android:gravity="center_horizontal"
android:text="TextView"
android:textSize="24dp"
android:textStyle="bold" />
<org.osmdroid.views.MapView
android:id="@+id/mapview"
android/res/layout/fragment_photo_album_list_page.xml
+1
View File
@@ -7,6 +7,7 @@
android:orientation="vertical"
tools:context="fishrungames.bashgid.MainPageFragment" >
<ListView
android:id="@+id/listView"
android:layout_width="match_parent"
android/res/layout/fragment_photo_album_page.xml
+9 -1
View File
@@ -7,6 +7,14 @@
android:orientation="vertical"
tools:context="fishrungames.bashgid.MainPageFragment" >
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<ListView
android:id="@+id/listView"
android:layout_width="match_parent"
@@ -14,7 +22,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:divider="@color/bkg2"
android:dividerHeight="2dp"
android:dividerHeight="12dp"
android:paddingBottom="16dp" >
</ListView>
android/res/layout/fragment_photo_page.xml
+8
View File
@@ -4,6 +4,14 @@
android:layout_height="match_parent"
android:orientation="vertical" >
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="fill_parent"
android/res/layout/fragment_video_page.xml
+13 -2
View File
@@ -3,12 +3,23 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<GridView
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:numColumns="3" >
android:gravity="bottom"
android:horizontalSpacing="12dp"
android:numColumns="4"
android:verticalSpacing="12dp" >
</GridView>
</LinearLayout>
android/res/layout/fragment_video_record_page.xml
+8
View File
@@ -5,6 +5,14 @@
android:layout_margin="6dp"
android:orientation="vertical" >
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android/res/layout/journal_element.xml
+5 -1
View File
@@ -11,6 +11,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
<TextView
@@ -31,6 +32,9 @@
<ImageView
android:id="@+id/imageView"
android:layout_width="80dp"
android:layout_height="80dp" />
android:layout_height="80dp"
android:layout_gravity="right"
android:layout_weight="0"
android:scaleType="centerInside" />
</LinearLayout>
android/res/layout/main_page_list_element.xml
+6
View File
@@ -36,6 +36,12 @@
</LinearLayout>
<TextView
android:id="@+id/descriptionTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="TextView" />
<it.sephiroth.android.library.widget.HListView
android:id="@+id/hListView"
android:layout_width="match_parent"
android/res/layout/main_page_news.xml
+24 -7
View File
@@ -18,6 +18,14 @@
android:textSize="24sp"
android:textStyle="bold" />
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -27,10 +35,13 @@
<ImageButton
android:id="@+id/news1ImageButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|left"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/news_content_description" />
android:contentDescription="@string/news_content_description"
android:maxWidth="40dp"
android:scaleType="centerInside" />
<Button
android:id="@+id/news1Button"
@@ -55,10 +66,13 @@
<ImageButton
android:id="@+id/news2ImageButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/news_content_description" />
android:contentDescription="@string/news_content_description"
android:maxWidth="40dp"
android:scaleType="centerInside" />
<Button
android:id="@+id/news2Button"
@@ -83,10 +97,13 @@
<ImageButton
android:id="@+id/news3ImageButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/news_content_description" />
android:contentDescription="@string/news_content_description"
android:maxWidth="40dp"
android:scaleType="centerInside" />
<Button
android:id="@+id/news3Button"
android/res/layout/news_page_list_footer.xml
+21
View File
@@ -0,0 +1,21 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bkg1"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingRight="20dp"
tools:context="fishrungames.bashgid.MainPageFragment" >
<TextView
android:id="@+id/footerTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:text="@string/news_load_more"
android:textSize="24sp"
android:textStyle="bold" />
</LinearLayout>
android/res/layout/news_page_list_header.xml
+8
View File
@@ -18,4 +18,12 @@
android:textSize="24sp"
android:textStyle="bold" />
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
</LinearLayout>
android/res/layout/photo_album_element.xml
+7 -6
View File
@@ -8,11 +8,12 @@
android:orientation="horizontal"
android:showDividers="middle" >
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY" />
<fishrungames.bashgid.DynamicImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:cropToPadding="false"
android:scaleType="centerCrop" />
</LinearLayout>
android/res/layout/photo_album_list_element.xml
+1 -1
View File
@@ -15,7 +15,7 @@
android:layout_gravity="center_horizontal"
android:adjustViewBounds="true"
android:contentDescription="@string/related_image"
android:scaleType="fitXY" />
android:scaleType="fitCenter" />
<TextView
android:id="@+id/dateTextView"
android/res/layout/photo_page_element.xml
+36 -5
View File
@@ -5,10 +5,41 @@
android:layout_height="match_parent"
android:orientation="vertical" >
<ImageView
android:id="@+id/image"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:scaleType="fitCenter" />
<ScrollView
android:id="@+id/scrollView1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadingEdge="none"
android:fillViewport="true" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<fishrungames.bashgid.DynamicImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:cropToPadding="false"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/titleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="TextView"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/descriptionTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="TextView" />
</LinearLayout>
</ScrollView>
</LinearLayout>
android/res/layout/video_page_list_element.xml
+11 -9
View File
@@ -2,28 +2,30 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/LinearLayout1"
android:layout_width="match_parent"
android:layout_height="800dp"
android:layout_height="150dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:background="@color/bkg1"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:showDividers="middle" >
<ImageView
<fishrungames.bashgid.DynamicImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="2dp"
android:scaleType="fitCenter"
android:src="@drawable/img_culture1" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:adjustViewBounds="true"
android:cropToPadding="false"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/nameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_gravity="bottom"
android:text="dsdsd"
android:textSize="16sp"
android:textStyle="bold" />
android/res/values/strings.xml
+2
View File
@@ -26,6 +26,8 @@
<string name="news_header">News</string>
<string name="news_load_more">Load more</string>
<string name="news_content_description">Image related to news record</string>