Commit b3c74e04 authored by francois's avatar francois

Final changes and video

parent d685f0ba
......@@ -25,7 +25,7 @@
<activity android:name=".ContactsActivity_" />
<activity android:name=".MenuActivity_" />
<activity android:name=".WeatherActivity" />
<activity android:name=".ScheduleActivity" />
<activity android:name=".ScheduleActivity_" />
</application>
</manifest>
\ No newline at end of file
......@@ -48,9 +48,9 @@ public class CustomGrid extends BaseAdapter{
grid = new View(mContext);
grid = inflater.inflate(R.layout.grid_single, null);
TextView textView = (TextView) grid.findViewById(R.id.grid_text);
//TextView textView = (TextView) grid.findViewById(R.id.grid_text);
ImageView imageView = (ImageView)grid.findViewById(R.id.grid_image);
textView.setText(web[position]);
//textView.setText(web[position]);
imageView.setImageResource(Imageid[position]);
} else {
grid = (View) convertView;
......
......@@ -21,13 +21,13 @@ public class MainActivity extends AppCompatActivity {
"ContactsActivity_",
"MenuActivity_",
"WeatherActivity",
"ScheduleActivity"
"ScheduleActivity_"
} ;
int[] imageId = {
R.mipmap.ic_launcher,
R.mipmap.ic_launcher_round,
R.mipmap.ic_launcher_round,
R.mipmap.ic_launcher_round
R.drawable.contacts,
R.drawable.restaurant,
R.drawable.weather,
R.drawable.calendar
};
@ViewById
......
......@@ -6,11 +6,32 @@ import android.widget.ImageView;
import com.squareup.picasso.Picasso;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.Background;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.Fullscreen;
import org.androidannotations.annotations.ViewById;
@Fullscreen
@EActivity(R.layout.activity_schedule)
public class ScheduleActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
@ViewById(R.id.imageView)
ImageView img;
/*protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_schedule);
ImageView img = (ImageView) findViewById(R.id.imageView);
Picasso.with(this).load("https://cloud.utc.fr/index.php/s/4ZUWBHny8DdtANC/download").into(img);
}*/
@AfterViews
void loadImage(){
Picasso.with(this).load("https://cloud.utc.fr/index.php/s/4ZUWBHny8DdtANC/download").into(img);
}
}
......@@ -5,13 +5,11 @@
tools:context=".MainActivity" >
<GridView
android:numColumns="auto_fit"
android:gravity="center"
android:columnWidth="100dp"
android:stretchMode="columnWidth"
android:id="@+id/grid"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/grid"
/>
android:columnWidth="100dp"
android:gravity="center"
android:numColumns="2" />
</LinearLayout>
\ No newline at end of file
......@@ -6,16 +6,9 @@
<ImageView
android:id="@+id/grid_image"
android:layout_width="50dp"
android:layout_height="50dp">
</ImageView>
<TextView
android:id="@+id/grid_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:textSize="9sp" >
</TextView>
android:layout_width="170dp"
android:layout_height="170dp"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"></ImageView>
</LinearLayout>
\ No newline at end of file
<resources>
<string name="app_name">Mob_Data_Project</string>
<string name="app_name">My school hub</string>
<string name="action_settings">Settings</string>
<string name="city_hint_text">City</string>
<string name="get_weather">Get Weather</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment